From 3e2d11b401536bfb0d9cdf28bbfb7a2dcc11df38 Mon Sep 17 00:00:00 2001
From: Saint Wesonga <wesongathedeveloper@yahoo.com>
Date: Thu, 30 Jul 2009 15:04:14 +1200
Subject: [PATCH 001/175] Bug 467988. Merge canvas mochitests into one file to
 speed up mochitest running. r=roc

--HG--
extra : rebase_source : 9a4f90fdbe07759e3970dbf665d753b7320b345a
---
 content/canvas/test/Makefile.in      |   687 +-
 content/canvas/test/test_canvas.html | 24276 +++++++++++++++++++++++++
 2 files changed, 24285 insertions(+), 678 deletions(-)
 create mode 100644 content/canvas/test/test_canvas.html

diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in
index 96b52e9f87e..571d677c1c2 100644
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -45,656 +45,7 @@ relativesrcdir  = content/canvas/test
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 _TEST_FILES_0 = \
-	test_fallback.basic.html \
-	test_fallback.multiple.html \
-	test_fallback.nested.html \
-	test_type.name.html \
-	test_type.exists.html \
-	test_type.delete.html \
-	test_type.prototype.html \
-	test_type.replace.html \
-	test_type.extend.html \
-	test_size.attributes.html \
-	test_size.attributes.type.get.html \
-	test_size.attributes.type.set.html \
-	test_size.attributes.default.html \
-	test_size.attributes.reflect.1.html \
-	test_size.attributes.reflect.2.html \
-	test_size.attributes.removed.html \
-	test_size.attributes.parse.whitespace.html \
-	test_size.attributes.parse.nonnumber.html \
-	test_size.attributes.parse.zero.html \
-	test_size.attributes.parse.negative.html \
-	test_size.attributes.parse.zerosuffix.html \
-	test_size.attributes.parse.floatsuffix.html \
-	test_size.attributes.parse.badsuffix.html \
-	test_size.attributes.parse.percentsuffix.html \
-	test_size.attributes.setAttribute.whitespace.html \
-	test_size.attributes.setAttribute.nonnumber.html \
-	test_size.attributes.setAttribute.zero.html \
-	test_size.attributes.setAttribute.negative.html \
-	test_size.attributes.setAttribute.zerosuffix.html \
-	test_size.attributes.setAttribute.floatsuffix.html \
-	test_size.attributes.setAttribute.badsuffix.html \
-	test_size.attributes.setAttribute.percentsuffix.html \
-	test_size.attributes.style.html \
-	test_initial.colour.html \
-	test_initial.reset.different.html \
-	test_initial.reset.same.html \
-	test_initial.reset.path.html \
-	test_initial.reset.clip.html \
-	test_initial.reset.transform.html \
-	test_initial.reset.gradient.html \
-	test_initial.reset.pattern.html \
-	test_context.emptystring.html \
-	test_context.unrecognised.badname.html \
-	test_context.unrecognised.badsuffix.html \
-	test_context.unrecognised.nullsuffix.html \
-	test_context.unrecognised.unicode.html \
-	test_context.casesensitive.html \
-	test_context.arguments.missing.html \
-	test_context.arguments.extra.html \
-	test_toDataURL.default.html \
-	test_toDataURL.png.html \
-	test_toDataURL.unrecognised.html \
-	test_toDataURL.lowercase.html \
-	test_toDataURL.arguments.1.html \
-	test_toDataURL.arguments.2.html \
-	test_toDataURL.arguments.3.html \
-	test_toDataURL.nocontext.html \
-	test_toDataURL.zerosize.html \
-	test_toDataURL.primarycolours.html \
-	test_toDataURL.complexcolours.html \
-	test_2d.getcontext.exists.html \
-	test_2d.type.exists.html \
-	test_2d.type.delete.html \
-	test_2d.type.prototype.html \
-	test_2d.type.replace.html \
-	test_2d.type.extend.html \
-	test_2d.getcontext.unique.html \
-	test_2d.getcontext.shared.html \
-	test_2d.voidreturn.html \
-	test_2d.missingargs.html \
-	test_2d.scaled.html \
-	test_2d.canvas.reference.html \
-	test_2d.canvas.readonly.html \
-	test_2d.state.saverestore.strokeStyle.html \
-	test_2d.state.saverestore.fillStyle.html \
-	test_2d.state.saverestore.globalAlpha.html \
-	test_2d.state.saverestore.lineWidth.html \
-	test_2d.state.saverestore.lineCap.html \
-	test_2d.state.saverestore.lineJoin.html \
-	test_2d.state.saverestore.miterLimit.html \
-	test_2d.state.saverestore.shadowOffsetX.html \
-	test_2d.state.saverestore.shadowOffsetY.html \
-	test_2d.state.saverestore.shadowBlur.html \
-	test_2d.state.saverestore.shadowColor.html \
-	test_2d.state.saverestore.globalCompositeOperation.html \
-	test_initial.reset.2dstate.html \
-	test_2d.state.saverestore.transformation.html \
-	test_2d.state.saverestore.clip.html \
-	test_2d.state.saverestore.path.html \
-	test_2d.state.saverestore.bitmap.html \
-	test_2d.state.saverestore.stack.html \
-	test_2d.state.saverestore.stackdepth.html \
-	test_2d.state.saverestore.underflow.html \
-	test_2d.transformation.order.html \
-	test_2d.transformation.scale.basic.html \
-	test_2d.transformation.scale.zero.html \
-	test_2d.transformation.scale.negative.html \
-	test_2d.transformation.scale.large.html \
-	test_2d.transformation.scale.nonfinite.html \
-	test_2d.transformation.scale.multiple.html \
-	$(NULL)
-
-_TEST_FILES_1 = \
-	test_2d.transformation.rotate.zero.html \
-	test_2d.transformation.rotate.radians.html \
-	test_2d.transformation.rotate.direction.html \
-	test_2d.transformation.rotate.wrap.html \
-	test_2d.transformation.rotate.wrapnegative.html \
-	test_2d.transformation.rotate.nonfinite.html \
-	test_2d.transformation.translate.basic.html \
-	test_2d.transformation.translate.nonfinite.html \
-	test_2d.transformation.transform.identity.html \
-	test_2d.transformation.transform.skewed.html \
-	test_2d.transformation.transform.multiply.html \
-	test_2d.transformation.transform.nonfinite.html \
-	test_2d.transformation.setTransform.skewed.html \
-	test_2d.transformation.setTransform.multiple.html \
-	test_2d.transformation.setTransform.nonfinite.html \
-	test_2d.composite.globalAlpha.range.html \
-	test_2d.composite.globalAlpha.invalid.html \
-	test_2d.composite.globalAlpha.default.html \
-	test_2d.composite.globalAlpha.fill.html \
-	test_2d.composite.globalAlpha.image.html \
-	test_2d.composite.globalAlpha.canvas.html \
-	test_2d.composite.globalAlpha.imagepattern.html \
-	test_2d.composite.globalAlpha.canvaspattern.html \
-	test_2d.composite.solid.source-over.html \
-	test_2d.composite.solid.destination-over.html \
-	test_2d.composite.solid.source-in.html \
-	test_2d.composite.solid.destination-in.html \
-	test_2d.composite.solid.source-out.html \
-	test_2d.composite.solid.destination-out.html \
-	test_2d.composite.solid.source-atop.html \
-	test_2d.composite.solid.destination-atop.html \
-	test_2d.composite.solid.copy.html \
-	test_2d.composite.transparent.source-over.html \
-	test_2d.composite.transparent.destination-over.html \
-	test_2d.composite.transparent.source-in.html \
-	test_2d.composite.transparent.destination-in.html \
-	test_2d.composite.transparent.source-out.html \
-	test_2d.composite.transparent.destination-out.html \
-	test_2d.composite.transparent.source-atop.html \
-	test_2d.composite.transparent.destination-atop.html \
-	test_2d.composite.transparent.copy.html \
-	test_2d.composite.image.source-over.html \
-	test_2d.composite.image.destination-over.html \
-	test_2d.composite.image.destination-out.html \
-	test_2d.composite.image.source-atop.html \
-	test_2d.composite.image.copy.html \
-	test_2d.composite.canvas.source-over.html \
-	test_2d.composite.canvas.destination-over.html \
-	test_2d.composite.canvas.destination-out.html \
-	test_2d.composite.canvas.source-atop.html \
-	test_2d.composite.canvas.copy.html \
-	test_2d.composite.uncovered.fill.copy.html \
-	test_2d.composite.uncovered.image.copy.html \
-	test_2d.composite.uncovered.pattern.copy.html \
-	test_2d.composite.clip.source-over.html \
-	test_2d.composite.clip.destination-over.html \
-	test_2d.composite.clip.source-in.html \
-	test_2d.composite.clip.destination-in.html \
-	test_2d.composite.clip.source-out.html \
-	test_2d.composite.clip.destination-out.html \
-	test_2d.composite.clip.source-atop.html \
-	test_2d.composite.clip.destination-atop.html \
-	test_2d.composite.clip.copy.html \
-	test_2d.composite.operation.get.html \
-	test_2d.composite.operation.unrecognised.html \
-	test_2d.composite.operation.darker.html \
-	test_2d.composite.operation.over.html \
-	test_2d.composite.operation.clear.html \
-	test_2d.composite.operation.highlight.html \
-	test_2d.composite.operation.nullsuffix.html \
-	$(NULL)
-
-_TEST_FILES_2 = \
-	test_2d.composite.operation.casesensitive.html \
-	test_2d.composite.operation.default.html \
-	test_2d.fillStyle.parse.html4.html \
-	test_2d.fillStyle.parse.hex3.html \
-	test_2d.fillStyle.parse.hex6.html \
-	test_2d.fillStyle.parse.rgb-num.html \
-	test_2d.fillStyle.parse.rgb-clamp-1.html \
-	test_2d.fillStyle.parse.rgb-clamp-2.html \
-	test_2d.fillStyle.parse.rgb-clamp-3.html \
-	test_2d.fillStyle.parse.rgb-clamp-4.html \
-	test_2d.fillStyle.parse.rgb-clamp-5.html \
-	test_2d.fillStyle.parse.rgb-percent.html \
-	test_2d.fillStyle.parse.rgba-solid-1.html \
-	test_2d.fillStyle.parse.rgba-solid-2.html \
-	test_2d.fillStyle.parse.rgba-num-1.html \
-	test_2d.fillStyle.parse.rgba-num-2.html \
-	test_2d.fillStyle.parse.rgba-percent.html \
-	test_2d.fillStyle.parse.rgba-clamp-1.html \
-	test_2d.fillStyle.parse.rgba-clamp-2.html \
-	test_2d.fillStyle.parse.transparent-1.html \
-	test_2d.fillStyle.parse.transparent-2.html \
-	test_2d.fillStyle.parse.hsl-1.html \
-	test_2d.fillStyle.parse.hsl-2.html \
-	test_2d.fillStyle.parse.hsl-3.html \
-	test_2d.fillStyle.parse.hsl-4.html \
-	test_2d.fillStyle.parse.hsl-5.html \
-	test_2d.fillStyle.parse.hsl-clamp-1.html \
-	test_2d.fillStyle.parse.hsl-clamp-2.html \
-	test_2d.fillStyle.parse.hsl-clamp-3.html \
-	test_2d.fillStyle.parse.hsl-clamp-4.html \
-	test_2d.fillStyle.parse.hsla-1.html \
-	test_2d.fillStyle.parse.hsla-2.html \
-	test_2d.fillStyle.parse.hsla-clamp-1.html \
-	test_2d.fillStyle.parse.hsla-clamp-2.html \
-	test_2d.fillStyle.parse.hsla-clamp-3.html \
-	test_2d.fillStyle.parse.hsla-clamp-4.html \
-	test_2d.fillStyle.parse.hsla-clamp-5.html \
-	test_2d.fillStyle.parse.hsla-clamp-6.html \
-	test_2d.fillStyle.parse.svg-1.html \
-	test_2d.fillStyle.parse.svg-2.html \
-	test_2d.fillStyle.parse.invalid.hex3.html \
-	test_2d.fillStyle.parse.invalid.hex6.html \
-	test_2d.fillStyle.parse.invalid.rgb-1.html \
-	test_2d.fillStyle.parse.invalid.rgb-2.html \
-	test_2d.fillStyle.parse.invalid.rgb-3.html \
-	test_2d.fillStyle.parse.invalid.rgb-4.html \
-	test_2d.fillStyle.parse.invalid.rgb-5.html \
-	test_2d.fillStyle.parse.invalid.rgb-6.html \
-	test_2d.fillStyle.parse.invalid.rgb-7.html \
-	test_2d.fillStyle.parse.invalid.rgba-1.html \
-	test_2d.fillStyle.parse.invalid.rgba-2.html \
-	test_2d.fillStyle.parse.invalid.rgba-3.html \
-	test_2d.fillStyle.parse.invalid.rgba-4.html \
-	test_2d.fillStyle.parse.invalid.rgba-5.html \
-	test_2d.fillStyle.parse.invalid.hsl-1.html \
-	test_2d.fillStyle.parse.invalid.hsl-2.html \
-	test_2d.fillStyle.parse.invalid.hsl-3.html \
-	test_2d.fillStyle.parse.invalid.hsl-4.html \
-	test_2d.fillStyle.parse.invalid.hsl-5.html \
-	test_2d.fillStyle.parse.invalid.hsla-1.html \
-	test_2d.fillStyle.parse.invalid.hsla-2.html \
-	test_2d.fillStyle.parse.system.html \
-	test_2d.fillStyle.parse.current.basic.html \
-	test_2d.fillStyle.parse.current.changed.html \
-	test_2d.fillStyle.parse.current.removed.html \
-	test_2d.fillStyle.invalidstring.html \
-	test_2d.fillStyle.invalidtype.html \
-	test_2d.fillStyle.get.solid.html \
-	test_2d.fillStyle.get.semitransparent.html \
-	test_2d.fillStyle.get.transparent.html \
-	test_2d.fillStyle.default.html \
-	test_2d.strokeStyle.default.html \
-	test_2d.gradient.object.type.html \
-	test_2d.gradient.object.return.html \
-	test_2d.gradient.interpolate.solid.html \
-	test_2d.gradient.interpolate.colour.html \
-	test_2d.gradient.interpolate.alpha.html \
-	test_2d.gradient.interpolate.colouralpha.html \
-	test_2d.gradient.interpolate.outside.html \
-	test_2d.gradient.interpolate.zerosize.html \
-	test_2d.gradient.interpolate.vertical.html \
-	test_2d.gradient.interpolate.multiple.html \
-	test_2d.gradient.interpolate.overlap.html \
-	test_2d.gradient.interpolate.overlap2.html \
-	test_2d.gradient.empty.html \
-	test_2d.gradient.object.update.html \
-	test_2d.gradient.object.compare.html \
-	test_2d.gradient.object.crosscanvas.html \
-	test_2d.gradient.object.invalidoffset.html \
-	test_2d.gradient.object.invalidcolour.html \
-	test_2d.gradient.linear.nonfinite.html \
-	test_2d.gradient.linear.transform.1.html \
-	test_2d.gradient.linear.transform.2.html \
-	test_2d.gradient.linear.transform.3.html \
-	test_2d.gradient.radial.negative.html \
-	test_2d.gradient.radial.nonfinite.html \
-	test_2d.gradient.radial.inside1.html \
-	$(NULL)
-
-_TEST_FILES_3 = \
-	test_2d.gradient.radial.cone.bottom.html \
-	test_2d.gradient.radial.cone.cylinder.html \
-	test_2d.gradient.radial.cone.shape1.html \
-	test_2d.gradient.radial.transform.1.html \
-	test_2d.gradient.radial.transform.2.html \
-	test_2d.gradient.radial.transform.3.html \
-	test_2d.pattern.basic.type.html \
-	test_2d.pattern.basic.image.html \
-	test_2d.pattern.basic.canvas.html \
-	test_2d.pattern.basic.zerocanvas.html \
-	test_2d.pattern.basic.nocontext.html \
-	test_2d.pattern.image.undefined.html \
-	test_2d.pattern.image.null.html \
-	test_2d.pattern.image.string.html \
-	test_2d.pattern.image.incomplete.html \
-	test_2d.pattern.image.broken.html \
-	test_2d.pattern.repeat.empty.html \
-	test_2d.pattern.repeat.null.html \
-	test_2d.pattern.repeat.undefined.html \
-	test_2d.pattern.repeat.unrecognised.html \
-	test_2d.pattern.repeat.case.html \
-	test_2d.pattern.repeat.nullsuffix.html \
-	test_2d.pattern.modify.image1.html \
-	test_2d.pattern.modify.image2.html \
-	test_2d.pattern.modify.canvas1.html \
-	test_2d.pattern.modify.canvas2.html \
-	test_2d.pattern.crosscanvas.html \
-	test_2d.pattern.paint.norepeat.basic.html \
-	test_2d.pattern.paint.norepeat.outside.html \
-	test_2d.pattern.paint.norepeat.coord1.html \
-	test_2d.pattern.paint.norepeat.coord2.html \
-	test_2d.pattern.paint.norepeat.coord3.html \
-	test_2d.pattern.paint.repeat.basic.html \
-	test_2d.pattern.paint.repeat.outside.html \
-	test_2d.pattern.paint.repeat.coord1.html \
-	test_2d.pattern.paint.repeat.coord2.html \
-	test_2d.pattern.paint.repeat.coord3.html \
-	test_2d.pattern.paint.repeatx.basic.html \
-	test_2d.pattern.paint.repeatx.outside.html \
-	test_2d.pattern.paint.repeatx.coord1.html \
-	test_2d.pattern.paint.repeaty.basic.html \
-	test_2d.pattern.paint.repeaty.outside.html \
-	test_2d.pattern.paint.repeaty.coord1.html \
-	test_2d.pattern.paint.orientation.image.html \
-	test_2d.pattern.paint.orientation.canvas.html \
-	test_2d.pattern.animated.gif.html \
-	test_2d.line.defaults.html \
-	test_2d.line.width.basic.html \
-	test_2d.line.width.transformed.html \
-	test_2d.line.width.invalid.html \
-	test_2d.line.cap.butt.html \
-	test_2d.line.cap.round.html \
-	test_2d.line.cap.square.html \
-	test_2d.line.cap.open.html \
-	test_2d.line.cap.invalid.html \
-	test_2d.line.join.bevel.html \
-	test_2d.line.join.round.html \
-	test_2d.line.join.miter.html \
-	test_2d.line.join.open.html \
-	test_2d.line.join.closed.html \
-	test_2d.line.join.invalid.html \
-	test_2d.line.miter.exceeded.html \
-	test_2d.line.miter.acute.html \
-	test_2d.line.miter.obtuse.html \
-	test_2d.line.miter.rightangle.html \
-	test_2d.line.miter.lineedge.html \
-	test_2d.line.miter.within.html \
-	test_2d.line.miter.invalid.html \
-	test_2d.line.cross.html \
-	test_2d.line.union.html \
-	test_2d.clearRect.basic.html \
-	test_2d.clearRect.path.html \
-	test_2d.clearRect.zero.html \
-	test_2d.clearRect.negative.html \
-	test_2d.clearRect.transform.html \
-	test_2d.clearRect.globalalpha.html \
-	test_2d.clearRect.globalcomposite.html \
-	test_2d.clearRect.clip.html \
-	test_2d.clearRect.shadow.html \
-	test_2d.clearRect.nonfinite.html \
-	test_2d.fillRect.basic.html \
-	test_2d.fillRect.path.html \
-	test_2d.fillRect.zero.html \
-	test_2d.fillRect.negative.html \
-	test_2d.fillRect.transform.html \
-	test_2d.fillRect.clip.html \
-	test_2d.fillRect.shadow.html \
-	$(NULL)
-
-_TEST_FILES_4 = \
-	test_2d.fillRect.nonfinite.html \
-	test_2d.strokeRect.basic.html \
-	test_2d.strokeRect.path.html \
-	test_2d.strokeRect.zero.1.html \
-	test_2d.strokeRect.zero.2.html \
-	test_2d.strokeRect.zero.3.html \
-	test_2d.strokeRect.zero.4.html \
-	test_2d.strokeRect.negative.html \
-	test_2d.strokeRect.transform.html \
-	test_2d.strokeRect.globalalpha.html \
-	test_2d.strokeRect.globalcomposite.html \
-	test_2d.strokeRect.clip.html \
-	test_2d.strokeRect.shadow.html \
-	test_2d.strokeRect.nonfinite.html \
-	test_2d.path.initial.html \
-	test_2d.path.beginPath.html \
-	test_2d.path.moveTo.basic.html \
-	test_2d.path.moveTo.newsubpath.html \
-	test_2d.path.moveTo.multiple.html \
-	test_2d.path.moveTo.nonfinite.html \
-	test_2d.path.closePath.empty.html \
-	test_2d.path.closePath.newline.html \
-	test_2d.path.closePath.nextpoint.html \
-	test_2d.path.lineTo.emptysubpath.html \
-	test_2d.path.lineTo.basic.html \
-	test_2d.path.lineTo.nextpoint.html \
-	test_2d.path.lineTo.nonfinite.html \
-	test_2d.path.quadraticCurveTo.emptysubpath.html \
-	test_2d.path.quadraticCurveTo.basic.html \
-	test_2d.path.quadraticCurveTo.shape.html \
-	test_2d.path.quadraticCurveTo.scaled.html \
-	test_2d.path.quadraticCurveTo.nonfinite.html \
-	test_2d.path.bezierCurveTo.emptysubpath.html \
-	test_2d.path.bezierCurveTo.basic.html \
-	test_2d.path.bezierCurveTo.shape.html \
-	test_2d.path.bezierCurveTo.scaled.html \
-	test_2d.path.bezierCurveTo.nonfinite.html \
-	test_2d.path.arcTo.emptysubpath.html \
-	test_2d.path.arcTo.coincide.1.html \
-	test_2d.path.arcTo.coincide.2.html \
-	test_2d.path.arcTo.collinear.1.html \
-	test_2d.path.arcTo.collinear.2.html \
-	test_2d.path.arcTo.collinear.3.html \
-	test_2d.path.arcTo.shape.curve1.html \
-	test_2d.path.arcTo.shape.curve2.html \
-	test_2d.path.arcTo.shape.start.html \
-	test_2d.path.arcTo.shape.end.html \
-	test_2d.path.arcTo.negative.html \
-	test_2d.path.arcTo.zero.1.html \
-	test_2d.path.arcTo.zero.2.html \
-	test_2d.path.arcTo.transformation.html \
-	test_2d.path.arcTo.scale.html \
-	test_2d.path.arcTo.nonfinite.html \
-	test_2d.path.arc.empty.html \
-	test_2d.path.arc.nonempty.html \
-	test_2d.path.arc.end.html \
-	test_2d.path.arc.angle.1.html \
-	test_2d.path.arc.angle.2.html \
-	test_2d.path.arc.angle.3.html \
-	test_2d.path.arc.angle.4.html \
-	test_2d.path.arc.angle.5.html \
-	test_2d.path.arc.angle.6.html \
-	test_2d.path.arc.zero.1.html \
-	test_2d.path.arc.zero.2.html \
-	test_2d.path.arc.twopie.1.html \
-	test_2d.path.arc.twopie.2.html \
-	test_2d.path.arc.twopie.3.html \
-	test_2d.path.arc.twopie.4.html \
-	test_2d.path.arc.shape.1.html \
-	test_2d.path.arc.shape.2.html \
-	test_2d.path.arc.shape.4.html \
-	test_2d.path.arc.shape.5.html \
-	test_2d.path.arc.selfintersect.1.html \
-	test_2d.path.arc.selfintersect.2.html \
-	test_2d.path.arc.negative.html \
-	test_2d.path.arc.zeroradius.html \
-	test_2d.path.arc.scale.1.html \
-	test_2d.path.arc.scale.2.html \
-	test_2d.path.arc.nonfinite.html \
-	test_2d.path.rect.basic.html \
-	test_2d.path.rect.newsubpath.html \
-	test_2d.path.rect.closed.html \
-	test_2d.path.rect.end.1.html \
-	test_2d.path.rect.end.2.html \
-	test_2d.path.rect.zero.1.html \
-	test_2d.path.rect.zero.2.html \
-	test_2d.path.rect.zero.3.html \
-	test_2d.path.rect.zero.4.html \
-	test_2d.path.rect.zero.5.html \
-	test_2d.path.rect.negative.html \
-	test_2d.path.rect.winding.html \
-	test_2d.path.rect.nonfinite.html \
-	test_2d.path.fill.overlap.html \
-	test_2d.path.fill.winding.add.html \
-	test_2d.path.fill.winding.subtract.1.html \
-	test_2d.path.fill.winding.subtract.2.html \
-	$(NULL)
-
-_TEST_FILES_5 = \
-	test_2d.path.fill.winding.subtract.3.html \
-	test_2d.path.fill.closed.basic.html \
-	test_2d.path.fill.closed.unaffected.html \
-	test_2d.path.stroke.overlap.html \
-	test_2d.path.stroke.union.html \
-	test_2d.path.stroke.unaffected.html \
-	test_2d.path.stroke.scale1.html \
-	test_2d.path.stroke.scale2.html \
-	test_2d.path.stroke.skew.html \
-	test_2d.path.stroke.empty.html \
-	test_2d.path.stroke.prune.line.html \
-	test_2d.path.stroke.prune.closed.html \
-	test_2d.path.stroke.prune.curve.html \
-	test_2d.path.stroke.prune.arc.html \
-	test_2d.path.stroke.prune.rect.html \
-	test_2d.path.stroke.prune.corner.html \
-	test_2d.path.transformation.basic.html \
-	test_2d.path.transformation.multiple.html \
-	test_2d.path.transformation.changing.html \
-	test_2d.path.clip.empty.html \
-	test_2d.path.clip.basic.1.html \
-	test_2d.path.clip.basic.2.html \
-	test_2d.path.clip.intersect.html \
-	test_2d.path.clip.winding.1.html \
-	test_2d.path.clip.winding.2.html \
-	test_2d.path.clip.unaffected.html \
-	test_2d.path.isPointInPath.basic.1.html \
-	test_2d.path.isPointInPath.basic.2.html \
-	test_2d.path.isPointInPath.edge.html \
-	test_2d.path.isPointInPath.empty.html \
-	test_2d.path.isPointInPath.subpath.html \
-	test_2d.path.isPointInPath.outside.html \
-	test_2d.path.isPointInPath.unclosed.html \
-	test_2d.path.isPointInPath.arc.html \
-	test_2d.path.isPointInPath.bigarc.html \
-	test_2d.path.isPointInPath.bezier.html \
-	test_2d.path.isPointInPath.winding.html \
-	test_2d.path.isPointInPath.transform.1.html \
-	test_2d.path.isPointInPath.transform.2.html \
-	test_2d.path.isPointInPath.transform.3.html \
-	test_2d.path.isPointInPath.nonfinite.html \
-	test_2d.drawImage.3arg.html \
-	test_2d.drawImage.5arg.html \
-	test_2d.drawImage.9arg.basic.html \
-	test_2d.drawImage.9arg.sourcepos.html \
-	test_2d.drawImage.9arg.sourcesize.html \
-	test_2d.drawImage.9arg.destpos.html \
-	test_2d.drawImage.9arg.destsize.html \
-	test_2d.drawImage.canvas.html \
-	test_2d.drawImage.self.1.html \
-	test_2d.drawImage.self.2.html \
-	test_2d.drawImage.null.html \
-	test_2d.drawImage.wrongtype.html \
-	test_2d.drawImage.floatsource.html \
-	test_2d.drawImage.zerosource.html \
-	test_2d.drawImage.negativesource.html \
-	test_2d.drawImage.negativedest.html \
-	test_2d.drawImage.outsidesource.html \
-	test_2d.drawImage.incomplete.html \
-	test_2d.drawImage.broken.html \
-	test_2d.drawImage.animated.gif.html \
-	test_2d.drawImage.animated.apng.html \
-	test_2d.drawImage.animated.poster.html \
-	test_2d.drawImage.path.html \
-	test_2d.drawImage.transform.html \
-	test_2d.drawImage.alpha.html \
-	test_2d.drawImage.clip.html \
-	test_2d.drawImage.composite.html \
-	test_2d.drawImage.nowrap.html \
-	test_2d.drawImage.nonfinite.html \
-	test_2d.imageData.create.basic.html \
-	test_2d.imageData.create.type.html \
-	test_2d.imageData.create.initial.html \
-	test_2d.imageData.create.large.html \
-	test_2d.imageData.create.tiny.html \
-	test_2d.imageData.create.negative.html \
-	test_2d.imageData.create.zero.html \
-	test_2d.imageData.create.nonfinite.html \
-	test_2d.imageData.create.round.html \
-	test_2d.imageData.get.basic.html \
-	test_2d.imageData.get.type.html \
-	test_2d.imageData.get.zero.html \
-	test_2d.imageData.get.nonfinite.html \
-	test_2d.imageData.get.source.outside.html \
-	test_2d.imageData.get.source.negative.html \
-	test_2d.imageData.get.source.size.html \
-	test_2d.imageData.get.tiny.html \
-	test_2d.imageData.get.nonpremul.html \
-	test_2d.imageData.get.range.html \
-	test_2d.imageData.get.clamp.html \
-	test_2d.imageData.get.order.cols.html \
-	test_2d.imageData.get.order.rows.html \
-	test_2d.imageData.get.order.rgb.html \
-	test_2d.imageData.get.order.alpha.html \
-	test_2d.imageData.get.unaffected.html \
-	test_2d.imageData.object.properties.html \
-	test_2d.imageData.object.readonly.html \
-	test_2d.imageData.object.ctor.html \
-	test_2d.imageData.object.set.html \
-	test_2d.imageData.object.undefined.html \
-	$(NULL)
-
-_TEST_FILES_6 = \
-	test_2d.imageData.object.nan.html \
-	test_2d.imageData.object.string.html \
-	test_2d.imageData.object.clamp.html \
-	test_2d.imageData.object.round.html \
-	test_2d.imageData.put.null.html \
-	test_2d.imageData.put.nonfinite.html \
-	test_2d.imageData.put.basic.html \
-	test_2d.imageData.put.created.html \
-	test_2d.imageData.put.wrongtype.html \
-	test_2d.imageData.put.cross.html \
-	test_2d.imageData.put.alpha.html \
-	test_2d.imageData.put.modified.html \
-	test_2d.imageData.put.dirty.zero.html \
-	test_2d.imageData.put.dirty.rect1.html \
-	test_2d.imageData.put.dirty.rect2.html \
-	test_2d.imageData.put.dirty.negative.html \
-	test_2d.imageData.put.dirty.outside.html \
-	test_2d.imageData.put.unchanged.html \
-	test_2d.imageData.put.unaffected.html \
-	test_2d.imageData.put.clip.html \
-	test_2d.imageData.put.path.html \
-	test_2d.shadow.attributes.shadowBlur.1.html \
-	test_2d.shadow.attributes.shadowBlur.2.html \
-	test_2d.shadow.attributes.shadowOffset.1.html \
-	test_2d.shadow.attributes.shadowOffset.2.html \
-	test_2d.shadow.attributes.shadowColor.1.html \
-	test_2d.shadow.attributes.shadowColor.2.html \
-	test_2d.shadow.basic.1.html \
-	test_2d.shadow.basic.2.html \
-	test_2d.shadow.offset.positiveX.html \
-	test_2d.shadow.offset.negativeX.html \
-	test_2d.shadow.offset.positiveY.html \
-	test_2d.shadow.offset.negativeY.html \
-	test_2d.shadow.outside.html \
-	test_2d.shadow.clip.1.html \
-	test_2d.shadow.clip.2.html \
-	test_2d.shadow.clip.3.html \
-	test_2d.shadow.stroke.basic.html \
-	test_2d.shadow.stroke.cap.1.html \
-	test_2d.shadow.stroke.cap.2.html \
-	test_2d.shadow.stroke.join.1.html \
-	test_2d.shadow.stroke.join.2.html \
-	test_2d.shadow.stroke.join.3.html \
-	test_2d.shadow.image.basic.html \
-	test_2d.shadow.image.transparent.1.html \
-	test_2d.shadow.image.transparent.2.html \
-	test_2d.shadow.image.alpha.html \
-	test_2d.shadow.image.section.html \
-	test_2d.shadow.image.scale.html \
-	test_2d.shadow.canvas.basic.html \
-	test_2d.shadow.canvas.transparent.1.html \
-	test_2d.shadow.canvas.transparent.2.html \
-	test_2d.shadow.canvas.alpha.html \
-	test_2d.shadow.pattern.basic.html \
-	test_2d.shadow.pattern.transparent.1.html \
-	test_2d.shadow.pattern.transparent.2.html \
-	test_2d.shadow.pattern.alpha.html \
-	test_2d.shadow.gradient.basic.html \
-	test_2d.shadow.gradient.transparent.1.html \
-	test_2d.shadow.gradient.transparent.2.html \
-	test_2d.shadow.gradient.alpha.html \
-	test_2d.shadow.transform.1.html \
-	test_2d.shadow.transform.2.html \
-	test_2d.shadow.blur.low.html \
-	test_2d.shadow.blur.high.html \
-	test_2d.shadow.alpha.1.html \
-	test_2d.shadow.alpha.2.html \
-	test_2d.shadow.alpha.3.html \
-	test_2d.shadow.alpha.4.html \
-	test_2d.shadow.alpha.5.html \
-	test_2d.shadow.composite.1.html \
-	test_2d.shadow.composite.2.html \
-	test_2d.shadow.composite.3.html \
-	test_2d.shadow.composite.4.html \
-	test_2d.imageSmoothing.html \
-	test_bug397524.html \
-	test_bug405982.html \
-	test_text.font.html \
-	test_text.textAlign.html \
-	test_text.textBaseline.html \
-	test_text.measure.html \
-	test_text.space.replace.html \
+	test_canvas.html \
 	image_transparent50.png \
 	image_redtransparent.png \
 	image_yellow.png \
@@ -714,7 +65,6 @@ _TEST_FILES_6 = \
 	image_green.png \
 	image_green-redirect \
 	image_green-redirect^headers^ \
-	test_2d.imagedata_coercion.html \
 	$(NULL)
 
 # xor and lighter aren't well handled by cairo; they mostly work, but we don't want
@@ -746,14 +96,14 @@ _TEST_FILES_6 = \
 # Tests that fail on Mac (possibly because spec is underdefined?).  Bug 407105
 ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 # XXX vlad don't test these anywhere, cairo behaviour changed
-_TEST_FILES_3 += \
+_TEST_FILES_0 += \
 	test_2d.line.join.parallel.html \
 	test_2d.strokeRect.zero.5.html \
 	$(NULL)
 
 # This is an issue with Quartz's handling of radial gradients and some numeric
 # imprecision that results in errors here.
-_TEST_FILES_2 += \
+_TEST_FILES_0 += \
 	test_2d.gradient.radial.inside2.html \
 	test_2d.gradient.radial.inside3.html \
 	test_2d.gradient.radial.outside1.html \
@@ -761,7 +111,7 @@ _TEST_FILES_2 += \
 	test_2d.gradient.radial.cone.top.html \
 	$(NULL)
 
-_TEST_FILES_3 += \
+_TEST_FILES_0 += \
 	test_2d.composite.uncovered.image.source-in.html \
 	test_2d.composite.uncovered.image.destination-in.html \
 	test_2d.composite.uncovered.image.source-out.html \
@@ -772,7 +122,7 @@ _TEST_FILES_3 += \
 # destination bounds seem to have problems with the BEVEL/SQUARE join/cap combo.
 # The joins are rendered as if with MITER; the correct behaviour is also seen
 # if BUTT is used instead of SQUARE.
-_TEST_FILES_4 += test_2d.line.cap.closed.html
+_TEST_FILES_0 += test_2d.line.cap.closed.html
 
 endif
 
@@ -780,7 +130,7 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 
 # still need bug numbers
-_TEST_FILES_1 += \
+_TEST_FILES_0 += \
 	test_2d.composite.uncovered.fill.source-in.html \
 	test_2d.composite.uncovered.fill.destination-in.html \
 	test_2d.composite.uncovered.fill.source-out.html \
@@ -792,7 +142,7 @@ _TEST_FILES_1 += \
 	$(NULL)
 
 # still need bug numbers
-_TEST_FILES_3 += \
+_TEST_FILES_0 += \
 	test_2d.gradient.radial.outside2.html \
 	test_2d.gradient.radial.outside3.html \
 	test_2d.gradient.radial.cone.shape2.html \
@@ -801,9 +151,9 @@ _TEST_FILES_3 += \
 	$(NULL)
 
 # still need bug numbers
-_TEST_FILES_4 += test_2d.path.arc.shape.3.html
+_TEST_FILES_0 += test_2d.path.arc.shape.3.html
 
-_TEST_FILES_5 += test_2d.path.rect.selfintersect.html
+_TEST_FILES_0 += test_2d.path.rect.selfintersect.html
 endif
 
 # These tests only pass on Mac OS X >= 10.5; see bug 450114
@@ -818,22 +168,3 @@ endif
 # split up into groups to work around command-line length limits
 libs:: $(_TEST_FILES_0)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_1)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_2)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_3)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_4)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_5)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_6)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
diff --git a/content/canvas/test/test_canvas.html b/content/canvas/test/test_canvas.html
new file mode 100644
index 00000000000..29b42967af7
--- /dev/null
+++ b/content/canvas/test/test_canvas.html
@@ -0,0 +1,24276 @@
+<!DOCTYPE HTML>
+<title>Canvas Tests</title>
+<script src="/MochiKit/packed.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+
+</script>
+<!-- Includes all the tests in the content/canvas/tests except for test_bug397524.html -->
+
+<!-- [[[ test_2d.canvas.readonly.html ]]] -->
+
+<p>Canvas test: 2d.canvas.readonly</p>
+<!-- Testing: CanvasRenderingContext2D.canvas is readonly -->
+<canvas id="c1" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_canvas_readonly() {
+
+var canvas = document.getElementById('c1');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.canvas.reference.html ]]] -->
+
+<p>Canvas test: 2d.canvas.reference</p>
+<!-- Testing: CanvasRenderingContext2D.canvas refers back to its canvas -->
+<canvas id="c2" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_canvas_reference() {
+
+var canvas = document.getElementById('c2');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.canvas === canvas, "ctx.canvas === canvas");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.basic.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.basic</p>
+<canvas id="c3" 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, d) {
+	var pos = x + "," + y;
+	var colour = r + "," + g + "," + b + "," + a;
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= 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 test_2d_clearRect_basic() {
+
+var canvas = document.getElementById('c3');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.clip.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.clip</p>
+<canvas id="c4" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_clip() {
+
+var canvas = document.getElementById('c4');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.globalalpha.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.globalalpha</p>
+<canvas id="c5" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_globalalpha() {
+
+var canvas = document.getElementById('c5');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.globalcomposite.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.globalcomposite</p>
+<canvas id="c6" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_globalcomposite() {
+
+var canvas = document.getElementById('c6');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.negative.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.negative</p>
+<canvas id="c7" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_negative() {
+
+var canvas = document.getElementById('c7');
+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, 0);
+isPixel(ctx, 75,12, 0,0,0,0, 0);
+isPixel(ctx, 25,37, 0,0,0,0, 0);
+isPixel(ctx, 75,37, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.nonfinite</p>
+<!-- Testing: clearRect() with Infinity/NaN is ignored -->
+<canvas id="c8" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_nonfinite() {
+
+var canvas = document.getElementById('c8');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.path.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.path</p>
+<canvas id="c9" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_path() {
+
+var canvas = document.getElementById('c9');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.shadow.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.shadow</p>
+<canvas id="c10" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_shadow() {
+
+var canvas = document.getElementById('c10');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.transform.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.transform</p>
+<canvas id="c11" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_transform() {
+
+var canvas = document.getElementById('c11');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.zero.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.zero</p>
+<canvas id="c12" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_zero() {
+
+var canvas = document.getElementById('c12');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.canvas.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.copy</p>
+<canvas id="c13" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_copy() {
+
+var canvas = document.getElementById('c13');
+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_1.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, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_1.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.destination-atop</p>
+<canvas id="c14" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_destination_atop() {
+
+var canvas = document.getElementById('c14');
+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_2.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 127,255,127,191, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_2.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.destination-in</p>
+<canvas id="c15" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_destination_in() {
+
+var canvas = document.getElementById('c15');
+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_3.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 0,255,255,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_3.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.destination-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.destination-out</p>
+<canvas id="c16" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_destination_out() {
+
+var canvas = document.getElementById('c16');
+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_4.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, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_4.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.destination-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.destination-over</p>
+<canvas id="c17" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_destination_over() {
+
+var canvas = document.getElementById('c17');
+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_5.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, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_5.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.lighter.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.lighter</p>
+<canvas id="c18" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_lighter() {
+
+var canvas = document.getElementById('c18');
+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_6.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 191,255,127,255, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_6.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.source-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.source-atop</p>
+<canvas id="c19" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_source_atop() {
+
+var canvas = document.getElementById('c19');
+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_7.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, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_7.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.source-in</p>
+<canvas id="c20" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_source_in() {
+
+var canvas = document.getElementById('c20');
+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_8.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 255,255,0,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_8.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.source-out</p>
+<canvas id="c21" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_source_out() {
+
+var canvas = document.getElementById('c21');
+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_9.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 255,255,0,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_9.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.source-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.source-over</p>
+<canvas id="c22" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_source_over() {
+
+var canvas = document.getElementById('c22');
+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_10.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, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_10.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.xor.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.xor</p>
+<canvas id="c23" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_xor() {
+
+var canvas = document.getElementById('c23');
+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_11.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 191,255,63,127, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_11.png" class="resource">
+
+<!-- [[[ test_2d.composite.clip.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.copy</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c24" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_copy() {
+
+var canvas = document.getElementById('c24');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.destination-atop</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c25" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_destination_atop() {
+
+var canvas = document.getElementById('c25');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.destination-in</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c26" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_destination_in() {
+
+var canvas = document.getElementById('c26');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.destination-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.destination-out</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c27" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_destination_out() {
+
+var canvas = document.getElementById('c27');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.destination-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.destination-over</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c28" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_destination_over() {
+
+var canvas = document.getElementById('c28');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.lighter.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.lighter</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c29" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_lighter() {
+
+var canvas = document.getElementById('c29');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.source-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.source-atop</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c30" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_source_atop() {
+
+var canvas = document.getElementById('c30');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.source-in</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c31" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_source_in() {
+
+var canvas = document.getElementById('c31');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.source-out</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c32" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_source_out() {
+
+var canvas = document.getElementById('c32');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.source-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.source-over</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c33" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_source_over() {
+
+var canvas = document.getElementById('c33');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.xor.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.xor</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c34" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_xor() {
+
+var canvas = document.getElementById('c34');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.canvas.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.canvas</p>
+<canvas id="c35" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_globalAlpha_canvas() {
+
+var canvas = document.getElementById('c35');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.canvaspattern.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.canvaspattern - bug 401790</p>
+<canvas id="c36" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function todo_isPixel(ctx, x,y, r,g,b,a, d) {
+	var pos = x + "," + y;
+	var colour = r + "," + g + "," + b + "," + a;
+    var 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 test_2d_composite_globalAlpha_canvaspattern() {
+
+var canvas = document.getElementById('c36');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.default.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.default</p>
+<canvas id="c37" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_globalAlpha_default() {
+
+var canvas = document.getElementById('c37');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.globalAlpha === 1.0, "ctx.globalAlpha === 1.0");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.fill.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.fill</p>
+<canvas id="c38" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_globalAlpha_fill() {
+
+var canvas = document.getElementById('c38');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.image.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.image</p>
+<canvas id="c39" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_globalAlpha_image() {
+
+var canvas = document.getElementById('c39');
+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_1.png'), 0, 0);
+isPixel(ctx, 50,25, 2,253,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_1.png" class="resource">
+
+<!-- [[[ test_2d.composite.globalAlpha.imagepattern.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.imagepattern - bug 401790</p>
+<canvas id="c40" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_globalAlpha_imagepattern() {
+
+var canvas = document.getElementById('c40');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = ctx.createPattern(document.getElementById('red_2.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, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_2.png" class="resource">
+
+<!-- [[[ test_2d.composite.globalAlpha.invalid.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.invalid</p>
+<canvas id="c41" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_globalAlpha_invalid() {
+
+var canvas = document.getElementById('c41');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.range.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.range</p>
+<canvas id="c42" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_globalAlpha_range() {
+
+var canvas = document.getElementById('c42');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.image.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.copy</p>
+<canvas id="c43" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_copy() {
+
+var canvas = document.getElementById('c43');
+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_12.png'), 0, 0);
+isPixel(ctx, 50,25, 255,255,0,191, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_12.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.destination-atop</p>
+<canvas id="c44" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_destination_atop() {
+
+var canvas = document.getElementById('c44');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.drawImage(document.getElementById('yellow75_13.png'), 0, 0);
+isPixel(ctx, 50,25, 127,255,127,191, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_13.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.destination-in</p>
+<canvas id="c45" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_destination_in() {
+
+var canvas = document.getElementById('c45');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.drawImage(document.getElementById('yellow75_14.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,255,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_14.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.destination-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.destination-out</p>
+<canvas id="c46" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_destination_out() {
+
+var canvas = document.getElementById('c46');
+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_15.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,255,31, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_15.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.destination-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.destination-over</p>
+<canvas id="c47" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_destination_over() {
+
+var canvas = document.getElementById('c47');
+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_16.png'), 0, 0);
+isPixel(ctx, 50,25, 109,255,145,223, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_16.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.lighter.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.lighter</p>
+<canvas id="c48" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_lighter() {
+
+var canvas = document.getElementById('c48');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.drawImage(document.getElementById('yellow75_17.png'), 0, 0);
+isPixel(ctx, 50,25, 191,255,127,255, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_17.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.source-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.source-atop</p>
+<canvas id="c49" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_source_atop() {
+
+var canvas = document.getElementById('c49');
+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_18.png'), 0, 0);
+isPixel(ctx, 50,25, 191,255,63,127, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_18.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.source-in</p>
+<canvas id="c50" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_source_in() {
+
+var canvas = document.getElementById('c50');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.drawImage(document.getElementById('yellow75_19.png'), 0, 0);
+isPixel(ctx, 50,25, 255,255,0,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_19.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.source-out</p>
+<canvas id="c51" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_source_out() {
+
+var canvas = document.getElementById('c51');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.drawImage(document.getElementById('yellow75_20.png'), 0, 0);
+isPixel(ctx, 50,25, 255,255,0,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_20.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.source-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.source-over</p>
+<canvas id="c52" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_source_over() {
+
+var canvas = document.getElementById('c52');
+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_21.png'), 0, 0);
+isPixel(ctx, 50,25, 218,255,36,223, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_21.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.xor.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.xor</p>
+<canvas id="c53" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_xor() {
+
+var canvas = document.getElementById('c53');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.drawImage(document.getElementById('yellow75_22.png'), 0, 0);
+isPixel(ctx, 50,25, 191,255,63,127, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_22.png" class="resource">
+
+<!-- [[[ test_2d.composite.operation.casesensitive.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.casesensitive - bug 401788</p>
+<canvas id="c54" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_casesensitive() {
+
+var canvas = document.getElementById('c54');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.clear.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.clear</p>
+<canvas id="c55" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_clear() {
+
+var canvas = document.getElementById('c55');
+var ctx = canvas.getContext('2d');
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'clear';
+todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.darker.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.darker</p>
+<canvas id="c56" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_darker() {
+
+var canvas = document.getElementById('c56');
+var ctx = canvas.getContext('2d');
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'darker';
+todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.default.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.default</p>
+<canvas id="c57" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_default() {
+
+var canvas = document.getElementById('c57');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.globalCompositeOperation == 'source-over', "ctx.globalCompositeOperation == 'source-over'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.get.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.get</p>
+<canvas id="c58" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_get() {
+
+var canvas = document.getElementById('c58');
+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)+"\"]");
+}
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.highlight.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.highlight - bug 401788</p>
+<canvas id="c59" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_highlight() {
+
+var canvas = document.getElementById('c59');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.nullsuffix.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.nullsuffix - bug 401788</p>
+<canvas id="c60" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_nullsuffix() {
+
+var canvas = document.getElementById('c60');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.over.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.over</p>
+<canvas id="c61" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_over() {
+
+var canvas = document.getElementById('c61');
+var ctx = canvas.getContext('2d');
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'over';
+todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.unrecognised.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.unrecognised - bug 401788</p>
+<canvas id="c62" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_unrecognised() {
+
+var canvas = document.getElementById('c62');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.copy</p>
+<canvas id="c63" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_copy() {
+
+var canvas = document.getElementById('c63');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.destination-atop</p>
+<canvas id="c64" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_destination_atop() {
+
+var canvas = document.getElementById('c64');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.destination-in</p>
+<canvas id="c65" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_destination_in() {
+
+var canvas = document.getElementById('c65');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.destination-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.destination-out</p>
+<canvas id="c66" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_destination_out() {
+
+var canvas = document.getElementById('c66');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.destination-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.destination-over</p>
+<canvas id="c67" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_destination_over() {
+
+var canvas = document.getElementById('c67');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.lighter.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.lighter</p>
+<canvas id="c68" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_lighter() {
+
+var canvas = document.getElementById('c68');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 255,255,255,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.source-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.source-atop</p>
+<canvas id="c69" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_source_atop() {
+
+var canvas = document.getElementById('c69');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.source-in</p>
+<canvas id="c70" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_source_in() {
+
+var canvas = document.getElementById('c70');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.source-out</p>
+<canvas id="c71" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_source_out() {
+
+var canvas = document.getElementById('c71');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.source-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.source-over</p>
+<canvas id="c72" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_source_over() {
+
+var canvas = document.getElementById('c72');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.xor.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.xor</p>
+<canvas id="c73" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_xor() {
+
+var canvas = document.getElementById('c73');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.copy</p>
+<canvas id="c74" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_copy() {
+
+var canvas = document.getElementById('c74');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.destination-atop</p>
+<canvas id="c75" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_destination_atop() {
+
+var canvas = document.getElementById('c75');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.destination-in</p>
+<canvas id="c76" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_destination_in() {
+
+var canvas = document.getElementById('c76');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.destination-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.destination-out</p>
+<canvas id="c77" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_destination_out() {
+
+var canvas = document.getElementById('c77');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.destination-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.destination-over</p>
+<canvas id="c78" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_destination_over() {
+
+var canvas = document.getElementById('c78');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.lighter.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.lighter</p>
+<canvas id="c79" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_lighter() {
+
+var canvas = document.getElementById('c79');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,127,191,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.source-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.source-atop</p>
+<canvas id="c80" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_source_atop() {
+
+var canvas = document.getElementById('c80');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.source-in</p>
+<canvas id="c81" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_source_in() {
+
+var canvas = document.getElementById('c81');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.source-out</p>
+<canvas id="c82" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_source_out() {
+
+var canvas = document.getElementById('c82');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.source-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.source-over</p>
+<canvas id="c83" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_source_over() {
+
+var canvas = document.getElementById('c83');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.xor.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.xor</p>
+<canvas id="c84" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_xor() {
+
+var canvas = document.getElementById('c84');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,63,191,127, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.fill.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.fill.copy</p>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c85" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_fill_copy() {
+
+var canvas = document.getElementById('c85');
+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, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.fill.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.fill.destination-atop</p>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c86" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_fill_destination_atop() {
+
+var canvas = document.getElementById('c86');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.fill.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.fill.destination-in</p>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c87" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_fill_destination_in() {
+
+var canvas = document.getElementById('c87');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.fill.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.fill.source-in</p>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c88" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_fill_source_in() {
+
+var canvas = document.getElementById('c88');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.fill.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.fill.source-out</p>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c89" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_fill_source_out() {
+
+var canvas = document.getElementById('c89');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.image.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.image.copy</p>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c90" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_image_copy() {
+
+var canvas = document.getElementById('c90');
+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_1.png'), 40, 40, 10, 10, 40, 50, 10, 10);
+todo_isPixel(ctx, 15,15, 0,0,0,0, 5);
+todo_isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_1.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.image.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.image.destination-atop</p>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c91" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_image_destination_atop() {
+
+var canvas = document.getElementById('c91');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.drawImage(document.getElementById('yellow_2.png'), 40, 40, 10, 10, 40, 50, 10, 10);
+isPixel(ctx, 15,15, 0,0,0,0, 5);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_2.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.image.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.image.destination-in</p>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c92" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_image_destination_in() {
+
+var canvas = document.getElementById('c92');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.drawImage(document.getElementById('yellow_3.png'), 40, 40, 10, 10, 40, 50, 10, 10);
+isPixel(ctx, 15,15, 0,0,0,0, 5);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_3.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.image.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.image.source-in</p>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c93" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_image_source_in() {
+
+var canvas = document.getElementById('c93');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.drawImage(document.getElementById('yellow_4.png'), 40, 40, 10, 10, 40, 50, 10, 10);
+isPixel(ctx, 15,15, 0,0,0,0, 5);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_4.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.image.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.image.source-out</p>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c94" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_image_source_out() {
+
+var canvas = document.getElementById('c94');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.drawImage(document.getElementById('yellow_5.png'), 40, 40, 10, 10, 40, 50, 10, 10);
+isPixel(ctx, 15,15, 0,0,0,0, 5);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_5.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.pattern.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.pattern.copy</p>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c95" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_pattern_copy() {
+
+var canvas = document.getElementById('c95');
+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_6.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+todo_isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_6.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.pattern.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.pattern.destination-atop</p>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c96" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_pattern_destination_atop() {
+
+var canvas = document.getElementById('c96');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow_7.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_7.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.pattern.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.pattern.destination-in</p>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c97" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_pattern_destination_in() {
+
+var canvas = document.getElementById('c97');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow_8.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_8.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.pattern.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.pattern.source-in</p>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c98" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_pattern_source_in() {
+
+var canvas = document.getElementById('c98');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow_9.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_9.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.pattern.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.pattern.source-out</p>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c99" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_pattern_source_out() {
+
+var canvas = document.getElementById('c99');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow_10.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_10.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.3arg.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.3arg</p>
+<canvas id="c100" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_3arg() {
+
+var canvas = document.getElementById('c100');
+var ctx = canvas.getContext('2d');
+
+ctx.drawImage(document.getElementById('green_1.png'), 0, 0);
+ctx.drawImage(document.getElementById('red_3.png'), -100, 0);
+ctx.drawImage(document.getElementById('red_3.png'), 100, 0);
+ctx.drawImage(document.getElementById('red_3.png'), 0, -50);
+ctx.drawImage(document.getElementById('red_3.png'), 0, 50);
+
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_3.png" class="resource">
+<img src="image_green.png" id="green_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.5arg.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.5arg</p>
+<canvas id="c101" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_5arg() {
+
+var canvas = document.getElementById('c101');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_2.png'), 50, 0, 50, 50);
+ctx.drawImage(document.getElementById('red_4.png'), 0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_4.png" class="resource">
+<img src="image_green.png" id="green_2.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.9arg.basic.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.9arg.basic</p>
+<canvas id="c102" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_9arg_basic() {
+
+var canvas = document.getElementById('c102');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_3.png'), 0, 0, 100, 50, 0, 0, 100, 50);
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_green.png" id="green_3.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.9arg.destpos.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.9arg.destpos</p>
+<canvas id="c103" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_9arg_destpos() {
+
+var canvas = document.getElementById('c103');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_4.png'), 0, 0, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('red_5.png'), 0, 0, 100, 50, -100, 0, 100, 50);
+ctx.drawImage(document.getElementById('red_5.png'), 0, 0, 100, 50, 100, 0, 100, 50);
+ctx.drawImage(document.getElementById('red_5.png'), 0, 0, 100, 50, 0, -50, 100, 50);
+ctx.drawImage(document.getElementById('red_5.png'), 0, 0, 100, 50, 0, 50, 100, 50);
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_5.png" class="resource">
+<img src="image_green.png" id="green_4.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.9arg.destsize.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.9arg.destsize</p>
+<canvas id="c104" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_9arg_destsize() {
+
+var canvas = document.getElementById('c104');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_5.png'), 1, 1, 1, 1, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('red_6.png'), 0, 0, 100, 50, -50, 0, 50, 50);
+ctx.drawImage(document.getElementById('red_6.png'), 0, 0, 100, 50, 100, 0, 50, 50);
+ctx.drawImage(document.getElementById('red_6.png'), 0, 0, 100, 50, 0, -25, 100, 25);
+ctx.drawImage(document.getElementById('red_6.png'), 0, 0, 100, 50, 0, 50, 100, 25);
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_6.png" class="resource">
+<img src="image_green.png" id="green_5.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.9arg.sourcepos.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.9arg.sourcepos</p>
+<canvas id="c105" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_9arg_sourcepos() {
+
+var canvas = document.getElementById('c105');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('rgrg-256x256_1.png'), 140, 20, 100, 50, 0, 0, 100, 50);
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.9arg.sourcesize.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.9arg.sourcesize</p>
+<canvas id="c106" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_9arg_sourcesize() {
+
+var canvas = document.getElementById('c106');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('rgrg-256x256_2.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, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+isPixel(ctx, 20,20, 0,255,0,255, 2);
+isPixel(ctx, 80,20, 0,255,0,255, 2);
+isPixel(ctx, 20,30, 0,255,0,255, 2);
+isPixel(ctx, 80,30, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256_2.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.alpha.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.alpha</p>
+<canvas id="c107" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_alpha() {
+
+var canvas = document.getElementById('c107');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalAlpha = 0;
+ctx.drawImage(document.getElementById('red_7.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_7.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.animated.apng.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.animated.apng</p>
+<!-- Testing: drawImage() of an APNG with no poster frame draws the first frame -->
+<canvas id="c108" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function deferTest() {
+    _deferred = true;
+}
+function wrapFunction(f) {
+    return function () {
+        f.apply(null, arguments);
+    };
+}
+
+var canvas108 = document.getElementById('c108');
+var ctx108 = canvas108.getContext('2d');
+var isDone_test_2d_drawImage_animated_apng = false;
+
+function test_2d_drawImage_animated_apng() {
+
+deferTest();
+setTimeout(wrapFunction(function () {
+    ctx108.drawImage(document.getElementById('anim-gr_1.png'), 0, 0);
+    todo_isPixel(ctx108, 50,25, 0,255,0,255, 2);
+	isDone_test_2d_drawImage_animated_apng = true;
+}), 5000);
+
+
+}
+</script>
+<img src="image_anim-gr.png" id="anim-gr_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.animated.gif.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.animated.gif</p>
+<!-- Testing: drawImage() of an animated GIF draws the first frame -->
+<canvas id="c109" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas109 = document.getElementById('c109');
+var ctx109 = canvas109.getContext('2d');
+var isDone_test_2d_drawImage_animated_gif = false;
+
+function test_2d_drawImage_animated_gif() {
+
+deferTest();
+setTimeout(wrapFunction(function () {
+    ctx109.drawImage(document.getElementById('anim-gr_1.gif'), 0, 0);
+    todo_isPixel(ctx109, 50,25, 0,255,0,255, 2);
+	isDone_test_2d_drawImage_animated_gif = true;
+}), 5000);
+
+
+}
+</script>
+<img src="image_anim-gr.gif" id="anim-gr_1.gif" class="resource">
+
+<!-- [[[ test_2d.drawImage.animated.poster.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.animated.poster</p>
+<!-- Testing: drawImage() of an APNG draws the poster frame -->
+<canvas id="c110" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas110 = document.getElementById('c110');
+var ctx110 = canvas110.getContext('2d');
+
+
+function test_2d_drawImage_animated_poster() {
+
+ctx110.drawImage(document.getElementById('anim-poster-gr_1.png'), 0, 0);
+todo_isPixel(ctx110, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_anim-poster-gr.png" id="anim-poster-gr_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.broken.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.broken</p>
+<canvas id="c111" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_drawImage_broken() {
+
+var canvas = document.getElementById('c111');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('broken_1.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");
+
+
+}
+</script>
+<img src="image_broken.png" id="broken_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.canvas.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.canvas</p>
+<canvas id="c112" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_canvas() {
+
+var canvas = document.getElementById('c112');
+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, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.clip.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.clip</p>
+<canvas id="c113" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_clip() {
+
+var canvas = document.getElementById('c113');
+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_8.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_8.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.composite.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.composite</p>
+<canvas id="c114" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_composite() {
+
+var canvas = document.getElementById('c114');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+ctx.drawImage(document.getElementById('red_9.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_9.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.floatsource.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.floatsource</p>
+<canvas id="c115" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_floatsource() {
+
+var canvas = document.getElementById('c115');
+var ctx = canvas.getContext('2d');
+
+ctx.drawImage(document.getElementById('green_6.png'), 10.1, 10.1, 0.1, 0.1, 0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_green.png" id="green_6.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.incomplete.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.incomplete</p>
+<canvas id="c116" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_drawImage_incomplete() {
+
+var canvas = document.getElementById('c116');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.negativedest.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.negativedest</p>
+<canvas id="c117" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_negativedest() {
+
+var canvas = document.getElementById('c117');
+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_1.png'), 100, 78, 50, 50, 0, 50, 50, -50);
+ctx.drawImage(document.getElementById('ggrr-256x256_1.png'), 100, 128, 50, -50, 100, 50, -50, -50);
+isPixel(ctx, 1,1, 0,255,0,255, 2);
+isPixel(ctx, 1,48, 0,255,0,255, 2);
+isPixel(ctx, 98,1, 0,255,0,255, 2);
+isPixel(ctx, 98,48, 0,255,0,255, 2);
+isPixel(ctx, 48,1, 0,255,0,255, 2);
+isPixel(ctx, 48,48, 0,255,0,255, 2);
+isPixel(ctx, 51,1, 0,255,0,255, 2);
+isPixel(ctx, 51,48, 0,255,0,255, 2);
+isPixel(ctx, 25,25, 0,255,0,255, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+<img src="image_ggrr-256x256.png" id="ggrr-256x256_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.negativesource.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.negativesource</p>
+<canvas id="c118" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_negativesource() {
+
+var canvas = document.getElementById('c118');
+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_2.png'), 100, 78, -100, 50, 0, 0, 50, 50);
+ctx.drawImage(document.getElementById('ggrr-256x256_2.png'), 100, 128, -100, -50, 50, 0, 50, 50);
+isPixel(ctx, 1,1, 0,255,0,255, 2);
+isPixel(ctx, 1,48, 0,255,0,255, 2);
+isPixel(ctx, 98,1, 0,255,0,255, 2);
+isPixel(ctx, 98,48, 0,255,0,255, 2);
+isPixel(ctx, 48,1, 0,255,0,255, 2);
+isPixel(ctx, 48,48, 0,255,0,255, 2);
+isPixel(ctx, 51,1, 0,255,0,255, 2);
+isPixel(ctx, 51,48, 0,255,0,255, 2);
+isPixel(ctx, 25,25, 0,255,0,255, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+<img src="image_ggrr-256x256.png" id="ggrr-256x256_2.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.nonfinite</p>
+<!-- Testing: drawImage() with Infinity/NaN is ignored -->
+<canvas id="c119" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_nonfinite() {
+
+var canvas = document.getElementById('c119');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+var red = document.getElementById('red_10.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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+<img src="image_red.png" id="red_10.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.nowrap.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.nowrap</p>
+<!-- Testing: Stretched images do not get pixels wrapping around the edges -->
+<canvas id="c120" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_nowrap() {
+
+var canvas = document.getElementById('c120');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('redtransparent_1.png'), -1950, 0, 2000, 50);
+isPixel(ctx, 45,25, 0,255,0,255, 2);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 55,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_redtransparent.png" id="redtransparent_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.null.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.null</p>
+<canvas id="c121" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_drawImage_null() {
+
+var canvas = document.getElementById('c121');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.outsidesource.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.outsidesource</p>
+<canvas id="c122" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_drawImage_outsidesource() {
+
+var canvas = document.getElementById('c122');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.drawImage(document.getElementById('green_7.png'), 10.5, 10.5, 89.5, 39.5, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_7.png'), 5.5, 5.5, -5.5, -5.5, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_7.png'), 100, 50, -5, -5, 0, 0, 100, 50);
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_11.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_11.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_11.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_11.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_11.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_11.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_11.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_11.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, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+<img src="image_green.png" id="green_7.png" class="resource">
+<img src="image_red.png" id="red_11.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.path.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.path</p>
+<canvas id="c123" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_path() {
+
+var canvas = document.getElementById('c123');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.rect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('red_12.png'), 0, 0);
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_12.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.self.1.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.self.1 - bug 433235</p>
+<canvas id="c124" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_self_1() {
+
+var canvas = document.getElementById('c124');
+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, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.self.2.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.self.2 - bug 433235</p>
+<canvas id="c125" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_self_2() {
+
+var canvas = document.getElementById('c125');
+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, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.transform.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.transform</p>
+<canvas id="c126" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_transform() {
+
+var canvas = document.getElementById('c126');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.translate(100, 0);
+ctx.drawImage(document.getElementById('red_13.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_13.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.wrongtype.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.wrongtype</p>
+<canvas id="c127" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_drawImage_wrongtype() {
+
+var canvas = document.getElementById('c127');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.zerosource.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.zerosource</p>
+<!-- Testing: drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR -->
+<canvas id="c128" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_zerosource() {
+
+var canvas = document.getElementById('c128');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_14.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_14.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_14.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, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_14.png" class="resource">
+
+<!-- [[[ test_2d.fillRect.basic.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.basic</p>
+<canvas id="c129" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_basic() {
+
+var canvas = document.getElementById('c129');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.clip.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.clip</p>
+<canvas id="c130" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_clip() {
+
+var canvas = document.getElementById('c130');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.negative.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.negative</p>
+<canvas id="c131" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_negative() {
+
+var canvas = document.getElementById('c131');
+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, 0);
+isPixel(ctx, 75,12, 0,255,0,255, 0);
+isPixel(ctx, 25,37, 0,255,0,255, 0);
+isPixel(ctx, 75,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.nonfinite</p>
+<!-- Testing: fillRect() with Infinity/NaN is ignored -->
+<canvas id="c132" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_nonfinite() {
+
+var canvas = document.getElementById('c132');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.path.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.path</p>
+<canvas id="c133" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_path() {
+
+var canvas = document.getElementById('c133');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.shadow.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.shadow</p>
+<canvas id="c134" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_shadow() {
+
+var canvas = document.getElementById('c134');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.transform.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.transform</p>
+<canvas id="c135" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_transform() {
+
+var canvas = document.getElementById('c135');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.zero.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.zero</p>
+<canvas id="c136" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_zero() {
+
+var canvas = document.getElementById('c136');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.default.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.default</p>
+<canvas id="c137" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_fillStyle_default() {
+
+var canvas = document.getElementById('c137');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.fillStyle == '#000000', "ctx.fillStyle == '#000000'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.get.semitransparent.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.get.semitransparent</p>
+<canvas id="c138" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_fillStyle_get_semitransparent() {
+
+var canvas = document.getElementById('c138');
+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+\\)$/");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.get.solid.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.get.solid</p>
+<canvas id="c139" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_fillStyle_get_solid() {
+
+var canvas = document.getElementById('c139');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#fa0';
+ok(ctx.fillStyle === '#ffaa00', "ctx.fillStyle === '#ffaa00'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.get.transparent.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.get.transparent</p>
+<canvas id="c140" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_fillStyle_get_transparent() {
+
+var canvas = document.getElementById('c140');
+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)'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.invalidstring.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.invalidstring</p>
+<canvas id="c141" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_invalidstring() {
+
+var canvas = document.getElementById('c141');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.invalidtype.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.invalidtype</p>
+<canvas id="c142" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_invalidtype() {
+
+var canvas = document.getElementById('c142');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.current.basic.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.current.basic</p>
+<!-- Testing: currentColor is computed from the canvas element -->
+<canvas id="c143" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_fillStyle_parse_current_basic() {
+
+var canvas = document.getElementById('c143');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.current.changed.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.current.changed</p>
+<!-- Testing: currentColor is computed when the attribute is set, not when it is painted -->
+<canvas id="c144" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_fillStyle_parse_current_changed() {
+
+var canvas = document.getElementById('c144');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.current.removed.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.current.removed</p>
+<!-- Testing: currentColor is solid black when the canvas element is not in a document -->
+<canvas id="c145" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_fillStyle_parse_current_removed() {
+
+var canvas = document.getElementById('c145');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hex3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hex3</p>
+<canvas id="c146" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hex3() {
+
+var canvas = document.getElementById('c146');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hex6.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hex6</p>
+<canvas id="c147" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hex6() {
+
+var canvas = document.getElementById('c147');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-1</p>
+<canvas id="c148" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_1() {
+
+var canvas = document.getElementById('c148');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-2</p>
+<canvas id="c149" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_2() {
+
+var canvas = document.getElementById('c149');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-3</p>
+<canvas id="c150" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_3() {
+
+var canvas = document.getElementById('c150');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-4</p>
+<canvas id="c151" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_4() {
+
+var canvas = document.getElementById('c151');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-5</p>
+<canvas id="c152" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_5() {
+
+var canvas = document.getElementById('c152');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-clamp-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-clamp-1</p>
+<canvas id="c153" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_clamp_1() {
+
+var canvas = document.getElementById('c153');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-clamp-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-clamp-2</p>
+<canvas id="c154" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_clamp_2() {
+
+var canvas = document.getElementById('c154');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-clamp-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-clamp-3</p>
+<canvas id="c155" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_clamp_3() {
+
+var canvas = document.getElementById('c155');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-clamp-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-clamp-4</p>
+<canvas id="c156" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_clamp_4() {
+
+var canvas = document.getElementById('c156');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-1</p>
+<canvas id="c157" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_1() {
+
+var canvas = document.getElementById('c157');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-2</p>
+<canvas id="c158" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_2() {
+
+var canvas = document.getElementById('c158');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-1</p>
+<canvas id="c159" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_1() {
+
+var canvas = document.getElementById('c159');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-2</p>
+<canvas id="c160" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_2() {
+
+var canvas = document.getElementById('c160');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-3</p>
+<canvas id="c161" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_3() {
+
+var canvas = document.getElementById('c161');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-4</p>
+<canvas id="c162" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_4() {
+
+var canvas = document.getElementById('c162');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-5</p>
+<canvas id="c163" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_5() {
+
+var canvas = document.getElementById('c163');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-6.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-6</p>
+<canvas id="c164" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_6() {
+
+var canvas = document.getElementById('c164');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.html4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.html4</p>
+<canvas id="c165" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_html4() {
+
+var canvas = document.getElementById('c165');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hex3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hex3</p>
+<canvas id="c166" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hex3() {
+
+var canvas = document.getElementById('c166');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hex6.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hex6</p>
+<canvas id="c167" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hex6() {
+
+var canvas = document.getElementById('c167');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsl-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsl-1</p>
+<canvas id="c168" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsl_1() {
+
+var canvas = document.getElementById('c168');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsl-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsl-2</p>
+<canvas id="c169" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsl_2() {
+
+var canvas = document.getElementById('c169');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsl-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsl-3</p>
+<canvas id="c170" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsl_3() {
+
+var canvas = document.getElementById('c170');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsl-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsl-4</p>
+<canvas id="c171" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsl_4() {
+
+var canvas = document.getElementById('c171');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsl-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsl-5</p>
+<canvas id="c172" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsl_5() {
+
+var canvas = document.getElementById('c172');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsla-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsla-1</p>
+<canvas id="c173" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsla_1() {
+
+var canvas = document.getElementById('c173');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsla-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsla-2</p>
+<canvas id="c174" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsla_2() {
+
+var canvas = document.getElementById('c174');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-1</p>
+<canvas id="c175" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_1() {
+
+var canvas = document.getElementById('c175');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-2</p>
+<canvas id="c176" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_2() {
+
+var canvas = document.getElementById('c176');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-3</p>
+<canvas id="c177" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_3() {
+
+var canvas = document.getElementById('c177');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-4</p>
+<canvas id="c178" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_4() {
+
+var canvas = document.getElementById('c178');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-5</p>
+<canvas id="c179" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_5() {
+
+var canvas = document.getElementById('c179');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-6.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-6</p>
+<canvas id="c180" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_6() {
+
+var canvas = document.getElementById('c180');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-7.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-7</p>
+<canvas id="c181" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_7() {
+
+var canvas = document.getElementById('c181');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgba-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgba-1</p>
+<canvas id="c182" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgba_1() {
+
+var canvas = document.getElementById('c182');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgba-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgba-2</p>
+<canvas id="c183" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgba_2() {
+
+var canvas = document.getElementById('c183');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgba-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgba-3</p>
+<canvas id="c184" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgba_3() {
+
+var canvas = document.getElementById('c184');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgba-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgba-4</p>
+<canvas id="c185" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgba_4() {
+
+var canvas = document.getElementById('c185');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgba-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgba-5</p>
+<canvas id="c186" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgba_5() {
+
+var canvas = document.getElementById('c186');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-clamp-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-clamp-1</p>
+<canvas id="c187" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_clamp_1() {
+
+var canvas = document.getElementById('c187');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-clamp-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-clamp-2</p>
+<canvas id="c188" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_clamp_2() {
+
+var canvas = document.getElementById('c188');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-clamp-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-clamp-3</p>
+<canvas id="c189" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_clamp_3() {
+
+var canvas = document.getElementById('c189');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-clamp-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-clamp-4</p>
+<canvas id="c190" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_clamp_4() {
+
+var canvas = document.getElementById('c190');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-clamp-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-clamp-5</p>
+<canvas id="c191" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_clamp_5() {
+
+var canvas = document.getElementById('c191');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-num.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-num</p>
+<canvas id="c192" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_num() {
+
+var canvas = document.getElementById('c192');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-percent.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-percent</p>
+<canvas id="c193" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_percent() {
+
+var canvas = document.getElementById('c193');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-clamp-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-clamp-1</p>
+<canvas id="c194" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_clamp_1() {
+
+var canvas = document.getElementById('c194');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-clamp-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-clamp-2</p>
+<canvas id="c195" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_clamp_2() {
+
+var canvas = document.getElementById('c195');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-num-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-num-1</p>
+<canvas id="c196" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_num_1() {
+
+var canvas = document.getElementById('c196');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-num-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-num-2</p>
+<canvas id="c197" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_num_2() {
+
+var canvas = document.getElementById('c197');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-percent.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-percent</p>
+<canvas id="c198" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_percent() {
+
+var canvas = document.getElementById('c198');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-solid-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-solid-1</p>
+<canvas id="c199" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_solid_1() {
+
+var canvas = document.getElementById('c199');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-solid-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-solid-2</p>
+<canvas id="c200" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_solid_2() {
+
+var canvas = document.getElementById('c200');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.svg-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.svg-1</p>
+<canvas id="c201" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_svg_1() {
+
+var canvas = document.getElementById('c201');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.svg-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.svg-2</p>
+<canvas id="c202" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_svg_2() {
+
+var canvas = document.getElementById('c202');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.system.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.system</p>
+<canvas id="c203" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_fillStyle_parse_system() {
+
+var canvas = document.getElementById('c203');
+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
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.transparent-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.transparent-1</p>
+<canvas id="c204" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_transparent_1() {
+
+var canvas = document.getElementById('c204');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.transparent-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.transparent-2</p>
+<canvas id="c205" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_transparent_2() {
+
+var canvas = document.getElementById('c205');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.getcontext.exists.html ]]] -->
+
+<p>Canvas test: 2d.getcontext.exists</p>
+<!-- Testing: The 2D context is implemented -->
+<canvas id="c206" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_getcontext_exists() {
+
+var canvas = document.getElementById('c206');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.getContext('2d') !== null, "canvas.getContext('2d') !== null");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.getcontext.shared.html ]]] -->
+
+<p>Canvas test: 2d.getcontext.shared</p>
+<!-- Testing: getContext('2d') returns objects which share canvas state -->
+<canvas id="c207" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_getcontext_shared() {
+
+var canvas = document.getElementById('c207');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.getcontext.unique.html ]]] -->
+
+<p>Canvas test: 2d.getcontext.unique</p>
+<!-- Testing: getContext('2d') returns the same object -->
+<canvas id="c208" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_getcontext_unique() {
+
+var canvas = document.getElementById('c208');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.getContext('2d') === canvas.getContext('2d'), "canvas.getContext('2d') === canvas.getContext('2d')");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.empty.html ]]] -->
+
+<p>Canvas test: 2d.gradient.empty</p>
+<canvas id="c209" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_empty() {
+
+var canvas = document.getElementById('c209');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.alpha.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.alpha</p>
+<canvas id="c210" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_alpha() {
+
+var canvas = document.getElementById('c210');
+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, 3);
+isPixel(ctx, 50,25, 127,127,127,255, 3);
+isPixel(ctx, 75,25, 63,63,191,255, 3);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.colour.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.colour</p>
+<canvas id="c211" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_colour() {
+
+var canvas = document.getElementById('c211');
+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, 3);
+isPixel(ctx, 50,25, 127,127,127,255, 3);
+isPixel(ctx, 75,25, 63,63,191,255, 3);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.colouralpha.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.colouralpha</p>
+<canvas id="c212" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_colouralpha() {
+
+var canvas = document.getElementById('c212');
+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, 3);
+isPixel(ctx, 50,25, 127,127,127,127, 3);
+isPixel(ctx, 75,25, 63,63,191,191, 3);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.multiple.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.multiple</p>
+<canvas id="c213" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_multiple() {
+
+var canvas = document.getElementById('c213');
+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, 3);
+isPixel(ctx, 100,25, 0,255,255,255, 3);
+isPixel(ctx, 150,25, 127,127,255,255, 3);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.outside.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.outside</p>
+<canvas id="c214" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_outside() {
+
+var canvas = document.getElementById('c214');
+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, 2);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 80,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.overlap.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.overlap</p>
+<canvas id="c215" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_overlap() {
+
+var canvas = document.getElementById('c215');
+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, 16);
+isPixel(ctx, 51,25, 255,255,0,255, 16);
+isPixel(ctx, 99,25, 0,0,255,255, 16);
+isPixel(ctx, 101,25, 255,255,0,255, 16);
+isPixel(ctx, 149,25, 0,0,255,255, 16);
+isPixel(ctx, 151,25, 255,255,0,255, 16);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.overlap2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.overlap2</p>
+<canvas id="c216" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_overlap2() {
+
+var canvas = document.getElementById('c216');
+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, 0);
+isPixel(ctx, 30,25, 0,255,0,255, 0);
+isPixel(ctx, 40,25, 0,255,0,255, 0);
+isPixel(ctx, 60,25, 0,255,0,255, 0);
+isPixel(ctx, 80,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.solid.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.solid</p>
+<canvas id="c217" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_solid() {
+
+var canvas = document.getElementById('c217');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.vertical.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.vertical</p>
+<canvas id="c218" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_vertical() {
+
+var canvas = document.getElementById('c218');
+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, 10);
+isPixel(ctx, 50,25, 127,127,127,255, 5);
+isPixel(ctx, 50,37, 63,63,191,255, 10);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.zerosize.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.zerosize</p>
+<canvas id="c219" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_interpolate_zerosize() {
+
+var canvas = document.getElementById('c219');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.linear.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.gradient.linear.nonfinite</p>
+<!-- Testing: createLinearGradient() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<canvas id="c220" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_linear_nonfinite() {
+
+var canvas = document.getElementById('c220');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.linear.transform.1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.linear.transform.1</p>
+<!-- Testing: Linear gradient coordinates are relative to the coordinate space at the time of filling -->
+<canvas id="c221" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_linear_transform_1() {
+
+var canvas = document.getElementById('c221');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.linear.transform.2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.linear.transform.2</p>
+<!-- Testing: Linear gradient coordinates are relative to the coordinate space at the time of filling -->
+<canvas id="c222" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_linear_transform_2() {
+
+var canvas = document.getElementById('c222');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.linear.transform.3.html ]]] -->
+
+<p>Canvas test: 2d.gradient.linear.transform.3</p>
+<!-- Testing: Linear gradient transforms do not experience broken caching effects -->
+<canvas id="c223" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_linear_transform_3() {
+
+var canvas = document.getElementById('c223');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.compare.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.compare</p>
+<canvas id="c224" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_object_compare() {
+
+var canvas = document.getElementById('c224');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.crosscanvas.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.crosscanvas</p>
+<canvas id="c225" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_object_crosscanvas() {
+
+var canvas = document.getElementById('c225');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.invalidcolour.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.invalidcolour</p>
+<canvas id="c226" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_object_invalidcolour() {
+
+var canvas = document.getElementById('c226');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.invalidoffset.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.invalidoffset</p>
+<canvas id="c227" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_object_invalidoffset() {
+
+var canvas = document.getElementById('c227');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.return.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.return</p>
+<!-- Testing: createLinearGradient() and createRadialGradient() returns objects implementing CanvasGradient -->
+<canvas id="c228" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_object_return() {
+
+var canvas = document.getElementById('c228');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.type.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.type</p>
+<!-- Testing: window.CanvasGradient exists and has the right properties -->
+<canvas id="c229" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_object_type() {
+
+var canvas = document.getElementById('c229');
+var ctx = canvas.getContext('2d');
+
+ok(window.CanvasGradient !== undefined, "window.CanvasGradient !== undefined");
+ok(window.CanvasGradient.prototype.addColorStop !== undefined, "window.CanvasGradient.prototype.addColorStop !== undefined");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.update.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.update</p>
+<canvas id="c230" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_object_update() {
+
+var canvas = document.getElementById('c230');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.behind.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.behind</p>
+<canvas id="c231" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_cone_behind() {
+
+var canvas = document.getElementById('c231');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(120, 25, 10, 211, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.beside.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.beside</p>
+<canvas id="c232" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_cone_beside() {
+
+var canvas = document.getElementById('c232');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(0, 100, 40, 100, 100, 50);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.bottom.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.bottom</p>
+<canvas id="c233" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_cone_bottom() {
+
+var canvas = document.getElementById('c233');
+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, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.cylinder.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.cylinder</p>
+<canvas id="c234" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_cone_cylinder() {
+
+var canvas = document.getElementById('c234');
+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, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.front.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.front</p>
+<canvas id="c235" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_cone_front() {
+
+var canvas = document.getElementById('c235');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(311, 25, 10, 210, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.shape1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.shape1</p>
+<canvas id="c236" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_cone_shape1() {
+
+var canvas = document.getElementById('c236');
+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, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.shape2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.shape2</p>
+<canvas id="c237" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_cone_shape2() {
+
+var canvas = document.getElementById('c237');
+var ctx = canvas.getContext('2d');
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(30+10*5/2, 40, 10*3/2, 30+10*15/4, 40, 10*9/4);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(30-tol, 40);
+ctx.lineTo(110, -20-tol);
+ctx.lineTo(110, 100+tol);
+ctx.fill();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.top.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.top</p>
+<canvas id="c238" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_cone_top() {
+
+var canvas = document.getElementById('c238');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(230, 25, 100, 100, 25, 101);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.equal.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.equal</p>
+<canvas id="c239" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_equal() {
+
+var canvas = document.getElementById('c239');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 20, 50, 25, 20);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.inside1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.inside1</p>
+<canvas id="c240" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_inside1() {
+
+var canvas = document.getElementById('c240');
+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, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.inside2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.inside2</p>
+<canvas id="c241" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_inside2() {
+
+var canvas = document.getElementById('c241');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 200, 50, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.inside3.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.inside3</p>
+<canvas id="c242" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_inside3() {
+
+var canvas = document.getElementById('c242');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 200, 50, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.993, '#f00');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.negative.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.negative</p>
+<!-- Testing: createRadialGradient() throws INDEX_SIZE_ERR if either radius is negative -->
+<canvas id="c243" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_radial_negative() {
+
+var canvas = document.getElementById('c243');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.nonfinite</p>
+<!-- Testing: createRadialGradient() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<canvas id="c244" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_radial_nonfinite() {
+
+var canvas = document.getElementById('c244');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.outside1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.outside1</p>
+<canvas id="c245" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_outside1() {
+
+var canvas = document.getElementById('c245');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(200, 25, 10, 200, 25, 20);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.outside2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.outside2</p>
+<canvas id="c246" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_outside2() {
+
+var canvas = document.getElementById('c246');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(200, 25, 20, 200, 25, 10);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.outside3.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.outside3</p>
+<canvas id="c247" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_outside3() {
+
+var canvas = document.getElementById('c247');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(200, 25, 20, 200, 25, 10);
+g.addColorStop(0, '#0f0');
+g.addColorStop(0.001, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.touch1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.touch1</p>
+<canvas id="c248" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_touch1() {
+
+var canvas = document.getElementById('c248');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(150, 25, 50, 200, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.touch2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.touch2</p>
+<canvas id="c249" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_touch2() {
+
+var canvas = document.getElementById('c249');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(-80, 25, 70, 0, 25, 150);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.01, '#0f0');
+g.addColorStop(0.99, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.touch3.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.touch3</p>
+<canvas id="c250" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_touch3() {
+
+var canvas = document.getElementById('c250');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(120, -15, 25, 140, -30, 50);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.transform.1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.transform.1</p>
+<!-- Testing: Radial gradient coordinates are relative to the coordinate space at the time of filling -->
+<canvas id="c251" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_transform_1() {
+
+var canvas = document.getElementById('c251');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.transform.2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.transform.2</p>
+<!-- Testing: Radial gradient coordinates are relative to the coordinate space at the time of filling -->
+<canvas id="c252" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_transform_2() {
+
+var canvas = document.getElementById('c252');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.transform.3.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.transform.3</p>
+<!-- Testing: Radial gradient transforms do not experience broken caching effects -->
+<canvas id="c253" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_transform_3() {
+
+var canvas = document.getElementById('c253');
+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, 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+todo_isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.basic.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.basic - bug 433004</p>
+<!-- Testing: createImageData() exists and returns something -->
+<canvas id="c254" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_basic() {
+
+var canvas = document.getElementById('c254');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.createImageData(1, 1) !== null, "ctx.createImageData(1, 1) !== null");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.initial.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.initial - bug 433004</p>
+<!-- Testing: createImageData() returns transparent black data of the right size -->
+<canvas id="c255" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_initial() {
+
+var canvas = document.getElementById('c255');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.large.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.large - bug 433004</p>
+<!-- Testing: createImageData() works for sizes much larger than the canvas -->
+<canvas id="c256" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_large() {
+
+var canvas = document.getElementById('c256');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.negative.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.negative - bug 433004</p>
+<!-- Testing: createImageData() takes the absolute magnitude of the size arguments -->
+<canvas id="c257" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_negative() {
+
+var canvas = document.getElementById('c257');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.nonfinite - bug 433004</p>
+<!-- Testing: createImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<canvas id="c258" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_nonfinite() {
+
+var canvas = document.getElementById('c258');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.round.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.round - bug 433004</p>
+<!-- Testing: createImageData(w, h) is rounded the same as getImageData(0, 0, w, h) -->
+<canvas id="c259" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_round() {
+
+var canvas = document.getElementById('c259');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.tiny.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.tiny - bug 433004</p>
+<!-- Testing: createImageData() works for sizes smaller than one pixel -->
+<canvas id="c260" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_tiny() {
+
+var canvas = document.getElementById('c260');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.type.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.type - bug 433004</p>
+<!-- Testing: createImageData() returns an ImageData object containing a CanvasPixelArray object -->
+<canvas id="c261" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_type() {
+
+var canvas = document.getElementById('c261');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.zero.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.zero - bug 433004</p>
+<!-- Testing: createImageData() throws INDEX_SIZE_ERR if size is zero -->
+<canvas id="c262" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_zero() {
+
+var canvas = document.getElementById('c262');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.basic.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.basic</p>
+<!-- Testing: getImageData() exists and returns something -->
+<canvas id="c263" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_basic() {
+
+var canvas = document.getElementById('c263');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.getImageData(0, 0, 100, 50) !== null, "ctx.getImageData(0, 0, 100, 50) !== null");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.clamp.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.clamp</p>
+<!-- Testing: getImageData() clamps colours to the range [0, 255] -->
+<canvas id="c264" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_clamp() {
+
+var canvas = document.getElementById('c264');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.nonfinite</p>
+<!-- Testing: getImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<canvas id="c265" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_nonfinite() {
+
+var canvas = document.getElementById('c265');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.nonpremul.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.nonpremul</p>
+<!-- Testing: getImageData() returns non-premultiplied colours -->
+<canvas id="c266" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_nonpremul() {
+
+var canvas = document.getElementById('c266');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.order.alpha.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.order.alpha</p>
+<!-- Testing: getImageData() returns A in the fourth component -->
+<canvas id="c267" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_order_alpha() {
+
+var canvas = document.getElementById('c267');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.order.cols.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.order.cols</p>
+<!-- Testing: getImageData() returns leftmost columns first -->
+<canvas id="c268" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_order_cols() {
+
+var canvas = document.getElementById('c268');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.order.rgb.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.order.rgb</p>
+<!-- Testing: getImageData() returns R then G then B -->
+<canvas id="c269" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_order_rgb() {
+
+var canvas = document.getElementById('c269');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.order.rows.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.order.rows</p>
+<!-- Testing: getImageData() returns topmost rows first -->
+<canvas id="c270" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_order_rows() {
+
+var canvas = document.getElementById('c270');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.range.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.range</p>
+<!-- Testing: getImageData() returns values in the range [0, 255] -->
+<canvas id="c271" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_range() {
+
+var canvas = document.getElementById('c271');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.source.negative.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.source.negative</p>
+<!-- Testing: getImageData() works with negative width and height -->
+<canvas id="c272" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_source_negative() {
+
+var canvas = document.getElementById('c272');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.source.outside.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.source.outside</p>
+<!-- Testing: getImageData() returns transparent black outside the canvas -->
+<canvas id="c273" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_source_outside() {
+
+var canvas = document.getElementById('c273');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.source.size.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.source.size</p>
+<!-- Testing: getImageData() returns bigger ImageData for bigger source rectangle -->
+<canvas id="c274" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_source_size() {
+
+var canvas = document.getElementById('c274');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.tiny.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.tiny</p>
+<!-- Testing: getImageData() works for sizes smaller than one pixel -->
+<canvas id="c275" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_tiny() {
+
+var canvas = document.getElementById('c275');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.type.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.type</p>
+<!-- Testing: getImageData() returns an ImageData object containing a CanvasPixelArray object -->
+<canvas id="c276" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_type() {
+
+var canvas = document.getElementById('c276');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.unaffected.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.unaffected</p>
+<!-- Testing: getImageData() is not affected by context state -->
+<canvas id="c277" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_get_unaffected() {
+
+var canvas = document.getElementById('c277');
+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, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.zero.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.zero</p>
+<!-- Testing: getImageData() throws INDEX_SIZE_ERR if size is zero -->
+<canvas id="c278" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_zero() {
+
+var canvas = document.getElementById('c278');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.clamp.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.clamp</p>
+<!-- Testing: ImageData.data clamps numbers to [0, 255] -->
+<canvas id="c279" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_clamp() {
+
+var canvas = document.getElementById('c279');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.ctor.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.ctor</p>
+<!-- Testing: ImageData does not have a usable constructor -->
+<canvas id="c280" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_ctor() {
+
+var canvas = document.getElementById('c280');
+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"); }
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.nan.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.nan</p>
+<!-- Testing: ImageData.data converts NaN to 0 -->
+<canvas id="c281" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_nan() {
+
+var canvas = document.getElementById('c281');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.properties.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.properties</p>
+<!-- Testing: ImageData objects have the right properties -->
+<canvas id="c282" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_properties() {
+
+var canvas = document.getElementById('c282');
+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'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.readonly.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.readonly</p>
+<!-- Testing: ImageData objects properties are read-only -->
+<canvas id="c283" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_readonly() {
+
+var canvas = document.getElementById('c283');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.round.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.round</p>
+<!-- Testing: ImageData.data rounds numbers with convertToIntegerTiesToEven -->
+<canvas id="c284" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_round() {
+
+var canvas = document.getElementById('c284');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.set.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.set</p>
+<!-- Testing: ImageData.data can be modified -->
+<canvas id="c285" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_set() {
+
+var canvas = document.getElementById('c285');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.string.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.string</p>
+<!-- Testing: ImageData.data converts strings to numbers with ToNumber -->
+<canvas id="c286" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_string() {
+
+var canvas = document.getElementById('c286');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.undefined.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.undefined</p>
+<!-- Testing: ImageData.data converts undefined to 0 -->
+<canvas id="c287" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_undefined() {
+
+var canvas = document.getElementById('c287');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.alpha.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.alpha</p>
+<!-- Testing: putImageData() puts non-solid image data correctly -->
+<canvas id="c288" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_alpha() {
+
+var canvas = document.getElementById('c288');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.basic.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.basic</p>
+<!-- Testing: putImageData() puts image data from getImageData() onto the canvas -->
+<canvas id="c289" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_basic() {
+
+var canvas = document.getElementById('c289');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.clip.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.clip - bug 433397</p>
+<!-- Testing: putImageData() is not affected by clipping regions -->
+<canvas id="c290" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_imageData_put_clip() {
+
+var canvas = document.getElementById('c290');
+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, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.created.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.created - bug 433004</p>
+<!-- Testing: putImageData() puts image data from createImageData() onto the canvas -->
+<canvas id="c291" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_created() {
+
+var canvas = document.getElementById('c291');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.cross.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.cross</p>
+<!-- Testing: putImageData() accepts image data got from a different canvas -->
+<canvas id="c292" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_cross() {
+
+var canvas = document.getElementById('c292');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.dirty.negative.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.dirty.negative</p>
+<!-- Testing: putImageData() handles negative-sized dirty rectangles correctly -->
+<canvas id="c293" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_dirty_negative() {
+
+var canvas = document.getElementById('c293');
+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, 2);
+isPixel(ctx, 35,25, 0,255,0,255, 2);
+isPixel(ctx, 65,25, 0,255,0,255, 2);
+isPixel(ctx, 50,15, 0,255,0,255, 2);
+isPixel(ctx, 50,45, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.dirty.outside.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.dirty.outside</p>
+<!-- Testing: putImageData() handles dirty rectangles outside the canvas correctly -->
+<canvas id="c294" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_dirty_outside() {
+
+var canvas = document.getElementById('c294');
+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, 2);
+isPixel(ctx, 98,15, 0,255,0,255, 2);
+isPixel(ctx, 98,25, 0,255,0,255, 2);
+isPixel(ctx, 98,45, 0,255,0,255, 2);
+isPixel(ctx, 1,5, 0,255,0,255, 2);
+isPixel(ctx, 1,25, 0,255,0,255, 2);
+isPixel(ctx, 1,45, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.dirty.rect1.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.dirty.rect1</p>
+<!-- Testing: putImageData() only modifies areas inside the dirty rectangle, using width and height -->
+<canvas id="c295" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_dirty_rect1() {
+
+var canvas = document.getElementById('c295');
+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, 2);
+isPixel(ctx, 35,25, 0,255,0,255, 2);
+isPixel(ctx, 65,25, 0,255,0,255, 2);
+isPixel(ctx, 50,15, 0,255,0,255, 2);
+isPixel(ctx, 50,45, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.dirty.rect2.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.dirty.rect2</p>
+<!-- Testing: putImageData() only modifies areas inside the dirty rectangle, using x and y -->
+<canvas id="c296" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_dirty_rect2() {
+
+var canvas = document.getElementById('c296');
+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, 2);
+isPixel(ctx, 35,25, 0,255,0,255, 2);
+isPixel(ctx, 65,25, 0,255,0,255, 2);
+isPixel(ctx, 50,15, 0,255,0,255, 2);
+isPixel(ctx, 50,45, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.dirty.zero.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.dirty.zero</p>
+<!-- Testing: putImageData() with zero-sized dirty rectangle puts nothing -->
+<canvas id="c297" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_imageData_put_dirty_zero() {
+
+var canvas = document.getElementById('c297');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.modified.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.modified</p>
+<!-- Testing: putImageData() puts modified image data correctly -->
+<canvas id="c298" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_modified() {
+
+var canvas = document.getElementById('c298');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.nonfinite</p>
+<!-- Testing: putImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<canvas id="c299" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_put_nonfinite() {
+
+var canvas = document.getElementById('c299');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.null.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.null - bug 421715</p>
+<!-- Testing: putImageData() with null imagedata throws TYPE_MISMATCH_ERR -->
+<canvas id="c300" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_put_null() {
+
+var canvas = document.getElementById('c300');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.path.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.path</p>
+<!-- Testing: putImageData() does not affect the current path -->
+<canvas id="c301" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_path() {
+
+var canvas = document.getElementById('c301');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.unaffected.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.unaffected</p>
+<!-- Testing: putImageData() is not affected by context state -->
+<canvas id="c302" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_unaffected() {
+
+var canvas = document.getElementById('c302');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.unchanged.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.unchanged</p>
+<!-- Testing: putImageData(getImageData(...), ...) has no effect -->
+<canvas id="c303" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_put_unchanged() {
+
+var canvas = document.getElementById('c303');
+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)+"\"]");
+}
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.wrongtype.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.wrongtype</p>
+<!-- Testing: putImageData() does not accept non-ImageData objects -->
+<canvas id="c304" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_put_wrongtype() {
+
+var canvas = document.getElementById('c304');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.butt.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.butt</p>
+<!-- Testing: lineCap 'butt' is rendered correctly -->
+<canvas id="c305" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cap_butt() {
+
+var canvas = document.getElementById('c305');
+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, 0);
+isPixel(ctx, 25,15, 0,255,0,255, 0);
+isPixel(ctx, 25,16, 0,255,0,255, 0);
+isPixel(ctx, 25,34, 0,255,0,255, 0);
+isPixel(ctx, 25,35, 0,255,0,255, 0);
+isPixel(ctx, 25,36, 0,255,0,255, 0);
+
+isPixel(ctx, 75,14, 0,255,0,255, 0);
+isPixel(ctx, 75,15, 0,255,0,255, 0);
+isPixel(ctx, 75,16, 0,255,0,255, 0);
+isPixel(ctx, 75,34, 0,255,0,255, 0);
+isPixel(ctx, 75,35, 0,255,0,255, 0);
+isPixel(ctx, 75,36, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.closed.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.closed</p>
+<!-- Testing: Line caps are not drawn at the corners of an unclosed rectangle -->
+<canvas id="c306" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cap_closed() {
+
+var canvas = document.getElementById('c306');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'bevel';
+ctx.lineCap = 'square';
+ctx.lineWidth = 400;
+
+ctx.beginPath();
+ctx.moveTo(200, 200);
+ctx.lineTo(200, 1000);
+ctx.lineTo(1000, 1000);
+ctx.lineTo(1000, 200);
+ctx.closePath();
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.invalid.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.invalid - bug 401788</p>
+<!-- Testing: Setting lineCap to invalid values is ignored -->
+<canvas id="c307" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_line_cap_invalid() {
+
+var canvas = document.getElementById('c307');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.open.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.open</p>
+<!-- Testing: Line caps are drawn at the corners of an unclosed rectangle -->
+<canvas id="c308" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cap_open() {
+
+var canvas = document.getElementById('c308');
+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, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.round.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.round</p>
+<!-- Testing: lineCap 'round' is rendered correctly -->
+<canvas id="c309" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cap_round() {
+
+var canvas = document.getElementById('c309');
+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, 0);
+isPixel(ctx, 25,6, 0,255,0,255, 0);
+isPixel(ctx, 32,6, 0,255,0,255, 0);
+isPixel(ctx, 17,43, 0,255,0,255, 0);
+isPixel(ctx, 25,43, 0,255,0,255, 0);
+isPixel(ctx, 32,43, 0,255,0,255, 0);
+
+isPixel(ctx, 67,6, 0,255,0,255, 0);
+isPixel(ctx, 75,6, 0,255,0,255, 0);
+isPixel(ctx, 82,6, 0,255,0,255, 0);
+isPixel(ctx, 67,43, 0,255,0,255, 0);
+isPixel(ctx, 75,43, 0,255,0,255, 0);
+isPixel(ctx, 82,43, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.square.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.square</p>
+<!-- Testing: lineCap 'square' is rendered correctly -->
+<canvas id="c310" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cap_square() {
+
+var canvas = document.getElementById('c310');
+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, 0);
+isPixel(ctx, 25,5, 0,255,0,255, 0);
+isPixel(ctx, 25,6, 0,255,0,255, 0);
+isPixel(ctx, 25,44, 0,255,0,255, 0);
+isPixel(ctx, 25,45, 0,255,0,255, 0);
+isPixel(ctx, 25,46, 0,255,0,255, 0);
+
+isPixel(ctx, 75,4, 0,255,0,255, 0);
+isPixel(ctx, 75,5, 0,255,0,255, 0);
+isPixel(ctx, 75,6, 0,255,0,255, 0);
+isPixel(ctx, 75,44, 0,255,0,255, 0);
+isPixel(ctx, 75,45, 0,255,0,255, 0);
+isPixel(ctx, 75,46, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cross.html ]]] -->
+
+<p>Canvas test: 2d.line.cross</p>
+<canvas id="c311" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cross() {
+
+var canvas = document.getElementById('c311');
+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, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.defaults.html ]]] -->
+
+<p>Canvas test: 2d.line.defaults</p>
+<canvas id="c312" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_line_defaults() {
+
+var canvas = document.getElementById('c312');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.bevel.html ]]] -->
+
+<p>Canvas test: 2d.line.join.bevel</p>
+<!-- Testing: lineJoin 'bevel' is rendered correctly -->
+<canvas id="c313" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_bevel() {
+
+var canvas = document.getElementById('c313');
+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, 0);
+isPixel(ctx, 34,15, 0,255,0,255, 0);
+isPixel(ctx, 35,15, 0,255,0,255, 0);
+isPixel(ctx, 36,15, 0,255,0,255, 0);
+isPixel(ctx, 36,14, 0,255,0,255, 0);
+
+isPixel(ctx, 84,16, 0,255,0,255, 0);
+isPixel(ctx, 84,15, 0,255,0,255, 0);
+isPixel(ctx, 85,15, 0,255,0,255, 0);
+isPixel(ctx, 86,15, 0,255,0,255, 0);
+isPixel(ctx, 86,14, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.closed.html ]]] -->
+
+<p>Canvas test: 2d.line.join.closed</p>
+<!-- Testing: Line joins are drawn at the corner of a closed rectangle -->
+<canvas id="c314" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_closed() {
+
+var canvas = document.getElementById('c314');
+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, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.invalid.html ]]] -->
+
+<p>Canvas test: 2d.line.join.invalid - bug 401788</p>
+<!-- Testing: Setting lineJoin to invalid values is ignored -->
+<canvas id="c315" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_line_join_invalid() {
+
+var canvas = document.getElementById('c315');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.miter.html ]]] -->
+
+<p>Canvas test: 2d.line.join.miter</p>
+<!-- Testing: lineJoin 'miter' is rendered correctly -->
+<canvas id="c316" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_miter() {
+
+var canvas = document.getElementById('c316');
+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, 0);
+isPixel(ctx, 39,11, 0,255,0,255, 0);
+isPixel(ctx, 40,10, 0,255,0,255, 0);
+isPixel(ctx, 41,9, 0,255,0,255, 0);
+isPixel(ctx, 42,8, 0,255,0,255, 0);
+
+isPixel(ctx, 88,12, 0,255,0,255, 0);
+isPixel(ctx, 89,11, 0,255,0,255, 0);
+isPixel(ctx, 90,10, 0,255,0,255, 0);
+isPixel(ctx, 91,9, 0,255,0,255, 0);
+isPixel(ctx, 92,8, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.open.html ]]] -->
+
+<p>Canvas test: 2d.line.join.open</p>
+<!-- Testing: Line joins are not drawn at the corner of an unclosed rectangle -->
+<canvas id="c317" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_open() {
+
+var canvas = document.getElementById('c317');
+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, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.parallel.html ]]] -->
+
+<p>Canvas test: 2d.line.join.parallel</p>
+<!-- Testing: Line joins are drawn at 180-degree joins -->
+<canvas id="c318" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_parallel() {
+
+var canvas = document.getElementById('c318');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 300;
+ctx.lineJoin = 'round';
+ctx.beginPath();
+ctx.moveTo(-100, 25);
+ctx.lineTo(0, 25);
+ctx.lineTo(-100, 25);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.round.html ]]] -->
+
+<p>Canvas test: 2d.line.join.round</p>
+<!-- Testing: lineJoin 'round' is rendered correctly -->
+<canvas id="c319" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_round() {
+
+var canvas = document.getElementById('c319');
+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, 0);
+isPixel(ctx, 36,13, 0,255,0,255, 0);
+isPixel(ctx, 37,13, 0,255,0,255, 0);
+isPixel(ctx, 38,13, 0,255,0,255, 0);
+isPixel(ctx, 38,12, 0,255,0,255, 0);
+
+isPixel(ctx, 86,14, 0,255,0,255, 0);
+isPixel(ctx, 86,13, 0,255,0,255, 0);
+isPixel(ctx, 87,13, 0,255,0,255, 0);
+isPixel(ctx, 88,13, 0,255,0,255, 0);
+isPixel(ctx, 88,12, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.acute.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.acute</p>
+<!-- Testing: Miter joins are drawn correctly with acute angles -->
+<canvas id="c320" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_acute() {
+
+var canvas = document.getElementById('c320');
+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, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.exceeded.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.exceeded</p>
+<!-- Testing: Miter joins are not drawn when the miter limit is exceeded -->
+<canvas id="c321" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_exceeded() {
+
+var canvas = document.getElementById('c321');
+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, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.invalid.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.invalid</p>
+<!-- Testing: Setting miterLimit to invalid values is ignored -->
+<canvas id="c322" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_line_miter_invalid() {
+
+var canvas = document.getElementById('c322');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.lineedge.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.lineedge - bug 401791</p>
+<!-- Testing: Miter joins are not drawn when the miter limit is exceeded at the corners of a zero-height rectangle -->
+<canvas id="c323" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_lineedge() {
+
+var canvas = document.getElementById('c323');
+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, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.obtuse.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.obtuse</p>
+<!-- Testing: Miter joins are drawn correctly with obtuse angles -->
+<canvas id="c324" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_obtuse() {
+
+var canvas = document.getElementById('c324');
+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, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.rightangle.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.rightangle - bug 401791</p>
+<!-- Testing: Miter joins are not drawn when the miter limit is exceeded, on exact right angles -->
+<canvas id="c325" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_rightangle() {
+
+var canvas = document.getElementById('c325');
+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, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.within.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.within</p>
+<!-- Testing: Miter joins are drawn when the miter limit is not quite exceeded -->
+<canvas id="c326" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_within() {
+
+var canvas = document.getElementById('c326');
+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, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.union.html ]]] -->
+
+<p>Canvas test: 2d.line.union</p>
+<canvas id="c327" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_union() {
+
+var canvas = document.getElementById('c327');
+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, 0);
+isPixel(ctx, 25,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 25,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.width.basic.html ]]] -->
+
+<p>Canvas test: 2d.line.width.basic</p>
+<!-- Testing: lineWidth determines the width of line strokes -->
+<canvas id="c328" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_width_basic() {
+
+var canvas = document.getElementById('c328');
+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, 0);
+isPixel(ctx, 15,25, 0,255,0,255, 0);
+isPixel(ctx, 16,25, 0,255,0,255, 0);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 34,25, 0,255,0,255, 0);
+isPixel(ctx, 35,25, 0,255,0,255, 0);
+isPixel(ctx, 36,25, 0,255,0,255, 0);
+
+isPixel(ctx, 64,25, 0,255,0,255, 0);
+isPixel(ctx, 65,25, 0,255,0,255, 0);
+isPixel(ctx, 66,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+isPixel(ctx, 84,25, 0,255,0,255, 0);
+isPixel(ctx, 85,25, 0,255,0,255, 0);
+isPixel(ctx, 86,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.width.invalid.html ]]] -->
+
+<p>Canvas test: 2d.line.width.invalid</p>
+<!-- Testing: Setting lineWidth to invalid values is ignored -->
+<canvas id="c329" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_line_width_invalid() {
+
+var canvas = document.getElementById('c329');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.width.transformed.html ]]] -->
+
+<p>Canvas test: 2d.line.width.transformed</p>
+<!-- Testing: Line stroke widths are affected by scale transformations -->
+<canvas id="c330" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_width_transformed() {
+
+var canvas = document.getElementById('c330');
+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, 0);
+isPixel(ctx, 15,25, 0,255,0,255, 0);
+isPixel(ctx, 16,25, 0,255,0,255, 0);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 34,25, 0,255,0,255, 0);
+isPixel(ctx, 35,25, 0,255,0,255, 0);
+isPixel(ctx, 36,25, 0,255,0,255, 0);
+
+isPixel(ctx, 64,25, 0,255,0,255, 0);
+isPixel(ctx, 65,25, 0,255,0,255, 0);
+isPixel(ctx, 66,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+isPixel(ctx, 84,25, 0,255,0,255, 0);
+isPixel(ctx, 85,25, 0,255,0,255, 0);
+isPixel(ctx, 86,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.missingargs.html ]]] -->
+
+<p>Canvas test: 2d.missingargs</p>
+<!-- Testing: Missing arguments cause NOT_SUPPORTED_ERR -->
+<canvas id="c331" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_missingargs() {
+
+var canvas = document.getElementById('c331');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.1</p>
+<!-- Testing: arc() draws pi/2 .. -pi anticlockwise correctly -->
+<canvas id="c332" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_1() {
+
+var canvas = document.getElementById('c332');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.2</p>
+<!-- Testing: arc() draws -3pi/2 .. -pi anticlockwise correctly -->
+<canvas id="c333" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_2() {
+
+var canvas = document.getElementById('c333');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.3.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.3</p>
+<!-- Testing: arc() wraps angles mod 2pi when anticlockwise and end > start+2pi -->
+<canvas id="c334" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_3() {
+
+var canvas = document.getElementById('c334');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.4.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.4</p>
+<!-- Testing: arc() draws a full circle when clockwise and end > start+2pi -->
+<canvas id="c335" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_4() {
+
+var canvas = document.getElementById('c335');
+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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.5.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.5</p>
+<!-- Testing: arc() wraps angles mod 2pi when clockwise and start > end+2pi -->
+<canvas id="c336" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_5() {
+
+var canvas = document.getElementById('c336');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.6.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.6</p>
+<!-- Testing: arc() draws a full circle when anticlockwise and start > end+2pi -->
+<canvas id="c337" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_6() {
+
+var canvas = document.getElementById('c337');
+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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.empty.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.empty</p>
+<!-- Testing: arc() with an empty path does not draw a straight line to the start point -->
+<canvas id="c338" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_empty() {
+
+var canvas = document.getElementById('c338');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.end.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.end</p>
+<!-- Testing: arc() adds the end point of the arc to the subpath -->
+<canvas id="c339" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_end() {
+
+var canvas = document.getElementById('c339');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.negative.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.negative</p>
+<!-- Testing: arc() with negative radius throws INDEX_SIZE_ERR -->
+<canvas id="c340" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_arc_negative() {
+
+var canvas = document.getElementById('c340');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.nonempty.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.nonempty</p>
+<!-- Testing: arc() with a non-empty path does draw a straight line to the start point -->
+<canvas id="c341" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_nonempty() {
+
+var canvas = document.getElementById('c341');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.nonfinite</p>
+<!-- Testing: arc() with Infinity/NaN is ignored -->
+<canvas id="c342" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_nonfinite() {
+
+var canvas = document.getElementById('c342');
+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, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.scale.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.scale.1</p>
+<!-- Testing: Non-uniformly scaled arcs are the right shape -->
+<canvas id="c343" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_scale_1() {
+
+var canvas = document.getElementById('c343');
+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);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.scale.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.scale.2</p>
+<!-- Testing: Highly scaled arcs are the right shape -->
+<canvas id="c344" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_scale_2() {
+
+var canvas = document.getElementById('c344');
+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, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.selfintersect.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.selfintersect.1</p>
+<!-- Testing: arc() with lineWidth > 2*radius is drawn sensibly -->
+<canvas id="c345" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_selfintersect_1() {
+
+var canvas = document.getElementById('c345');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.selfintersect.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.selfintersect.2</p>
+<!-- Testing: arc() with lineWidth > 2*radius is drawn sensibly -->
+<canvas id="c346" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_selfintersect_2() {
+
+var canvas = document.getElementById('c346');
+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, 0);
+isPixel(ctx, 90,10, 0,255,0,255, 0);
+isPixel(ctx, 97,1, 0,255,0,255, 0);
+isPixel(ctx, 97,2, 0,255,0,255, 0);
+isPixel(ctx, 97,3, 0,255,0,255, 0);
+isPixel(ctx, 2,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.shape.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.shape.1</p>
+<!-- Testing: arc() from 0 to pi does not draw anything in the wrong half -->
+<canvas id="c347" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_shape_1() {
+
+var canvas = document.getElementById('c347');
+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, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 20,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.shape.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.shape.2</p>
+<!-- Testing: arc() from 0 to pi draws stuff in the right half -->
+<canvas id="c348" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_shape_2() {
+
+var canvas = document.getElementById('c348');
+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, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 20,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.shape.3.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.shape.3</p>
+<!-- Testing: arc() from 0 to -pi/2 does not draw anything in the wrong quadrant -->
+<canvas id="c349" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arc_shape_3() {
+
+var canvas = document.getElementById('c349');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 100;
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.arc(0, 50, 50, 0, -Math.PI/2, false);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.shape.4.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.shape.4</p>
+<!-- Testing: arc() from 0 to -pi/2 draws stuff in the right quadrant -->
+<canvas id="c350" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_shape_4() {
+
+var canvas = document.getElementById('c350');
+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, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.shape.5.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.shape.5</p>
+<!-- Testing: arc() from 0 to 5pi does not draw crazy things -->
+<canvas id="c351" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_shape_5() {
+
+var canvas = document.getElementById('c351');
+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, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.twopie.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.twopie.1</p>
+<!-- Testing: arc() draws nothing when end = start + 2pi-e and anticlockwise -->
+<canvas id="c352" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_twopie_1() {
+
+var canvas = document.getElementById('c352');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.twopie.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.twopie.2</p>
+<!-- Testing: arc() draws a full circle when end = start + 2pi-e and clockwise -->
+<canvas id="c353" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_twopie_2() {
+
+var canvas = document.getElementById('c353');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.twopie.3.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.twopie.3</p>
+<!-- Testing: arc() draws a full circle when end = start + 2pi+e and anticlockwise -->
+<canvas id="c354" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_twopie_3() {
+
+var canvas = document.getElementById('c354');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.twopie.4.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.twopie.4</p>
+<!-- Testing: arc() draws nothing when end = start + 2pi+e and clockwise -->
+<canvas id="c355" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_twopie_4() {
+
+var canvas = document.getElementById('c355');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.zero.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.zero.1</p>
+<!-- Testing: arc() draws nothing when startAngle = endAngle and anticlockwise -->
+<canvas id="c356" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_zero_1() {
+
+var canvas = document.getElementById('c356');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.zero.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.zero.2</p>
+<!-- Testing: arc() draws nothing when startAngle = endAngle and clockwise -->
+<canvas id="c357" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_zero_2() {
+
+var canvas = document.getElementById('c357');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.zeroradius.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.zeroradius</p>
+<!-- Testing: arc() with zero radius draws a line to the start point -->
+<canvas id="c358" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arc_zeroradius() {
+
+var canvas = document.getElementById('c358');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.coincide.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.coincide.1</p>
+<!-- Testing: arcTo() has no effect if P0 = P1 -->
+<canvas id="c359" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_coincide_1() {
+
+var canvas = document.getElementById('c359');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.coincide.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.coincide.2</p>
+<!-- Testing: arcTo() draws a straight line to P1 if P1 = P2 -->
+<canvas id="c360" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_coincide_2() {
+
+var canvas = document.getElementById('c360');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.collinear.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.collinear.1</p>
+<!-- Testing: arcTo() with all points on a line, and P1 between P0/P2, draws a straight line to P1 -->
+<canvas id="c361" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_collinear_1() {
+
+var canvas = document.getElementById('c361');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.collinear.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.collinear.2</p>
+<!-- Testing: arcTo() with all points on a line, and P2 between P0/P1, draws an infinite line along P1..P2 -->
+<canvas id="c362" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_collinear_2() {
+
+var canvas = document.getElementById('c362');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.collinear.3.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.collinear.3</p>
+<!-- Testing: arcTo() with all points on a line, and P0 between P1/P2, draws an infinite line along P1..P2 -->
+<canvas id="c363" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_collinear_3() {
+
+var canvas = document.getElementById('c363');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.emptysubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.emptysubpath</p>
+<!-- Testing: arcTo() does nothing if there are no subpaths -->
+<canvas id="c364" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_emptysubpath() {
+
+var canvas = document.getElementById('c364');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.negative.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.negative</p>
+<!-- Testing: arcTo() with negative radius throws an exception -->
+<canvas id="c365" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_arcTo_negative() {
+
+var canvas = document.getElementById('c365');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.nonfinite</p>
+<!-- Testing: arcTo() with Infinity/NaN is ignored -->
+<canvas id="c366" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_nonfinite() {
+
+var canvas = document.getElementById('c366');
+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, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.scale.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.scale</p>
+<!-- Testing: arcTo scales the curve, not just the control points -->
+<canvas id="c367" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_scale() {
+
+var canvas = document.getElementById('c367');
+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);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.shape.curve1.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.shape.curve1</p>
+<!-- Testing: arcTo() curves in the right kind of shape -->
+<canvas id="c368" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_shape_curve1() {
+
+var canvas = document.getElementById('c368');
+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, 0);
+isPixel(ctx, 55,19, 0,255,0,255, 0);
+isPixel(ctx, 55,20, 0,255,0,255, 0);
+isPixel(ctx, 55,21, 0,255,0,255, 0);
+isPixel(ctx, 64,22, 0,255,0,255, 0);
+isPixel(ctx, 65,21, 0,255,0,255, 0);
+isPixel(ctx, 72,28, 0,255,0,255, 0);
+isPixel(ctx, 73,27, 0,255,0,255, 0);
+isPixel(ctx, 78,36, 0,255,0,255, 0);
+isPixel(ctx, 79,35, 0,255,0,255, 0);
+isPixel(ctx, 80,44, 0,255,0,255, 0);
+isPixel(ctx, 80,45, 0,255,0,255, 0);
+isPixel(ctx, 80,46, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.shape.curve2.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.shape.curve2</p>
+<!-- Testing: arcTo() curves in the right kind of shape -->
+<canvas id="c369" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_shape_curve2() {
+
+var canvas = document.getElementById('c369');
+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, 0);
+isPixel(ctx, 55,19, 0,255,0,255, 0);
+isPixel(ctx, 55,20, 0,255,0,255, 0);
+isPixel(ctx, 55,21, 0,255,0,255, 0);
+isPixel(ctx, 64,22, 0,255,0,255, 0);
+isPixel(ctx, 65,21, 0,255,0,255, 0);
+isPixel(ctx, 72,28, 0,255,0,255, 0);
+isPixel(ctx, 73,27, 0,255,0,255, 0);
+isPixel(ctx, 78,36, 0,255,0,255, 0);
+isPixel(ctx, 79,35, 0,255,0,255, 0);
+isPixel(ctx, 80,44, 0,255,0,255, 0);
+isPixel(ctx, 80,45, 0,255,0,255, 0);
+isPixel(ctx, 80,46, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.shape.end.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.shape.end</p>
+<!-- Testing: arcTo() does not draw anything from P1 to P2 -->
+<canvas id="c370" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_shape_end() {
+
+var canvas = document.getElementById('c370');
+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, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.shape.start.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.shape.start</p>
+<!-- Testing: arcTo() draws a straight line from P0 to P1 -->
+<canvas id="c371" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_shape_start() {
+
+var canvas = document.getElementById('c371');
+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, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.transformation.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.transformation</p>
+<!-- Testing: arcTo joins up to the last subpath point correctly -->
+<canvas id="c372" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_transformation() {
+
+var canvas = document.getElementById('c372');
+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);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.zero.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.zero.1</p>
+<!-- Testing: arcTo() with zero radius draws a straight line from P0 to P1 -->
+<canvas id="c373" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_zero_1() {
+
+var canvas = document.getElementById('c373');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+ok(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.zero.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.zero.2</p>
+<!-- Testing: arcTo() with zero radius draws a straight line from P0 to P1, even when all points are collinear -->
+<canvas id="c374" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_zero_2() {
+
+var canvas = document.getElementById('c374');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+ok(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.beginPath.html ]]] -->
+
+<p>Canvas test: 2d.path.beginPath</p>
+<canvas id="c375" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_beginPath() {
+
+var canvas = document.getElementById('c375');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.bezierCurveTo.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.bezierCurveTo.basic</p>
+<canvas id="c376" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_bezierCurveTo_basic() {
+
+var canvas = document.getElementById('c376');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.bezierCurveTo.emptysubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.bezierCurveTo.emptysubpath</p>
+<canvas id="c377" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_bezierCurveTo_emptysubpath() {
+
+var canvas = document.getElementById('c377');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.bezierCurveTo.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.bezierCurveTo.nonfinite</p>
+<!-- Testing: bezierCurveTo() with Infinity/NaN is ignored -->
+<canvas id="c378" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_bezierCurveTo_nonfinite() {
+
+var canvas = document.getElementById('c378');
+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, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.bezierCurveTo.scaled.html ]]] -->
+
+<p>Canvas test: 2d.path.bezierCurveTo.scaled</p>
+<canvas id="c379" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_bezierCurveTo_scaled() {
+
+var canvas = document.getElementById('c379');
+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, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.bezierCurveTo.shape.html ]]] -->
+
+<p>Canvas test: 2d.path.bezierCurveTo.shape</p>
+<canvas id="c380" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_bezierCurveTo_shape() {
+
+var canvas = document.getElementById('c380');
+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, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.basic.1.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.basic.1</p>
+<canvas id="c381" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_basic_1() {
+
+var canvas = document.getElementById('c381');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.basic.2.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.basic.2</p>
+<canvas id="c382" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_basic_2() {
+
+var canvas = document.getElementById('c382');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.empty.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.empty</p>
+<canvas id="c383" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_empty() {
+
+var canvas = document.getElementById('c383');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.intersect.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.intersect</p>
+<canvas id="c384" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_intersect() {
+
+var canvas = document.getElementById('c384');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.unaffected.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.unaffected</p>
+<canvas id="c385" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_unaffected() {
+
+var canvas = document.getElementById('c385');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.winding.1.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.winding.1</p>
+<canvas id="c386" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_winding_1() {
+
+var canvas = document.getElementById('c386');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.winding.2.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.winding.2</p>
+<canvas id="c387" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_winding_2() {
+
+var canvas = document.getElementById('c387');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.closePath.empty.html ]]] -->
+
+<p>Canvas test: 2d.path.closePath.empty</p>
+<canvas id="c388" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_closePath_empty() {
+
+var canvas = document.getElementById('c388');
+var ctx = canvas.getContext('2d');
+
+ctx.closePath();
+ctx.fillStyle = '#f00';
+ctx.fill();
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.closePath.newline.html ]]] -->
+
+<p>Canvas test: 2d.path.closePath.newline</p>
+<canvas id="c389" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_closePath_newline() {
+
+var canvas = document.getElementById('c389');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.closePath.nextpoint.html ]]] -->
+
+<p>Canvas test: 2d.path.closePath.nextpoint</p>
+<canvas id="c390" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_closePath_nextpoint() {
+
+var canvas = document.getElementById('c390');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.closed.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.closed.basic</p>
+<canvas id="c391" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_closed_basic() {
+
+var canvas = document.getElementById('c391');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.closed.unaffected.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.closed.unaffected</p>
+<canvas id="c392" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_closed_unaffected() {
+
+var canvas = document.getElementById('c392');
+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, 0);
+isPixel(ctx, 10,40, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.overlap.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.overlap</p>
+<canvas id="c393" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_overlap() {
+
+var canvas = document.getElementById('c393');
+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, 1);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.winding.add.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.winding.add</p>
+<canvas id="c394" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_winding_add() {
+
+var canvas = document.getElementById('c394');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.winding.subtract.1.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.winding.subtract.1</p>
+<canvas id="c395" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_winding_subtract_1() {
+
+var canvas = document.getElementById('c395');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.winding.subtract.2.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.winding.subtract.2</p>
+<canvas id="c396" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_winding_subtract_2() {
+
+var canvas = document.getElementById('c396');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.winding.subtract.3.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.winding.subtract.3</p>
+<canvas id="c397" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_winding_subtract_3() {
+
+var canvas = document.getElementById('c397');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.initial.html ]]] -->
+
+<p>Canvas test: 2d.path.initial</p>
+<canvas id="c398" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_initial() {
+
+var canvas = document.getElementById('c398');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.arc.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.arc</p>
+<!-- Testing: isPointInPath() works on arcs -->
+<canvas id="c399" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_arc() {
+
+var canvas = document.getElementById('c399');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.basic.1.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.basic.1</p>
+<!-- Testing: isPointInPath() detects whether the point is inside the path -->
+<canvas id="c400" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_basic_1() {
+
+var canvas = document.getElementById('c400');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.basic.2.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.basic.2</p>
+<!-- Testing: isPointInPath() detects whether the point is inside the path -->
+<canvas id="c401" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_basic_2() {
+
+var canvas = document.getElementById('c401');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.bezier.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.bezier</p>
+<!-- Testing: isPointInPath() works on Bezier curves -->
+<canvas id="c402" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_bezier() {
+
+var canvas = document.getElementById('c402');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.bigarc.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.bigarc</p>
+<!-- Testing: isPointInPath() works on unclosed arcs larger than 2pi -->
+<canvas id="c403" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_bigarc() {
+
+var canvas = document.getElementById('c403');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.edge.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.edge</p>
+<!-- Testing: isPointInPath() counts points on the path as being inside -->
+<canvas id="c404" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_edge() {
+
+var canvas = document.getElementById('c404');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.empty.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.empty</p>
+<!-- Testing: isPointInPath() works when there is no path -->
+<canvas id="c405" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_empty() {
+
+var canvas = document.getElementById('c405');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.isPointInPath(0, 0) === false, "ctx.isPointInPath(0, 0) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.nonfinite</p>
+<!-- Testing: isPointInPath() returns false for non-finite arguments -->
+<canvas id="c406" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_nonfinite() {
+
+var canvas = document.getElementById('c406');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.outside.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.outside</p>
+<!-- Testing: isPointInPath() works on paths outside the canvas -->
+<canvas id="c407" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_outside() {
+
+var canvas = document.getElementById('c407');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.subpath.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.subpath</p>
+<!-- Testing: isPointInPath() uses the current path, not just the subpath -->
+<canvas id="c408" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_subpath() {
+
+var canvas = document.getElementById('c408');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.transform.1.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.transform.1 - bug 405300</p>
+<!-- Testing: isPointInPath() handles transformations correctly -->
+<canvas id="c409" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_transform_1() {
+
+var canvas = document.getElementById('c409');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.transform.2.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.transform.2 - bug 405300</p>
+<!-- Testing: isPointInPath() handles transformations correctly -->
+<canvas id="c410" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_transform_2() {
+
+var canvas = document.getElementById('c410');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.transform.3.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.transform.3 - bug 405300</p>
+<!-- Testing: isPointInPath() handles transformations correctly -->
+<canvas id="c411" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_transform_3() {
+
+var canvas = document.getElementById('c411');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.unclosed.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.unclosed</p>
+<!-- Testing: isPointInPath() works on unclosed subpaths -->
+<canvas id="c412" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_unclosed() {
+
+var canvas = document.getElementById('c412');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.winding.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.winding</p>
+<!-- Testing: isPointInPath() uses the non-zero winding number rule -->
+<canvas id="c413" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_winding() {
+
+var canvas = document.getElementById('c413');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.lineTo.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.lineTo.basic</p>
+<canvas id="c414" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_lineTo_basic() {
+
+var canvas = document.getElementById('c414');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.lineTo.emptysubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.lineTo.emptysubpath</p>
+<canvas id="c415" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_lineTo_emptysubpath() {
+
+var canvas = document.getElementById('c415');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.lineTo.nextpoint.html ]]] -->
+
+<p>Canvas test: 2d.path.lineTo.nextpoint</p>
+<canvas id="c416" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_lineTo_nextpoint() {
+
+var canvas = document.getElementById('c416');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.lineTo.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.lineTo.nonfinite</p>
+<!-- Testing: lineTo() with Infinity/NaN is ignored -->
+<canvas id="c417" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_lineTo_nonfinite() {
+
+var canvas = document.getElementById('c417');
+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, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.moveTo.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.moveTo.basic</p>
+<canvas id="c418" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_moveTo_basic() {
+
+var canvas = document.getElementById('c418');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.moveTo.multiple.html ]]] -->
+
+<p>Canvas test: 2d.path.moveTo.multiple</p>
+<canvas id="c419" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_moveTo_multiple() {
+
+var canvas = document.getElementById('c419');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.moveTo.newsubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.moveTo.newsubpath</p>
+<canvas id="c420" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_moveTo_newsubpath() {
+
+var canvas = document.getElementById('c420');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.moveTo.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.moveTo.nonfinite</p>
+<!-- Testing: moveTo() with Infinity/NaN is ignored -->
+<canvas id="c421" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_moveTo_nonfinite() {
+
+var canvas = document.getElementById('c421');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.quadraticCurveTo.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.quadraticCurveTo.basic</p>
+<canvas id="c422" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_quadraticCurveTo_basic() {
+
+var canvas = document.getElementById('c422');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.quadraticCurveTo.emptysubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.quadraticCurveTo.emptysubpath</p>
+<canvas id="c423" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_quadraticCurveTo_emptysubpath() {
+
+var canvas = document.getElementById('c423');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.quadraticCurveTo.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.quadraticCurveTo.nonfinite</p>
+<!-- Testing: quadraticCurveTo() with Infinity/NaN is ignored -->
+<canvas id="c424" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_quadraticCurveTo_nonfinite() {
+
+var canvas = document.getElementById('c424');
+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, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.quadraticCurveTo.scaled.html ]]] -->
+
+<p>Canvas test: 2d.path.quadraticCurveTo.scaled</p>
+<canvas id="c425" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_quadraticCurveTo_scaled() {
+
+var canvas = document.getElementById('c425');
+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, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.quadraticCurveTo.shape.html ]]] -->
+
+<p>Canvas test: 2d.path.quadraticCurveTo.shape</p>
+<canvas id="c426" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_quadraticCurveTo_shape() {
+
+var canvas = document.getElementById('c426');
+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, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.basic</p>
+<canvas id="c427" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_basic() {
+
+var canvas = document.getElementById('c427');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.rect(0, 0, 100, 50);
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.closed.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.closed</p>
+<canvas id="c428" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_closed() {
+
+var canvas = document.getElementById('c428');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.end.1.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.end.1</p>
+<canvas id="c429" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_end_1() {
+
+var canvas = document.getElementById('c429');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.end.2.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.end.2</p>
+<canvas id="c430" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_end_2() {
+
+var canvas = document.getElementById('c430');
+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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.negative.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.negative</p>
+<canvas id="c431" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_negative() {
+
+var canvas = document.getElementById('c431');
+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, 0);
+isPixel(ctx, 75,12, 0,255,0,255, 0);
+isPixel(ctx, 25,37, 0,255,0,255, 0);
+isPixel(ctx, 75,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.newsubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.newsubpath</p>
+<canvas id="c432" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_newsubpath() {
+
+var canvas = document.getElementById('c432');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.nonfinite</p>
+<!-- Testing: rect() with Infinity/NaN is ignored -->
+<canvas id="c433" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_nonfinite() {
+
+var canvas = document.getElementById('c433');
+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, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.selfintersect.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.selfintersect</p>
+<canvas id="c434" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_rect_selfintersect() {
+
+var canvas = document.getElementById('c434');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 90;
+ctx.beginPath();
+ctx.rect(45, 20, 10, 10);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.winding.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.winding</p>
+<canvas id="c435" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_winding() {
+
+var canvas = document.getElementById('c435');
+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, 0);
+isPixel(ctx, 75,12, 0,255,0,255, 0);
+isPixel(ctx, 25,37, 0,255,0,255, 0);
+isPixel(ctx, 75,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.1.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.1</p>
+<canvas id="c436" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_zero_1() {
+
+var canvas = document.getElementById('c436');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.2.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.2</p>
+<canvas id="c437" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_zero_2() {
+
+var canvas = document.getElementById('c437');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.3.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.3</p>
+<canvas id="c438" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_zero_3() {
+
+var canvas = document.getElementById('c438');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.4.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.4</p>
+<canvas id="c439" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_zero_4() {
+
+var canvas = document.getElementById('c439');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.5.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.5</p>
+<canvas id="c440" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_zero_5() {
+
+var canvas = document.getElementById('c440');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.6.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.6</p>
+<canvas id="c441" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_rect_zero_6() {
+
+var canvas = document.getElementById('c441');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineJoin = 'miter';
+ctx.miterLimit = 1.5;
+ctx.lineWidth = 200;
+ctx.beginPath();
+ctx.rect(100, 25, 1000, 0);
+ctx.stroke();
+todo_isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.empty.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.empty</p>
+<!-- Testing: Empty subpaths are not stroked -->
+<canvas id="c442" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_empty() {
+
+var canvas = document.getElementById('c442');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.overlap.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.overlap</p>
+<!-- Testing: Stroked subpaths are combined before being drawn -->
+<canvas id="c443" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_overlap() {
+
+var canvas = document.getElementById('c443');
+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, 1);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.arc.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.arc</p>
+<!-- Testing: Zero-length line segments from arcTo and arc are removed before stroking -->
+<canvas id="c444" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_stroke_prune_arc() {
+
+var canvas = document.getElementById('c444');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.closed.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.closed</p>
+<!-- Testing: Zero-length line segments from closed paths are removed before stroking -->
+<canvas id="c445" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_stroke_prune_closed() {
+
+var canvas = document.getElementById('c445');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.corner.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.corner</p>
+<!-- Testing: Zero-length line segments are removed before stroking with miters -->
+<canvas id="c446" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_prune_corner() {
+
+var canvas = document.getElementById('c446');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.curve.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.curve</p>
+<!-- Testing: Zero-length line segments from quadraticCurveTo and bezierCurveTo are removed before stroking -->
+<canvas id="c447" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_stroke_prune_curve() {
+
+var canvas = document.getElementById('c447');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.line.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.line</p>
+<!-- Testing: Zero-length line segments from lineTo are removed before stroking -->
+<canvas id="c448" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_stroke_prune_line() {
+
+var canvas = document.getElementById('c448');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.rect.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.rect</p>
+<!-- Testing: Zero-length line segments from rect and strokeRect are removed before stroking -->
+<canvas id="c449" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_stroke_prune_rect() {
+
+var canvas = document.getElementById('c449');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.scale1.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.scale1</p>
+<!-- Testing: Stroke line widths are scaled by the current transformation matrix -->
+<canvas id="c450" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_scale1() {
+
+var canvas = document.getElementById('c450');
+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);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.scale2.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.scale2</p>
+<!-- Testing: Stroke line widths are scaled by the current transformation matrix -->
+<canvas id="c451" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_scale2() {
+
+var canvas = document.getElementById('c451');
+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);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.skew.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.skew</p>
+<!-- Testing: Strokes lines are skewed by the current transformation matrix -->
+<canvas id="c452" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_skew() {
+
+var canvas = document.getElementById('c452');
+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);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.unaffected.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.unaffected</p>
+<!-- Testing: Stroking does not start a new path or subpath -->
+<canvas id="c453" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_unaffected() {
+
+var canvas = document.getElementById('c453');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.union.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.union</p>
+<!-- Testing: Strokes in opposite directions are unioned, not subtracted -->
+<canvas id="c454" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_union() {
+
+var canvas = document.getElementById('c454');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.transformation.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.transformation.basic</p>
+<canvas id="c455" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_transformation_basic() {
+
+var canvas = document.getElementById('c455');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.transformation.changing.html ]]] -->
+
+<p>Canvas test: 2d.path.transformation.changing</p>
+<!-- Testing: Transformations are applied while building paths, not when drawing -->
+<canvas id="c456" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_transformation_changing() {
+
+var canvas = document.getElementById('c456');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.transformation.multiple.html ]]] -->
+
+<p>Canvas test: 2d.path.transformation.multiple</p>
+<canvas id="c457" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_transformation_multiple() {
+
+var canvas = document.getElementById('c457');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.animated.gif.html ]]] -->
+
+<p>Canvas test: 2d.pattern.animated.gif</p>
+<!-- Testing: createPattern() of an animated GIF draws the first frame -->
+<canvas id="c458" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas458 = document.getElementById('c458');
+var ctx458 = canvas458.getContext('2d');
+var isDone_test_2d_pattern_animated_gif = false;
+
+function test_2d_pattern_animated_gif() {
+
+deferTest();
+setTimeout(function () {
+    var pattern = ctx458.createPattern(document.getElementById('anim-gr_2.gif'), 'repeat');
+    ctx458.fillStyle = pattern;
+    ctx458.fillRect(0, 0, 50, 50);
+    setTimeout(wrapFunction(function () {
+        ctx458.fillRect(50, 0, 50, 50);
+        todo_isPixel(ctx458, 25,25, 0,255,0,255, 2);
+        todo_isPixel(ctx458, 75,25, 0,255,0,255, 2);
+		isDone_test_2d_pattern_animated_gif = true;
+    }), 2500);
+}, 2500);
+
+
+}
+</script>
+<img src="image_anim-gr.gif" id="anim-gr_2.gif" class="resource">
+
+<!-- [[[ test_2d.pattern.basic.canvas.html ]]] -->
+
+<p>Canvas test: 2d.pattern.basic.canvas</p>
+<canvas id="c459" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_basic_canvas() {
+
+var canvas = document.getElementById('c459');
+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, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.basic.image.html ]]] -->
+
+<p>Canvas test: 2d.pattern.basic.image</p>
+<canvas id="c460" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_basic_image() {
+
+var canvas = document.getElementById('c460');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var img = document.getElementById('green_8.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green.png" id="green_8.png" class="resource">
+
+<!-- [[[ test_2d.pattern.basic.nocontext.html ]]] -->
+
+<p>Canvas test: 2d.pattern.basic.nocontext</p>
+<canvas id="c461" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_basic_nocontext() {
+
+var canvas = document.getElementById('c461');
+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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.basic.type.html ]]] -->
+
+<p>Canvas test: 2d.pattern.basic.type</p>
+<canvas id="c462" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_basic_type() {
+
+var canvas = document.getElementById('c462');
+var ctx = canvas.getContext('2d');
+
+ok(window.CanvasPattern !== undefined, "window.CanvasPattern !== undefined");
+
+window.CanvasPattern.prototype.thisImplementsCanvasPattern = true;
+
+var img = document.getElementById('green_9.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ok(pattern.thisImplementsCanvasPattern, "pattern.thisImplementsCanvasPattern");
+
+
+}
+</script>
+<img src="image_green.png" id="green_9.png" class="resource">
+
+<!-- [[[ test_2d.pattern.basic.zerocanvas.html ]]] -->
+
+<p>Canvas test: 2d.pattern.basic.zerocanvas</p>
+<canvas id="c463" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_basic_zerocanvas() {
+
+var canvas = document.getElementById('c463');
+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, 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.crosscanvas.html ]]] -->
+
+<p>Canvas test: 2d.pattern.crosscanvas</p>
+<canvas id="c464" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_crosscanvas() {
+
+var canvas = document.getElementById('c464');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('green_10.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, 0);
+
+
+}
+</script>
+<img src="image_green.png" id="green_10.png" class="resource">
+
+<!-- [[[ test_2d.pattern.image.broken.html ]]] -->
+
+<p>Canvas test: 2d.pattern.image.broken</p>
+<canvas id="c465" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_image_broken() {
+
+var canvas = document.getElementById('c465');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('broken_2.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");
+
+
+}
+</script>
+<img src="image_broken.png" id="broken_2.png" class="resource">
+
+<!-- [[[ test_2d.pattern.image.incomplete.html ]]] -->
+
+<p>Canvas test: 2d.pattern.image.incomplete</p>
+<canvas id="c466" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_image_incomplete() {
+
+var canvas = document.getElementById('c466');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.image.null.html ]]] -->
+
+<p>Canvas test: 2d.pattern.image.null</p>
+<canvas id="c467" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_image_null() {
+
+var canvas = document.getElementById('c467');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.image.string.html ]]] -->
+
+<p>Canvas test: 2d.pattern.image.string</p>
+<canvas id="c468" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_image_string() {
+
+var canvas = document.getElementById('c468');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.image.undefined.html ]]] -->
+
+<p>Canvas test: 2d.pattern.image.undefined</p>
+<canvas id="c469" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_image_undefined() {
+
+var canvas = document.getElementById('c469');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.modify.canvas1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.modify.canvas1</p>
+<canvas id="c470" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_modify_canvas1() {
+
+var canvas = document.getElementById('c470');
+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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.modify.canvas2.html ]]] -->
+
+<p>Canvas test: 2d.pattern.modify.canvas2</p>
+<canvas id="c471" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_modify_canvas2() {
+
+var canvas = document.getElementById('c471');
+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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.modify.image1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.modify.image1</p>
+<canvas id="c472" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas472 = document.getElementById('c472');
+var ctx472 = canvas472.getContext('2d');
+
+function test_2d_pattern_modify_image1() {
+
+var img = document.getElementById('green_11.png');
+var pattern = ctx472.createPattern(img, 'no-repeat');
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx472.fillStyle = pattern;
+    ctx472.fillRect(0, 0, 100, 50);
+
+    isPixel(ctx472, 1,1, 0,255,0,255, 0);
+    isPixel(ctx472, 98,1, 0,255,0,255, 0);
+    isPixel(ctx472, 1,48, 0,255,0,255, 0);
+    isPixel(ctx472, 98,48, 0,255,0,255, 0);
+});
+img.src = 'image_red.png';
+
+
+}
+</script>
+<img src="image_green.png" id="green_11.png" class="resource">
+
+<!-- [[[ test_2d.pattern.modify.image2.html ]]] -->
+
+<p>Canvas test: 2d.pattern.modify.image2</p>
+<canvas id="c473" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+var canvas473 = document.getElementById('c473');
+var ctx473 = canvas473.getContext('2d');
+
+function test_2d_pattern_modify_image2() {
+
+var img = document.getElementById('green_12.png');
+var pattern = ctx473.createPattern(img, 'no-repeat');
+ctx473.fillStyle = pattern;
+ctx473.fillRect(0, 0, 100, 50);
+ctx473.fillStyle = '#00f';
+ctx473.fillRect(0, 0, 100, 50);
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx473.fillStyle = pattern;
+    ctx473.fillRect(0, 0, 100, 50);
+
+    isPixel(ctx473, 1,1, 0,255,0,255, 0);
+    isPixel(ctx473, 98,1, 0,255,0,255, 0);
+    isPixel(ctx473, 1,48, 0,255,0,255, 0);
+    isPixel(ctx473, 98,48, 0,255,0,255, 0);
+});
+img.src = 'image_red.png';
+
+
+}
+</script>
+<img src="image_green.png" id="green_12.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.norepeat.basic.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.norepeat.basic</p>
+<canvas id="c474" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_norepeat_basic() {
+
+var canvas = document.getElementById('c474');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('green_13.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green.png" id="green_13.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.norepeat.coord1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.norepeat.coord1</p>
+<canvas id="c475" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_norepeat_coord1() {
+
+var canvas = document.getElementById('c475');
+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_14.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green.png" id="green_14.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.norepeat.coord2.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.norepeat.coord2</p>
+<canvas id="c476" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_norepeat_coord2() {
+
+var canvas = document.getElementById('c476');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('green_15.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green.png" id="green_15.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.norepeat.coord3.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.norepeat.coord3</p>
+<canvas id="c477" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_norepeat_coord3() {
+
+var canvas = document.getElementById('c477');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red_15.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red.png" id="red_15.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.norepeat.outside.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.norepeat.outside</p>
+<canvas id="c478" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_norepeat_outside() {
+
+var canvas = document.getElementById('c478');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red_16.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red.png" id="red_16.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.orientation.canvas.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.orientation.canvas</p>
+<!-- Testing: Canvas patterns do not get flipped when painted -->
+<canvas id="c479" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_orientation_canvas() {
+
+var canvas = document.getElementById('c479');
+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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.paint.orientation.image.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.orientation.image</p>
+<!-- Testing: Image patterns do not get flipped when painted -->
+<canvas id="c480" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_orientation_image() {
+
+var canvas = document.getElementById('c480');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('rrgg-256x256_1.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_rrgg-256x256.png" id="rrgg-256x256_1.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeat.basic.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeat.basic</p>
+<canvas id="c481" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeat_basic() {
+
+var canvas = document.getElementById('c481');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('green-16x16_1.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-16x16.png" id="green-16x16_1.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeat.coord1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeat.coord1</p>
+<canvas id="c482" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeat_coord1() {
+
+var canvas = document.getElementById('c482');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('rgrg-256x256_3.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256_3.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeat.coord2.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeat.coord2</p>
+<canvas id="c483" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeat_coord2() {
+
+var canvas = document.getElementById('c483');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('ggrr-256x256_3.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_ggrr-256x256.png" id="ggrr-256x256_3.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeat.coord3.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeat.coord3</p>
+<canvas id="c484" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_paint_repeat_coord3() {
+
+var canvas = document.getElementById('c484');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('rgrg-256x256_4.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, 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256_4.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeat.outside.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeat.outside</p>
+<canvas id="c485" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeat_outside() {
+
+var canvas = document.getElementById('c485');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('green-16x16_2.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-16x16.png" id="green-16x16_2.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeatx.basic.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeatx.basic</p>
+<canvas id="c486" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeatx_basic() {
+
+var canvas = document.getElementById('c486');
+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_3.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-16x16.png" id="green-16x16_3.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeatx.coord1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeatx.coord1</p>
+<canvas id="c487" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_paint_repeatx_coord1() {
+
+var canvas = document.getElementById('c487');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16_1.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, 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red-16x16.png" id="red-16x16_1.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeatx.outside.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeatx.outside</p>
+<canvas id="c488" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_paint_repeatx_outside() {
+
+var canvas = document.getElementById('c488');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16_2.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red-16x16.png" id="red-16x16_2.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeaty.basic.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeaty.basic</p>
+<canvas id="c489" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeaty_basic() {
+
+var canvas = document.getElementById('c489');
+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_4.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, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-16x16.png" id="green-16x16_4.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeaty.coord1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeaty.coord1</p>
+<canvas id="c490" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_paint_repeaty_coord1() {
+
+var canvas = document.getElementById('c490');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16_3.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, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red-16x16.png" id="red-16x16_3.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeaty.outside.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeaty.outside</p>
+<canvas id="c491" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_paint_repeaty_outside() {
+
+var canvas = document.getElementById('c491');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16_4.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, 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red-16x16.png" id="red-16x16_4.png" class="resource">
+
+<!-- [[[ test_2d.pattern.repeat.case.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.case</p>
+<canvas id="c492" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_repeat_case() {
+
+var canvas = document.getElementById('c492');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.repeat.empty.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.empty</p>
+<canvas id="c493" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_repeat_empty() {
+
+var canvas = document.getElementById('c493');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var img = document.getElementById('green-1x1_1.png');
+var pattern = ctx.createPattern(img, "");
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 200, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-1x1.png" id="green-1x1_1.png" class="resource">
+
+<!-- [[[ test_2d.pattern.repeat.null.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.null</p>
+<canvas id="c494" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_repeat_null() {
+
+var canvas = document.getElementById('c494');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var img = document.getElementById('green-1x1_2.png');
+var pattern = ctx.createPattern(img, null);
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-1x1.png" id="green-1x1_2.png" class="resource">
+
+<!-- [[[ test_2d.pattern.repeat.nullsuffix.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.nullsuffix</p>
+<canvas id="c495" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_repeat_nullsuffix() {
+
+var canvas = document.getElementById('c495');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.repeat.undefined.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.undefined</p>
+<canvas id="c496" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_repeat_undefined() {
+
+var canvas = document.getElementById('c496');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.repeat.unrecognised.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.unrecognised</p>
+<canvas id="c497" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_repeat_unrecognised() {
+
+var canvas = document.getElementById('c497');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.scaled.html ]]] -->
+
+<p>Canvas test: 2d.scaled</p>
+<!-- Testing: CSS-scaled canvases get drawn correctly -->
+<canvas id="c498" width="50" height="25" style="width: 100px; height: 50px"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_scaled() {
+
+var canvas = document.getElementById('c498');
+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)
+
+}
+
+</script>
+<!-- [[[ test_2d.shadow.alpha.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.alpha.1</p>
+<canvas id="c499" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_alpha_1() {
+
+var canvas = document.getElementById('c499');
+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, 4);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.alpha.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.alpha.2</p>
+<canvas id="c500" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_alpha_2() {
+
+var canvas = document.getElementById('c500');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.alpha.3.html ]]] -->
+
+<p>Canvas test: 2d.shadow.alpha.3</p>
+<canvas id="c501" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_alpha_3() {
+
+var canvas = document.getElementById('c501');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.alpha.4.html ]]] -->
+
+<p>Canvas test: 2d.shadow.alpha.4</p>
+<canvas id="c502" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_alpha_4() {
+
+var canvas = document.getElementById('c502');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.alpha.5.html ]]] -->
+
+<p>Canvas test: 2d.shadow.alpha.5</p>
+<canvas id="c503" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_alpha_5() {
+
+var canvas = document.getElementById('c503');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowBlur.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowBlur.1</p>
+<canvas id="c504" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowBlur_1() {
+
+var canvas = document.getElementById('c504');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowBlur.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowBlur.2</p>
+<canvas id="c505" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowBlur_2() {
+
+var canvas = document.getElementById('c505');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowColor.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowColor.1</p>
+<canvas id="c506" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowColor_1() {
+
+var canvas = document.getElementById('c506');
+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)'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowColor.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowColor.2</p>
+<canvas id="c507" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowColor_2() {
+
+var canvas = document.getElementById('c507');
+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'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowOffset.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowOffset.1</p>
+<canvas id="c508" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowOffset_1() {
+
+var canvas = document.getElementById('c508');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowOffset.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowOffset.2</p>
+<canvas id="c509" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowOffset_2() {
+
+var canvas = document.getElementById('c509');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.basic.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.basic.1</p>
+<canvas id="c510" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_basic_1() {
+
+var canvas = document.getElementById('c510');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.basic.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.basic.2</p>
+<canvas id="c511" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_basic_2() {
+
+var canvas = document.getElementById('c511');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.blur.high.html ]]] -->
+
+<p>Canvas test: 2d.shadow.blur.high</p>
+<canvas id="c512" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_blur_high() {
+
+var canvas = document.getElementById('c512');
+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)
+
+}
+
+</script>
+<!-- [[[ test_2d.shadow.blur.low.html ]]] -->
+
+<p>Canvas test: 2d.shadow.blur.low</p>
+<canvas id="c513" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_blur_low() {
+
+var canvas = document.getElementById('c513');
+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)
+
+}
+</script>
+<!-- [[[ test_2d.shadow.canvas.alpha.html ]]] -->
+
+<p>Canvas test: 2d.shadow.canvas.alpha</p>
+<canvas id="c514" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_canvas_alpha() {
+
+var canvas = document.getElementById('c514');
+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, 2);
+
+
+}
+</script>
+<img src="image_transparent50.png" id="transparent50_1.png" class="resource">
+
+<!-- [[[ test_2d.shadow.canvas.basic.html ]]] -->
+
+<p>Canvas test: 2d.shadow.canvas.basic</p>
+<canvas id="c515" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_canvas_basic() {
+
+var canvas = document.getElementById('c515');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.canvas.transparent.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.canvas.transparent.1</p>
+<canvas id="c516" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_canvas_transparent_1() {
+
+var canvas = document.getElementById('c516');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.canvas.transparent.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.canvas.transparent.2</p>
+<canvas id="c517" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_canvas_transparent_2() {
+
+var canvas = document.getElementById('c517');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.clip.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.clip.1</p>
+<canvas id="c518" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_clip_1() {
+
+var canvas = document.getElementById('c518');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.clip.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.clip.2</p>
+<canvas id="c519" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_clip_2() {
+
+var canvas = document.getElementById('c519');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.clip.3.html ]]] -->
+
+<p>Canvas test: 2d.shadow.clip.3</p>
+<canvas id="c520" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_clip_3() {
+
+var canvas = document.getElementById('c520');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.composite.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.composite.1</p>
+<canvas id="c521" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_composite_1() {
+
+var canvas = document.getElementById('c521');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.composite.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.composite.2</p>
+<canvas id="c522" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_composite_2() {
+
+var canvas = document.getElementById('c522');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.composite.3.html ]]] -->
+
+<p>Canvas test: 2d.shadow.composite.3</p>
+<canvas id="c523" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_composite_3() {
+
+var canvas = document.getElementById('c523');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.composite.4.html ]]] -->
+
+<p>Canvas test: 2d.shadow.composite.4</p>
+<canvas id="c524" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_composite_4() {
+
+var canvas = document.getElementById('c524');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.gradient.alpha.html ]]] -->
+
+<p>Canvas test: 2d.shadow.gradient.alpha</p>
+<canvas id="c525" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_gradient_alpha() {
+
+var canvas = document.getElementById('c525');
+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, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.gradient.basic.html ]]] -->
+
+<p>Canvas test: 2d.shadow.gradient.basic</p>
+<canvas id="c526" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_gradient_basic() {
+
+var canvas = document.getElementById('c526');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.gradient.transparent.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.gradient.transparent.1</p>
+<canvas id="c527" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_gradient_transparent_1() {
+
+var canvas = document.getElementById('c527');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.gradient.transparent.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.gradient.transparent.2</p>
+<canvas id="c528" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_gradient_transparent_2() {
+
+var canvas = document.getElementById('c528');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.image.alpha.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.alpha</p>
+<canvas id="c529" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_image_alpha() {
+
+var canvas = document.getElementById('c529');
+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_2.png'), 0, -50);
+
+isPixel(ctx, 50,25, 127,0,127,255, 2);
+
+
+}
+</script>
+<img src="image_transparent50.png" id="transparent50_2.png" class="resource">
+
+<!-- [[[ test_2d.shadow.image.basic.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.basic</p>
+<canvas id="c530" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_image_basic() {
+
+var canvas = document.getElementById('c530');
+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_17.png'), 0, -50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red.png" id="red_17.png" class="resource">
+
+<!-- [[[ test_2d.shadow.image.scale.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.scale</p>
+<canvas id="c531" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_image_scale() {
+
+var canvas = document.getElementById('c531');
+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_2.png'), 0, 0, 100, 50, -10, -50, 240, 50);
+
+isPixel(ctx, 25,25, 0,255,0,255, 2);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_redtransparent.png" id="redtransparent_2.png" class="resource">
+
+<!-- [[[ test_2d.shadow.image.section.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.section</p>
+<canvas id="c532" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_image_section() {
+
+var canvas = document.getElementById('c532');
+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_3.png'), 50, 0, 50, 50, 0, -50, 50, 50);
+
+isPixel(ctx, 25,25, 0,255,0,255, 2);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_redtransparent.png" id="redtransparent_3.png" class="resource">
+
+<!-- [[[ test_2d.shadow.image.transparent.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.transparent.1</p>
+<canvas id="c533" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_image_transparent_1() {
+
+var canvas = document.getElementById('c533');
+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_1.png'), 0, -50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_transparent.png" id="transparent_1.png" class="resource">
+
+<!-- [[[ test_2d.shadow.image.transparent.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.transparent.2</p>
+<canvas id="c534" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_image_transparent_2() {
+
+var canvas = document.getElementById('c534');
+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_4.png'), 50, -50);
+ctx.shadowColor = '#f00';
+ctx.drawImage(document.getElementById('redtransparent_4.png'), -50, -50);
+
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_redtransparent.png" id="redtransparent_4.png" class="resource">
+
+<!-- [[[ test_2d.shadow.offset.negativeX.html ]]] -->
+
+<p>Canvas test: 2d.shadow.offset.negativeX</p>
+<canvas id="c535" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_offset_negativeX() {
+
+var canvas = document.getElementById('c535');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.offset.negativeY.html ]]] -->
+
+<p>Canvas test: 2d.shadow.offset.negativeY</p>
+<canvas id="c536" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_offset_negativeY() {
+
+var canvas = document.getElementById('c536');
+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, 0);
+isPixel(ctx, 50,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.offset.positiveX.html ]]] -->
+
+<p>Canvas test: 2d.shadow.offset.positiveX</p>
+<canvas id="c537" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_offset_positiveX() {
+
+var canvas = document.getElementById('c537');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.offset.positiveY.html ]]] -->
+
+<p>Canvas test: 2d.shadow.offset.positiveY</p>
+<canvas id="c538" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_offset_positiveY() {
+
+var canvas = document.getElementById('c538');
+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, 0);
+isPixel(ctx, 50,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.outside.html ]]] -->
+
+<p>Canvas test: 2d.shadow.outside</p>
+<canvas id="c539" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_outside() {
+
+var canvas = document.getElementById('c539');
+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, 0);
+isPixel(ctx, 87,25, 0,255,0,255, 0);
+isPixel(ctx, 50,12, 0,255,0,255, 0);
+isPixel(ctx, 50,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.pattern.alpha.html ]]] -->
+
+<p>Canvas test: 2d.shadow.pattern.alpha</p>
+<canvas id="c540" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_pattern_alpha() {
+
+var canvas = document.getElementById('c540');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('transparent50_3.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, 2);
+
+
+}
+</script>
+<img src="image_transparent50.png" id="transparent50_3.png" class="resource">
+
+<!-- [[[ test_2d.shadow.pattern.basic.html ]]] -->
+
+<p>Canvas test: 2d.shadow.pattern.basic</p>
+<canvas id="c541" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_pattern_basic() {
+
+var canvas = document.getElementById('c541');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('red_18.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, 0);
+
+
+}
+</script>
+<img src="image_red.png" id="red_18.png" class="resource">
+
+<!-- [[[ test_2d.shadow.pattern.transparent.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.pattern.transparent.1</p>
+<canvas id="c542" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_pattern_transparent_1() {
+
+var canvas = document.getElementById('c542');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('transparent_2.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, 0);
+
+
+}
+</script>
+<img src="image_transparent.png" id="transparent_2.png" class="resource">
+
+<!-- [[[ test_2d.shadow.pattern.transparent.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.pattern.transparent.2</p>
+<canvas id="c543" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_pattern_transparent_2() {
+
+var canvas = document.getElementById('c543');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('redtransparent_5.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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_redtransparent.png" id="redtransparent_5.png" class="resource">
+
+<!-- [[[ test_2d.shadow.stroke.basic.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.basic</p>
+<canvas id="c544" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_stroke_basic() {
+
+var canvas = document.getElementById('c544');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.stroke.cap.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.cap.1</p>
+<canvas id="c545" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_stroke_cap_1() {
+
+var canvas = document.getElementById('c545');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.stroke.cap.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.cap.2</p>
+<canvas id="c546" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_stroke_cap_2() {
+
+var canvas = document.getElementById('c546');
+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, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.stroke.join.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.join.1</p>
+<canvas id="c547" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_stroke_join_1() {
+
+var canvas = document.getElementById('c547');
+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, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.stroke.join.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.join.2</p>
+<canvas id="c548" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_stroke_join_2() {
+
+var canvas = document.getElementById('c548');
+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, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.stroke.join.3.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.join.3</p>
+<canvas id="c549" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_stroke_join_3() {
+
+var canvas = document.getElementById('c549');
+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, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.transform.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.transform.1</p>
+<canvas id="c550" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_transform_1() {
+
+var canvas = document.getElementById('c550');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.transform.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.transform.2</p>
+<canvas id="c551" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_transform_2() {
+
+var canvas = document.getElementById('c551');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.bitmap.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.bitmap</p>
+<!-- Testing: save()/restore() does not affect the current bitmap -->
+<canvas id="c552" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_state_saverestore_bitmap() {
+
+var canvas = document.getElementById('c552');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.clip.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.clip</p>
+<!-- Testing: save()/restore() affects the clipping path -->
+<canvas id="c553" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_state_saverestore_clip() {
+
+var canvas = document.getElementById('c553');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.fillStyle.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.fillStyle</p>
+<!-- Testing: save()/restore() works for fillStyle -->
+<canvas id="c554" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_fillStyle() {
+
+var canvas = document.getElementById('c554');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.globalAlpha.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.globalAlpha</p>
+<!-- Testing: save()/restore() works for globalAlpha -->
+<canvas id="c555" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_globalAlpha() {
+
+var canvas = document.getElementById('c555');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.globalCompositeOperation.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.globalCompositeOperation</p>
+<!-- Testing: save()/restore() works for globalCompositeOperation -->
+<canvas id="c556" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_globalCompositeOperation() {
+
+var canvas = document.getElementById('c556');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.lineCap.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.lineCap</p>
+<!-- Testing: save()/restore() works for lineCap -->
+<canvas id="c557" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_lineCap() {
+
+var canvas = document.getElementById('c557');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.lineJoin.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.lineJoin</p>
+<!-- Testing: save()/restore() works for lineJoin -->
+<canvas id="c558" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_lineJoin() {
+
+var canvas = document.getElementById('c558');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.lineWidth.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.lineWidth</p>
+<!-- Testing: save()/restore() works for lineWidth -->
+<canvas id="c559" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_lineWidth() {
+
+var canvas = document.getElementById('c559');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.miterLimit.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.miterLimit</p>
+<!-- Testing: save()/restore() works for miterLimit -->
+<canvas id="c560" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_miterLimit() {
+
+var canvas = document.getElementById('c560');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.path.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.path</p>
+<!-- Testing: save()/restore() does not affect the current path -->
+<canvas id="c561" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_state_saverestore_path() {
+
+var canvas = document.getElementById('c561');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.shadowBlur.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.shadowBlur</p>
+<!-- Testing: save()/restore() works for shadowBlur -->
+<canvas id="c562" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_shadowBlur() {
+
+var canvas = document.getElementById('c562');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.shadowColor.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.shadowColor</p>
+<!-- Testing: save()/restore() works for shadowColor -->
+<canvas id="c563" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_shadowColor() {
+
+var canvas = document.getElementById('c563');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.shadowOffsetX.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.shadowOffsetX</p>
+<!-- Testing: save()/restore() works for shadowOffsetX -->
+<canvas id="c564" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_shadowOffsetX() {
+
+var canvas = document.getElementById('c564');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.shadowOffsetY.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.shadowOffsetY</p>
+<!-- Testing: save()/restore() works for shadowOffsetY -->
+<canvas id="c565" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_shadowOffsetY() {
+
+var canvas = document.getElementById('c565');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.stack.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.stack</p>
+<!-- Testing: save()/restore() can be nested as a stack -->
+<canvas id="c566" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_stack() {
+
+var canvas = document.getElementById('c566');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.stackdepth.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.stackdepth</p>
+<!-- Testing: save()/restore() stack depth is not unreasonably limited -->
+<canvas id="c567" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_stackdepth() {
+
+var canvas = document.getElementById('c567');
+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();
+}
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.strokeStyle.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.strokeStyle</p>
+<!-- Testing: save()/restore() works for strokeStyle -->
+<canvas id="c568" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_strokeStyle() {
+
+var canvas = document.getElementById('c568');
+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();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.transformation.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.transformation</p>
+<!-- Testing: save()/restore() affects the current transformation matrix -->
+<canvas id="c569" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_state_saverestore_transformation() {
+
+var canvas = document.getElementById('c569');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.underflow.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.underflow - bug 296821</p>
+<!-- Testing: restore() with an empty stack has no effect -->
+<canvas id="c570" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_underflow() {
+
+var canvas = document.getElementById('c570');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.basic.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.basic</p>
+<canvas id="c571" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_basic() {
+
+var canvas = document.getElementById('c571');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.clip.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.clip</p>
+<canvas id="c572" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_clip() {
+
+var canvas = document.getElementById('c572');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.globalalpha.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.globalalpha</p>
+<canvas id="c573" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_globalalpha() {
+
+var canvas = document.getElementById('c573');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.globalcomposite.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.globalcomposite</p>
+<canvas id="c574" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_globalcomposite() {
+
+var canvas = document.getElementById('c574');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.negative.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.negative</p>
+<canvas id="c575" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_negative() {
+
+var canvas = document.getElementById('c575');
+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, 0);
+isPixel(ctx, 75,12, 0,255,0,255, 0);
+isPixel(ctx, 25,37, 0,255,0,255, 0);
+isPixel(ctx, 75,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.nonfinite</p>
+<!-- Testing: strokeRect() with Infinity/NaN is ignored -->
+<canvas id="c576" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_nonfinite() {
+
+var canvas = document.getElementById('c576');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.path.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.path</p>
+<canvas id="c577" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_path() {
+
+var canvas = document.getElementById('c577');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.shadow.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.shadow</p>
+<canvas id="c578" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_shadow() {
+
+var canvas = document.getElementById('c578');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.transform.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.transform</p>
+<canvas id="c579" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_transform() {
+
+var canvas = document.getElementById('c579');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.zero.1.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.zero.1</p>
+<canvas id="c580" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_zero_1() {
+
+var canvas = document.getElementById('c580');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.zero.2.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.zero.2</p>
+<canvas id="c581" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_strokeRect_zero_2() {
+
+var canvas = document.getElementById('c581');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.zero.3.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.zero.3</p>
+<canvas id="c582" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_zero_3() {
+
+var canvas = document.getElementById('c582');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.zero.4.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.zero.4</p>
+<canvas id="c583" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_zero_4() {
+
+var canvas = document.getElementById('c583');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.zero.5.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.zero.5</p>
+<canvas id="c584" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_zero_5() {
+
+var canvas = document.getElementById('c584');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 250;
+ctx.lineJoin = 'round';
+ctx.strokeRect(100, 25, 100, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeStyle.default.html ]]] -->
+
+<p>Canvas test: 2d.strokeStyle.default</p>
+<canvas id="c585" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_strokeStyle_default() {
+
+var canvas = document.getElementById('c585');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.strokeStyle == '#000000', "ctx.strokeStyle == '#000000'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.order.html ]]] -->
+
+<p>Canvas test: 2d.transformation.order</p>
+<!-- Testing: Transformations are applied in the right order -->
+<canvas id="c586" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_order() {
+
+var canvas = document.getElementById('c586');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.direction.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.direction</p>
+<!-- Testing: rotate() is clockwise -->
+<canvas id="c587" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_direction() {
+
+var canvas = document.getElementById('c587');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.nonfinite</p>
+<!-- Testing: rotate() with Infinity/NaN is ignored -->
+<canvas id="c588" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_nonfinite() {
+
+var canvas = document.getElementById('c588');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.radians.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.radians</p>
+<!-- Testing: rotate() uses radians -->
+<canvas id="c589" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_radians() {
+
+var canvas = document.getElementById('c589');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.wrap.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.wrap</p>
+<!-- Testing: rotate() wraps large positive values correctly -->
+<canvas id="c590" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_wrap() {
+
+var canvas = document.getElementById('c590');
+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, 0);
+isPixel(ctx, 98,2, 0,255,0,255, 0);
+isPixel(ctx, 98,47, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.wrapnegative.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.wrapnegative</p>
+<!-- Testing: rotate() wraps large negative values correctly -->
+<canvas id="c591" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_wrapnegative() {
+
+var canvas = document.getElementById('c591');
+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, 0);
+isPixel(ctx, 98,2, 0,255,0,255, 0);
+isPixel(ctx, 98,47, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.zero.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.zero</p>
+<!-- Testing: rotate() by 0 does nothing -->
+<canvas id="c592" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_zero() {
+
+var canvas = document.getElementById('c592');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.basic.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.basic</p>
+<!-- Testing: scale() works -->
+<canvas id="c593" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_basic() {
+
+var canvas = document.getElementById('c593');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.large.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.large</p>
+<!-- Testing: scale() with large scale factors works -->
+<canvas id="c594" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_large() {
+
+var canvas = document.getElementById('c594');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.multiple.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.multiple</p>
+<!-- Testing: Multiple scale()s combine -->
+<canvas id="c595" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_multiple() {
+
+var canvas = document.getElementById('c595');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.negative.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.negative</p>
+<!-- Testing: scale() with negative scale factors works -->
+<canvas id="c596" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_negative() {
+
+var canvas = document.getElementById('c596');
+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, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.nonfinite</p>
+<!-- Testing: scale() with Infinity/NaN is ignored -->
+<canvas id="c597" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_nonfinite() {
+
+var canvas = document.getElementById('c597');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.zero.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.zero</p>
+<!-- Testing: scale() with a scale factor of zero works -->
+<canvas id="c598" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_zero() {
+
+var canvas = document.getElementById('c598');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.setTransform.multiple.html ]]] -->
+
+<p>Canvas test: 2d.transformation.setTransform.multiple</p>
+<canvas id="c599" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_setTransform_multiple() {
+
+var canvas = document.getElementById('c599');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.setTransform.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.transformation.setTransform.nonfinite</p>
+<!-- Testing: setTransform() with Infinity/NaN is ignored -->
+<canvas id="c600" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_setTransform_nonfinite() {
+
+var canvas = document.getElementById('c600');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.setTransform.skewed.html ]]] -->
+
+<p>Canvas test: 2d.transformation.setTransform.skewed</p>
+<canvas id="c601" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_setTransform_skewed() {
+
+var canvas = document.getElementById('c601');
+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, 0);
+isPixel(ctx, 79,11, 0,255,0,255, 0);
+isPixel(ctx, 21,39, 0,255,0,255, 0);
+isPixel(ctx, 79,39, 0,255,0,255, 0);
+isPixel(ctx, 39,19, 0,255,0,255, 0);
+isPixel(ctx, 61,19, 0,255,0,255, 0);
+isPixel(ctx, 39,31, 0,255,0,255, 0);
+isPixel(ctx, 61,31, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.transform.identity.html ]]] -->
+
+<p>Canvas test: 2d.transformation.transform.identity</p>
+<!-- Testing: transform() with the identity matrix does nothing -->
+<canvas id="c602" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_transform_identity() {
+
+var canvas = document.getElementById('c602');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.transform.multiply.html ]]] -->
+
+<p>Canvas test: 2d.transformation.transform.multiply</p>
+<!-- Testing: transform() multiplies the CTM -->
+<canvas id="c603" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_transform_multiply() {
+
+var canvas = document.getElementById('c603');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.transform.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.transformation.transform.nonfinite</p>
+<!-- Testing: transform() with Infinity/NaN is ignored -->
+<canvas id="c604" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_transform_nonfinite() {
+
+var canvas = document.getElementById('c604');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.transform.skewed.html ]]] -->
+
+<p>Canvas test: 2d.transformation.transform.skewed</p>
+<!-- Testing: transform() with skewy matrix transforms correctly -->
+<canvas id="c605" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_transform_skewed() {
+
+var canvas = document.getElementById('c605');
+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, 0);
+isPixel(ctx, 79,11, 0,255,0,255, 0);
+isPixel(ctx, 21,39, 0,255,0,255, 0);
+isPixel(ctx, 79,39, 0,255,0,255, 0);
+isPixel(ctx, 39,19, 0,255,0,255, 0);
+isPixel(ctx, 61,19, 0,255,0,255, 0);
+isPixel(ctx, 39,31, 0,255,0,255, 0);
+isPixel(ctx, 61,31, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.translate.basic.html ]]] -->
+
+<p>Canvas test: 2d.transformation.translate.basic</p>
+<!-- Testing: translate() works -->
+<canvas id="c606" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_translate_basic() {
+
+var canvas = document.getElementById('c606');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.translate.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.transformation.translate.nonfinite</p>
+<!-- Testing: translate() with Infinity/NaN is ignored -->
+<canvas id="c607" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_translate_nonfinite() {
+
+var canvas = document.getElementById('c607');
+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, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.type.delete.html ]]] -->
+
+<p>Canvas test: 2d.type.delete</p>
+<!-- Testing: window.CanvasRenderingContext2D is DontDelete -->
+<canvas id="c608" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_type_delete() {
+
+var canvas = document.getElementById('c608');
+var ctx = canvas.getContext('2d');
+
+delete window.CanvasRenderingContext2D;
+ok(window.CanvasRenderingContext2D !== undefined, "window.CanvasRenderingContext2D !== undefined");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.type.exists.html ]]] -->
+
+<p>Canvas test: 2d.type.exists</p>
+<!-- Testing: The 2D context interface is a property of 'window' -->
+<canvas id="c609" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_type_exists() {
+
+var canvas = document.getElementById('c609');
+var ctx = canvas.getContext('2d');
+
+ok(window.CanvasRenderingContext2D, "window.CanvasRenderingContext2D");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.type.extend.html ]]] -->
+
+<p>Canvas test: 2d.type.extend</p>
+<!-- Testing: Interface methods can be added -->
+<canvas id="c610" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_type_extend() {
+
+var canvas = document.getElementById('c610');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.type.prototype.html ]]] -->
+
+<p>Canvas test: 2d.type.prototype</p>
+<!-- Testing: window.CanvasRenderingContext2D.prototype is { DontDelete, ReadOnly }, and its methods are not -->
+<canvas id="c611" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_type_prototype() {
+
+var canvas = document.getElementById('c611');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.type.replace.html ]]] -->
+
+<p>Canvas test: 2d.type.replace</p>
+<!-- Testing: Interface methods can be overridden -->
+<canvas id="c612" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_type_replace() {
+
+var canvas = document.getElementById('c612');
+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, 0);
+
+//restore the original method to ensure that other tests can run successfully
+window.CanvasRenderingContext2D.prototype.fillRect = fillRect;
+}
+</script>
+
+<!-- [[[ test_2d.voidreturn.html ]]] -->
+
+<p>Canvas test: 2d.voidreturn</p>
+<!-- Testing: void methods return undefined -->
+<canvas id="c613" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_voidreturn() {
+
+var canvas = document.getElementById('c613');
+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_11.png'), 0, 0, 0, 0, 0, 0, 0, 0) === undefined, "ctx.drawImage(document.getElementById('yellow_11.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");
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_11.png" class="resource">
+
+<!-- [[[ test_bug397524.html ]]] -->
+
+<p>Test for Bug 397524</p>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=397524">Mozilla Bug 397524</a>
+<p id="display">
+  <canvas id="canvas1" width="1" height="1"></canvas>
+  <canvas id="canvas2" width="1" height="1"></canvas>
+  <canvas id="canvas3" 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 **/
+
+function draw(n) {
+  $("canvas" + n).getContext('2d').drawImage($("i" + n), 0, 0);
+}
+
+function test_bug397524() {
+  draw(1);
+  draw(2);
+  draw(3);
+
+  // Should be able to get the data out of the first canvas
+  $("canvas1").toDataURL("image/png");
+
+  // Should not be able to get the data out of a cross-site load
+  var gotData = false;  
+  try {
+    $("canvas2").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 {
+    $("canvas3").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!");
+
+}
+
+</script>
+</pre>
+
+<!-- [[[ test_bug405982.html ]]] -->
+
+<p>Canvas test: toDataURL.png</p>
+<canvas id="c614" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function test_bug405982() {
+
+var canvas = document.getElementById('c614');
+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");
+}
+
+}
+</script>
+<!-- [[[ test_context.arguments.extra.html ]]] -->
+
+<p>Canvas test: context.arguments.extra</p>
+<canvas id="c615" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_arguments_extra() {
+
+var canvas = document.getElementById('c615');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.getContext('2d', 'foo') !== null, "canvas.getContext('2d', 'foo') !== null");
+
+
+}
+</script>
+
+<!-- [[[ test_context.arguments.missing.html ]]] -->
+
+<p>Canvas test: context.arguments.missing</p>
+<canvas id="c616" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_arguments_missing() {
+
+var canvas = document.getElementById('c616');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_context.casesensitive.html ]]] -->
+
+<p>Canvas test: context.casesensitive - bug 401788</p>
+<!-- Testing: Context name "2D" is unrecognised; matching is case sensitive -->
+<canvas id="c617" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_casesensitive() {
+
+var canvas = document.getElementById('c617');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_context.emptystring.html ]]] -->
+
+<p>Canvas test: context.emptystring - bug 401788</p>
+<!-- Testing: getContext with empty string returns null -->
+<canvas id="c618" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_emptystring() {
+
+var canvas = document.getElementById('c618');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_context.unrecognised.badname.html ]]] -->
+
+<p>Canvas test: context.unrecognised.badname - bug 401788</p>
+<!-- Testing: getContext with unrecognised context name returns null -->
+<canvas id="c619" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_unrecognised_badname() {
+
+var canvas = document.getElementById('c619');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_context.unrecognised.badsuffix.html ]]] -->
+
+<p>Canvas test: context.unrecognised.badsuffix - bug 401788</p>
+<!-- Testing: Context name "2d" plus a suffix is unrecognised -->
+<canvas id="c620" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_unrecognised_badsuffix() {
+
+var canvas = document.getElementById('c620');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_context.unrecognised.nullsuffix.html ]]] -->
+
+<p>Canvas test: context.unrecognised.nullsuffix - bug 401788</p>
+<!-- Testing: Context name "2d" plus a "\0" suffix is unrecognised -->
+<canvas id="c621" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_unrecognised_nullsuffix() {
+
+var canvas = document.getElementById('c621');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_context.unrecognised.unicode.html ]]] -->
+
+<p>Canvas test: context.unrecognised.unicode - bug 401788</p>
+<!-- Testing: Context name which kind of looks like "2d" is unrecognised -->
+<canvas id="c622" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_unrecognised_unicode() {
+
+var canvas = document.getElementById('c622');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_fallback.basic.html ]]] -->
+
+<p>Canvas test: fallback.basic</p>
+<!-- Testing: Fallback content is inserted into the DOM -->
+<canvas id="c623" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_fallback_basic() {
+
+var canvas = document.getElementById('c623');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.childNodes.length == 1, "canvas.childNodes.length == 1");
+
+
+}
+</script>
+
+<!-- [[[ test_fallback.multiple.html ]]] -->
+
+<p>Canvas test: fallback.multiple</p>
+<!-- Testing: Fallback content with multiple elements -->
+<canvas id="c624" width="100" height="50"><p class="fallback">FAIL</p><p class="fallback">FAIL</p></canvas>
+<script>
+
+function test_fallback_multiple() {
+
+var canvas = document.getElementById('c624');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.childNodes.length == 2, "canvas.childNodes.length == 2");
+
+
+}
+</script>
+
+<!-- [[[ test_fallback.nested.html ]]] -->
+
+<p>Canvas test: fallback.nested</p>
+<!-- Testing: Fallback content containing another canvas (mostly testing parsers) -->
+<canvas id="c625" width="100" height="50"><canvas><p class="fallback">FAIL (fallback content)</p></canvas><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_fallback_nested() {
+
+var canvas = document.getElementById('c625');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.childNodes.length == 2, "canvas.childNodes.length == 2");
+
+
+}
+</script>
+
+<!-- [[[ test_initial.colour.html ]]] -->
+
+<p>Canvas test: initial.colour</p>
+<!-- Testing: Initial state is transparent black -->
+<canvas id="c626" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_colour() {
+
+var canvas = document.getElementById('c626');
+var ctx = canvas.getContext('2d');
+
+isPixel(ctx, 20,20, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.2dstate.html ]]] -->
+
+<p>Canvas test: initial.reset.2dstate</p>
+<!-- Testing: Resetting the canvas state resets 2D state variables -->
+<canvas id="c627" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_initial_reset_2dstate() {
+
+var canvas = document.getElementById('c627');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.clip.html ]]] -->
+
+<p>Canvas test: initial.reset.clip</p>
+<!-- Testing: Resetting the canvas state resets the current clip region -->
+<canvas id="c628" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_clip() {
+
+var canvas = document.getElementById('c628');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.different.html ]]] -->
+
+<p>Canvas test: initial.reset.different</p>
+<!-- Testing: Changing size resets canvas to transparent black -->
+<canvas id="c629" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_different() {
+
+var canvas = document.getElementById('c629');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 20,20, 255,0,0,255, 0);
+canvas.width = 50;
+isPixel(ctx, 20,20, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.gradient.html ]]] -->
+
+<p>Canvas test: initial.reset.gradient</p>
+<!-- Testing: Resetting the canvas state does not invalidate any existing gradients -->
+<canvas id="c630" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_gradient() {
+
+var canvas = document.getElementById('c630');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.path.html ]]] -->
+
+<p>Canvas test: initial.reset.path</p>
+<!-- Testing: Resetting the canvas state resets the current path -->
+<canvas id="c631" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_path() {
+
+var canvas = document.getElementById('c631');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.pattern.html ]]] -->
+
+<p>Canvas test: initial.reset.pattern</p>
+<!-- Testing: Resetting the canvas state does not invalidate any existing patterns -->
+<canvas id="c632" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_pattern() {
+
+var canvas = document.getElementById('c632');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.same.html ]]] -->
+
+<p>Canvas test: initial.reset.same</p>
+<!-- Testing: Setting size (not changing the value) resets canvas to transparent black -->
+<canvas id="c633" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_same() {
+
+var canvas = document.getElementById('c633');
+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, 0);
+canvas.width = 100;
+isPixel(ctx, 20,20, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.transform.html ]]] -->
+
+<p>Canvas test: initial.reset.transform</p>
+<!-- Testing: Resetting the canvas state resets the current transformation matrix -->
+<canvas id="c634" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_transform() {
+
+var canvas = document.getElementById('c634');
+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, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.default.html ]]] -->
+
+<p>Canvas test: size.attributes.default</p>
+<!-- Testing: Default width/height -->
+<canvas id="c635" ><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_default() {
+
+var canvas = document.getElementById('c635');
+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')");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.html ]]] -->
+
+<p>Canvas test: size.attributes</p>
+<!-- Testing: width/height DOM attributes and content attributes -->
+<canvas id="c636" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes() {
+
+var canvas = document.getElementById('c636');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.badsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.badsuffix</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c637" width="100foo" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_badsuffix() {
+
+var canvas = document.getElementById('c637');
+var ctx = canvas.getContext('2d');
+
+todo(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.floatsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.floatsuffix</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c638" width="100.9" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_floatsuffix() {
+
+var canvas = document.getElementById('c638');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.negative.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.negative</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c639" width="-100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_negative() {
+
+var canvas = document.getElementById('c639');
+var ctx = canvas.getContext('2d');
+
+todo(canvas.width == 300, "canvas.width == 300");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.nonnumber.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.nonnumber</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c640" width="foo" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_nonnumber() {
+
+var canvas = document.getElementById('c640');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 300, "canvas.width == 300");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.percentsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.percentsuffix</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c641" width="100%" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_percentsuffix() {
+
+var canvas = document.getElementById('c641');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.whitespace.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.whitespace</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c642" width="   100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_whitespace() {
+
+var canvas = document.getElementById('c642');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.zero.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.zero</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c643" width="0" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_zero() {
+
+var canvas = document.getElementById('c643');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 0, "canvas.width == 0");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.zerosuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.zerosuffix</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c644" width="100.0" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_zerosuffix() {
+
+var canvas = document.getElementById('c644');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.reflect.1.html ]]] -->
+
+<p>Canvas test: size.attributes.reflect.1</p>
+<!-- Testing: Setting DOM attributes updates DOM and content attributes -->
+<canvas id="c645" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_reflect_1() {
+
+var canvas = document.getElementById('c645');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.reflect.2.html ]]] -->
+
+<p>Canvas test: size.attributes.reflect.2</p>
+<!-- Testing: Setting content attributes updates DOM and content attributes -->
+<canvas id="c646" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_reflect_2() {
+
+var canvas = document.getElementById('c646');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.removed.html ]]] -->
+
+<p>Canvas test: size.attributes.removed</p>
+<!-- Testing: Removing content attributes reverts to default size -->
+<canvas id="c647" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_removed() {
+
+var canvas = document.getElementById('c647');
+var ctx = canvas.getContext('2d');
+
+canvas.removeAttribute('width');
+ok(canvas.width == 300, "canvas.width == 300");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.badsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.badsuffix</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c648" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_badsuffix() {
+
+var canvas = document.getElementById('c648');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '100foo');
+todo(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.floatsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.floatsuffix</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c649" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_floatsuffix() {
+
+var canvas = document.getElementById('c649');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '1');
+canvas.setAttribute('width', '100.9');
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.negative.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.negative</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c650" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_negative() {
+
+var canvas = document.getElementById('c650');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '-100');
+todo(canvas.width == 300, "canvas.width == 300");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.nonnumber.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.nonnumber</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c651" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_nonnumber() {
+
+var canvas = document.getElementById('c651');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', 'foo');
+ok(canvas.width == 300, "canvas.width == 300");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.percentsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.percentsuffix</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c652" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_percentsuffix() {
+
+var canvas = document.getElementById('c652');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '100%');
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.whitespace.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.whitespace</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c653" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_whitespace() {
+
+var canvas = document.getElementById('c653');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '   100');
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.zero.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.zero</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c654" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_zero() {
+
+var canvas = document.getElementById('c654');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '0');
+ok(canvas.width == 0, "canvas.width == 0");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.zerosuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.zerosuffix</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c655" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_zerosuffix() {
+
+var canvas = document.getElementById('c655');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '1');
+canvas.setAttribute('width', '100.0');
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.style.html ]]] -->
+
+<p>Canvas test: size.attributes.style</p>
+<!-- Testing: Canvas size is independent of CSS resizing -->
+<canvas id="c656" width="50" height="30" style="width: 100px; height: 50px"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_style() {
+
+var canvas = document.getElementById('c656');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 50, "canvas.width == 50");
+ok(canvas.height == 30, "canvas.height == 30");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.type.get.html ]]] -->
+
+<p>Canvas test: size.attributes.type.get</p>
+<!-- Testing: width/height DOM/content attributes - string vs number types -->
+<canvas id="c657" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_type_get() {
+
+var canvas = document.getElementById('c657');
+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'");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.type.set.html ]]] -->
+
+<p>Canvas test: size.attributes.type.set</p>
+<!-- Testing: Setting width/height DOM attributes -->
+<canvas id="c658" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_type_set() {
+
+var canvas = document.getElementById('c658');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_text.font.html ]]] -->
+
+<p>Canvas test: text.font</p>
+<canvas id="c659" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var _deferred = true;
+
+function test_text_font() {
+
+var canvas = document.getElementById('c659');
+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>
+
+<!-- [[[ test_text.measure.html ]]] -->
+
+<p>Canvas test: text.measure</p>
+<canvas id="c660" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var _deferred = true;
+
+function test_text_measure() {
+
+var canvas = document.getElementById('c660');
+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>
+
+<!-- [[[ test_text.space.replace.html ]]] -->
+
+<p>Canvas test: text.space.replace</p>
+<canvas id="c661" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var _deferred = true;
+
+function test_text_space_replace() {
+
+var canvas = document.getElementById('c661');
+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>
+
+<!-- [[[ test_text.textAlign.html ]]] -->
+
+<p>Canvas test: text.textAlign</p>
+<canvas id="c662" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var _deferred = true;
+
+function test_text_textAlign() {
+
+var canvas = document.getElementById('c662');
+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>
+
+<!-- [[[ test_text.textBaseline.html ]]] -->
+
+<p>Canvas test: text.textBaseline</p>
+<canvas id="c663" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var _deferred = true;
+
+function test_text_textBaseline() {
+
+var canvas = document.getElementById('c663');
+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>
+
+<!-- [[[ test_toDataURL.arguments.1.html ]]] -->
+
+<p>Canvas test: toDataURL.arguments.1 - bug 401795</p>
+<!-- Testing: toDataURL ignores extra arguments -->
+<canvas id="c664" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_arguments_1() {
+
+var canvas = document.getElementById('c664');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.arguments.2.html ]]] -->
+
+<p>Canvas test: toDataURL.arguments.2 - bug 401795</p>
+<!-- Testing: toDataURL ignores extra arguments -->
+<canvas id="c665" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_arguments_2() {
+
+var canvas = document.getElementById('c665');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.arguments.3.html ]]] -->
+
+<p>Canvas test: toDataURL.arguments.3 - bug 401795</p>
+<!-- Testing: toDataURL ignores extra arguments -->
+<canvas id="c666" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_arguments_3() {
+
+var canvas = document.getElementById('c666');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.complexcolours.html ]]] -->
+
+<p>Canvas test: toDataURL.complexcolours</p>
+<!-- Testing: toDataURL handles non-primary and non-solid colours correctly -->
+<canvas id="c667" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas667 = document.getElementById('c667');
+var ctx667 = canvas667.getContext('2d');
+
+function test_toDataURL_complexcolours() {
+
+// (These values are chosen to survive relatively alright through being premultiplied)
+ctx667.fillStyle = 'rgba(1, 3, 254, 1)';
+ctx667.fillRect(0, 0, 25, 25);
+ctx667.fillStyle = 'rgba(8, 252, 248, 0.75)';
+ctx667.fillRect(25, 0, 25, 25);
+ctx667.fillStyle = 'rgba(6, 10, 250, 0.502)';
+ctx667.fillRect(50, 0, 25, 25);
+ctx667.fillStyle = 'rgba(12, 16, 244, 0.25)';
+ctx667.fillRect(75, 0, 25, 25);
+var img = new Image();
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx667.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(ctx667, 12,40, 1,3,254,255, 0);
+    isPixel(ctx667, 37,40, 8,252,248,191, 2);
+    isPixel(ctx667, 62,40, 6,10,250,127, 4);
+    isPixel(ctx667, 87,40, 12,16,244,63, 8);
+});
+img.src = canvas667.toDataURL();
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.default.html ]]] -->
+
+<p>Canvas test: toDataURL.default</p>
+<!-- Testing: toDataURL with no arguments returns a PNG -->
+<canvas id="c668" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_default() {
+
+var canvas = document.getElementById('c668');
+var ctx = canvas.getContext('2d');
+
+var data = canvas.toDataURL();
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.lowercase.html ]]] -->
+
+<p>Canvas test: toDataURL.lowercase - bug 401795</p>
+<!-- Testing: toDataURL type is case-sensitive -->
+<canvas id="c669" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_lowercase() {
+
+var canvas = document.getElementById('c669');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.nocontext.html ]]] -->
+
+<p>Canvas test: toDataURL.nocontext</p>
+<!-- Testing: toDataURL works before any context has been got -->
+<canvas id="c670" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_nocontext() {
+
+var canvas = document.getElementById('c670');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+var data = canvas2.toDataURL();
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.png.html ]]] -->
+
+<p>Canvas test: toDataURL.png</p>
+<!-- Testing: toDataURL with image/png returns a PNG -->
+<canvas id="c671" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_png() {
+
+var canvas = document.getElementById('c671');
+var ctx = canvas.getContext('2d');
+
+var data = canvas.toDataURL('image/png');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.primarycolours.html ]]] -->
+
+<p>Canvas test: toDataURL.primarycolours</p>
+<!-- Testing: toDataURL handles simple colours correctly -->
+<canvas id="c672" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+var canvas672 = document.getElementById('c672');
+var ctx672 = canvas672.getContext('2d');
+
+function test_toDataURL_primarycolours() {
+
+ctx672.fillStyle = '#ff0';
+ctx672.fillRect(0, 0, 25, 40);
+ctx672.fillStyle = '#0ff';
+ctx672.fillRect(25, 0, 50, 40);
+ctx672.fillStyle = '#00f';
+ctx672.fillRect(75, 0, 25, 40);
+ctx672.fillStyle = '#fff';
+ctx672.fillRect(0, 40, 100, 10);
+var data = canvas672.toDataURL();
+ctx672.fillStyle = '#f00';
+ctx672.fillRect(0, 0, 100, 50);
+var img = new Image();
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx672.drawImage(img, 0, 0);
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalBrowserRead');
+    isPixel(ctx672, 12,20, 255,255,0,255, 0);
+    isPixel(ctx672, 50,20, 0,255,255,255, 0);
+    isPixel(ctx672, 87,20, 0,0,255,255, 0);
+    isPixel(ctx672, 50,45, 255,255,255,255, 0);
+});
+img.src = data;
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.unrecognised.html ]]] -->
+
+<p>Canvas test: toDataURL.unrecognised - bug 401795</p>
+<!-- Testing: toDataURL with an unhandled type returns a PNG -->
+<canvas id="c673" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_unrecognised() {
+
+var canvas = document.getElementById('c673');
+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');
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.zerosize.html ]]] -->
+
+<p>Canvas test: toDataURL.zerosize</p>
+<!-- Testing: toDataURL on zero-size canvas returns 'data:,' -->
+<canvas id="c674" width="0" height="0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_zerosize() {
+
+var canvas = document.getElementById('c674');
+var ctx = canvas.getContext('2d');
+
+var data = canvas.toDataURL();
+todo(data === 'data:,', "data === 'data:,'");
+
+
+}
+</script>
+
+<!-- [[[ test_type.delete.html ]]] -->
+
+<p>Canvas test: type.delete</p>
+<!-- Testing: window.HTMLCanvasElement interface object is DontDelete -->
+<canvas id="c675" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_delete() {
+
+var canvas = document.getElementById('c675');
+var ctx = canvas.getContext('2d');
+
+delete window.HTMLCanvasElement;
+ok(window.HTMLCanvasElement, "window.HTMLCanvasElement");
+
+
+}
+</script>
+
+<!-- [[[ test_type.exists.html ]]] -->
+
+<p>Canvas test: type.exists</p>
+<!-- Testing: HTMLCanvasElement is a property of window -->
+<canvas id="c676" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_exists() {
+
+var canvas = document.getElementById('c676');
+var ctx = canvas.getContext('2d');
+
+ok(window.HTMLCanvasElement, "window.HTMLCanvasElement");
+
+
+}
+</script>
+
+<!-- [[[ test_type.extend.html ]]] -->
+
+<p>Canvas test: type.extend</p>
+<!-- Testing: HTMLCanvasElement methods can be added, and the new methods used by canvases -->
+<canvas id="c677" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_extend() {
+
+var canvas = document.getElementById('c677');
+var ctx = canvas.getContext('2d');
+
+window.HTMLCanvasElement.prototype.getZero = function () { return 0; };
+ok(canvas.getZero() === 0, "canvas.getZero() === 0");
+
+
+}
+</script>
+
+<!-- [[[ test_type.name.html ]]] -->
+
+<p>Canvas test: type.name</p>
+<!-- Testing: HTMLCanvasElement type and toString -->
+<canvas id="c678" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_name() {
+
+var canvas = document.getElementById('c678');
+var ctx = canvas.getContext('2d');
+
+ok(Object.prototype.toString.call(canvas) === '[object HTMLCanvasElement]', "Object.prototype.toString.call(canvas) === '[object HTMLCanvasElement]'");
+
+
+}
+</script>
+
+<!-- [[[ test_type.prototype.html ]]] -->
+
+<p>Canvas test: type.prototype</p>
+<!-- Testing: window.HTMLCanvasElement has prototype, which is { ReadOnly, DontDelete }. prototype has getContext, which is not -->
+<canvas id="c679" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_prototype() {
+
+var canvas = document.getElementById('c679');
+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");
+
+
+}
+</script>
+
+<!-- [[[ test_type.replace.html ]]] -->
+
+<p>Canvas test: type.replace</p>
+<!-- Testing: HTMLCanvasElement methods can be replaced, and the replacement methods used by canvases -->
+<canvas id="c680" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_replace() {
+
+var canvas = document.getElementById('c680');
+var ctx = canvas.getContext('2d');
+
+window.HTMLCanvasElement.prototype.getContext = function (name) { return 0; };
+ok(canvas.getContext('2d') === 0, "canvas.getContext('2d') === 0");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imagedata_coercion.html ]]] -->
+
+<p>Canvas test: 2d.imagedata_coercion</p>
+<!-- Testing: imagedata coerced correctly on set -->
+<canvas id="c681" 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 = ctx681.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");
+
+  ctx681.putImageData(imageData, 0, 0);
+  var testImageData = ctx681.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;
+  }
+  ctx681.putImageData(imageData, 0, 0);
+  testImageData = ctx681.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 canvas681;
+var ctx681;
+                      
+function test_2d_imagedata_coercion() {
+
+canvas681 = document.getElementById('c681');
+ctx681 = canvas681.getContext('2d');
+
+doTests("fast");
+doTests("slow");
+
+}
+</script>
+
+<!-- [[[ test_2d.imageSmoothing.html ]]] -->
+
+<p>Canvas test: 2d.imageRenderingQuality</p>
+<canvas id="c682" width="10" height="10"></canvas><br>
+<canvas style="visibility: hidden" id="c683" width="2" height="2"></canvas>
+<script type="text/javascript">
+
+function setup_test_2d_imageSmoothing() {
+  var c683 = document.getElementById("c683");
+  var cx683 = c683.getContext("2d");
+
+  cx683.fillStyle = "red";
+  cx683.fillRect(0, 0, 2, 2);
+
+  cx683.fillStyle = "rgb(0,255,0)";
+  cx683.fillRect(0, 0, 1, 1);
+}
+
+function test_2d_imageSmoothing() {
+  setup_test_2d_imageSmoothing();
+
+  var c682 = document.getElementById("c682");
+  var c683 = document.getElementById("c683");
+
+  var cx682 = c682.getContext("2d");
+
+  ok(cx682.mozImageSmoothingEnabled == true, "initial mozImageSmoothingEnabled is true");
+
+  // check that mozImageSmoothingEnabled is part of the context
+  cx682.save();
+  cx682.mozImageSmoothingEnabled = false;
+  ok(cx682.mozImageSmoothingEnabled == false, "mozImageSmoothingEnabled is false after setting");
+  cx682.restore();
+  ok(cx682.mozImageSmoothingEnabled == true, "mozImageSmoothingEnabled is true after restore");
+
+  // check that false works
+  cx682.mozImageSmoothingEnabled = false;
+
+  cx682.scale(10,10);
+  cx682.drawImage(c683, 0, 0);
+
+  // this should be all red
+  var data = cx682.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])");
+}
+
+</script>
+
+<script>
+
+function asyncTestsDone() {
+	if (isDone_test_2d_drawImage_animated_apng &&
+		isDone_test_2d_drawImage_animated_gif) {
+		SimpleTest.finish();
+	} else {
+		setTimeout(asyncTestsDone, 500);
+	}
+ }
+ 
+function runTests() {
+/**
+ * xor and lighter aren't well handled by cairo; they mostly work, but we don't want
+ * to test that
+ */
+ //test_2d_composite_solid_lighter();
+ //test_2d_composite_transparent_xor();
+ //test_2d_composite_solid_xor();
+ //test_2d_composite_transparent_lighter();
+ //test_2d_composite_image_xor();
+ //test_2d_composite_image_lighter();
+ //test_2d_composite_canvas_xor();
+ //test_2d_composite_canvas_lighter();
+ //test_2d_composite_clip_xor();
+ //test_2d_composite_clip_lighter();
+ 
+/**
+ * Temporarily disabled tests; unbounded operators changed behaviour, need to reevaluate tests
+ */
+ //test_2d_composite_canvas_destination_atop();
+ //test_2d_composite_canvas_destination_in();
+ //test_2d_composite_canvas_source_in();
+ //test_2d_composite_canvas_source_out();
+ //test_2d_composite_image_destination_atop();
+ //test_2d_composite_image_destination_in();
+ //test_2d_composite_image_source_in();
+ //test_2d_composite_image_source_out();
+ 
+ /**
+  * These tests only pass on Mac OS X >= 10.5; see bug 450114
+  */
+ //test_2d_gradient_radial_equal();
+ //test_2d_gradient_radial_touch1();
+ //test_2d_gradient_radial_touch2();
+ //test_2d_gradient_radial_touch3();
+ 
+ /**
+  * These 19 tests recieve special makefile treatment
+  */
+ //test_2d_composite_uncovered_image_destination_atop();
+ //test_2d_composite_uncovered_image_destination_in();
+ //test_2d_composite_uncovered_image_source_in();
+ //test_2d_composite_uncovered_image_source_out();
+ //test_2d_gradient_radial_cone_behind();
+ //test_2d_gradient_radial_cone_beside();
+ //test_2d_gradient_radial_cone_front();
+ //test_2d_gradient_radial_cone_shape2();
+ //test_2d_gradient_radial_cone_top();
+ //test_2d_gradient_radial_inside2();
+ //test_2d_gradient_radial_inside3();
+ //test_2d_gradient_radial_outside1();
+ //test_2d_gradient_radial_outside2();
+ //test_2d_gradient_radial_outside3();
+ //test_2d_line_cap_closed();
+ //test_2d_line_join_parallel();
+ //test_2d_path_arc_shape_3();
+ //test_2d_path_rect_selfintersect();
+ //test_2d_strokeRect_zero_5();
+ 
+ /**
+  * Other tests not being run
+  */
+ //test_2d_composite_uncovered_fill_destination_atop();
+ //test_2d_composite_uncovered_fill_destination_in();
+ //test_2d_composite_uncovered_fill_source_in();
+ //test_2d_composite_uncovered_fill_source_out();
+ //test_2d_composite_uncovered_pattern_destination_atop();
+ //test_2d_composite_uncovered_pattern_destination_in();
+ //test_2d_composite_uncovered_pattern_source_in();
+ //test_2d_composite_uncovered_pattern_source_out();
+ 
+ //test_2d_path_rect_zero_6();	// This test is bogus according to the spec; see bug 407107
+ 
+ try {
+  test_2d_canvas_readonly();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_canvas_readonly");
+ }
+ try {
+  test_2d_canvas_reference();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_canvas_reference");
+ }
+ try {
+  test_2d_clearRect_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_basic");
+ }
+ try {
+  test_2d_clearRect_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_clip");
+ }
+ try {
+  test_2d_clearRect_globalalpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_globalalpha");
+ }
+ try {
+  test_2d_clearRect_globalcomposite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_globalcomposite");
+ }
+ try {
+  test_2d_clearRect_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_negative");
+ }
+ try {
+  test_2d_clearRect_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_nonfinite");
+ }
+ try {
+  test_2d_clearRect_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_path");
+ }
+ try {
+  test_2d_clearRect_shadow();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_shadow");
+ }
+ try {
+  test_2d_clearRect_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_transform");
+ }
+ try {
+  test_2d_clearRect_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_zero");
+ }
+ try {
+  test_2d_composite_canvas_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_canvas_copy");
+ }
+ try {
+  test_2d_composite_canvas_destination_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_canvas_destination_out");
+ }
+ try {
+  test_2d_composite_canvas_destination_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_canvas_destination_over");
+ }
+ try {
+  test_2d_composite_canvas_source_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_canvas_source_atop");
+ }
+ try {
+  test_2d_composite_canvas_source_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_canvas_source_over");
+ }
+ try {
+  test_2d_composite_clip_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_copy");
+ }
+ try {
+  test_2d_composite_clip_destination_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_destination_atop");
+ }
+ try {
+  test_2d_composite_clip_destination_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_destination_in");
+ }
+ try {
+  test_2d_composite_clip_destination_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_destination_out");
+ }
+ try {
+  test_2d_composite_clip_destination_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_destination_over");
+ }
+ try {
+  test_2d_composite_clip_source_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_source_atop");
+ }
+ try {
+  test_2d_composite_clip_source_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_source_in");
+ }
+ try {
+  test_2d_composite_clip_source_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_source_out");
+ }
+ try {
+  test_2d_composite_clip_source_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_source_over");
+ }
+ try {
+  test_2d_composite_globalAlpha_canvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_canvas");
+ }
+ try {
+  test_2d_composite_globalAlpha_canvaspattern();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_canvaspattern");
+ }
+ try {
+  test_2d_composite_globalAlpha_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_default");
+ }
+ try {
+  test_2d_composite_globalAlpha_fill();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_fill");
+ }
+ try {
+  test_2d_composite_globalAlpha_image();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_image");
+ }
+ try {
+  test_2d_composite_globalAlpha_imagepattern();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_imagepattern");
+ }
+ try {
+  test_2d_composite_globalAlpha_invalid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_invalid");
+ }
+ try {
+  test_2d_composite_globalAlpha_range();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_range");
+ }
+ try {
+  test_2d_composite_image_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_image_copy");
+ }
+ try {
+  test_2d_composite_image_destination_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_image_destination_out");
+ }
+ try {
+  test_2d_composite_image_destination_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_image_destination_over");
+ }
+ try {
+  test_2d_composite_image_source_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_image_source_atop");
+ }
+ try {
+  test_2d_composite_image_source_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_image_source_over");
+ }
+ try {
+  test_2d_composite_operation_casesensitive();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_casesensitive");
+ }
+ try {
+  test_2d_composite_operation_clear();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_clear");
+ }
+ try {
+  test_2d_composite_operation_darker();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_darker");
+ }
+ try {
+  test_2d_composite_operation_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_default");
+ }
+ try {
+  test_2d_composite_operation_get();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_get");
+ }
+ try {
+  test_2d_composite_operation_highlight();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_highlight");
+ }
+ try {
+  test_2d_composite_operation_nullsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_nullsuffix");
+ }
+ try {
+  test_2d_composite_operation_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_over");
+ }
+ try {
+  test_2d_composite_operation_unrecognised();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_unrecognised");
+ }
+ try {
+  test_2d_composite_solid_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_copy");
+ }
+ try {
+  test_2d_composite_solid_destination_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_destination_atop");
+ }
+ try {
+  test_2d_composite_solid_destination_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_destination_in");
+ }
+ try {
+  test_2d_composite_solid_destination_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_destination_out");
+ }
+ try {
+  test_2d_composite_solid_destination_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_destination_over");
+ }
+ try {
+  test_2d_composite_solid_source_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_source_atop");
+ }
+ try {
+  test_2d_composite_solid_source_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_source_in");
+ }
+ try {
+  test_2d_composite_solid_source_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_source_out");
+ }
+ try {
+  test_2d_composite_solid_source_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_source_over");
+ }
+ try {
+  test_2d_composite_transparent_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_copy");
+ }
+ try {
+  test_2d_composite_transparent_destination_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_destination_atop");
+ }
+ try {
+  test_2d_composite_transparent_destination_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_destination_in");
+ }
+ try {
+  test_2d_composite_transparent_destination_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_destination_out");
+ }
+ try {
+  test_2d_composite_transparent_destination_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_destination_over");
+ }
+ try {
+  test_2d_composite_transparent_source_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_source_atop");
+ }
+ try {
+  test_2d_composite_transparent_source_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_source_in");
+ }
+ try {
+  test_2d_composite_transparent_source_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_source_out");
+ }
+ try {
+  test_2d_composite_transparent_source_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_source_over");
+ }
+ try {
+  test_2d_composite_uncovered_fill_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_uncovered_fill_copy");
+ }
+ try {
+  test_2d_composite_uncovered_image_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_uncovered_image_copy");
+ }
+ try {
+  test_2d_composite_uncovered_pattern_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_uncovered_pattern_copy");
+ }
+ try {
+  test_2d_drawImage_3arg();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_3arg");
+ }
+ try {
+  test_2d_drawImage_5arg();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_5arg");
+ }
+ try {
+  test_2d_drawImage_9arg_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_9arg_basic");
+ }
+ try {
+  test_2d_drawImage_9arg_destpos();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_9arg_destpos");
+ }
+ try {
+  test_2d_drawImage_9arg_destsize();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_9arg_destsize");
+ }
+ try {
+  test_2d_drawImage_9arg_sourcepos();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_9arg_sourcepos");
+ }
+ try {
+  test_2d_drawImage_9arg_sourcesize();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_9arg_sourcesize");
+ }
+ try {
+  test_2d_drawImage_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_alpha");
+ }
+ try {
+  test_2d_drawImage_animated_poster();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_animated_poster");
+ }
+ try {
+  test_2d_drawImage_broken();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_broken");
+ }
+ try {
+  test_2d_drawImage_canvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_canvas");
+ }
+ try {
+  test_2d_drawImage_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_clip");
+ }
+ try {
+  test_2d_drawImage_composite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_composite");
+ }
+ try {
+  test_2d_drawImage_floatsource();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_floatsource");
+ }
+ try {
+  test_2d_drawImage_incomplete();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_incomplete");
+ }
+ try {
+  test_2d_drawImage_negativedest();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_negativedest");
+ }
+ try {
+  test_2d_drawImage_negativesource();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_negativesource");
+ }
+ try {
+  test_2d_drawImage_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_nonfinite");
+ }
+ try {
+  test_2d_drawImage_nowrap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_nowrap");
+ }
+ try {
+  test_2d_drawImage_null();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_null");
+ }
+ try {
+  test_2d_drawImage_outsidesource();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_outsidesource");
+ }
+ try {
+  test_2d_drawImage_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_path");
+ }
+ try {
+  test_2d_drawImage_self_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_self_1");
+ }
+ try {
+  test_2d_drawImage_self_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_self_2");
+ }
+ try {
+  test_2d_drawImage_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_transform");
+ }
+ try {
+  test_2d_drawImage_wrongtype();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_wrongtype");
+ }
+ try {
+  test_2d_drawImage_zerosource();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_zerosource");
+ }
+ try {
+  test_2d_fillRect_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_basic");
+ }
+ try {
+  test_2d_fillRect_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_clip");
+ }
+ try {
+  test_2d_fillRect_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_negative");
+ }
+ try {
+  test_2d_fillRect_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_nonfinite");
+ }
+ try {
+  test_2d_fillRect_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_path");
+ }
+ try {
+  test_2d_fillRect_shadow();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_shadow");
+ }
+ try {
+  test_2d_fillRect_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_transform");
+ }
+ try {
+  test_2d_fillRect_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_zero");
+ }
+ try {
+  test_2d_fillStyle_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_default");
+ }
+ try {
+  test_2d_fillStyle_get_semitransparent();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_get_semitransparent");
+ }
+ try {
+  test_2d_fillStyle_get_solid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_get_solid");
+ }
+ try {
+  test_2d_fillStyle_get_transparent();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_get_transparent");
+ }
+ try {
+  test_2d_fillStyle_invalidstring();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_invalidstring");
+ }
+ try {
+  test_2d_fillStyle_invalidtype();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_invalidtype");
+ }
+ try {
+  test_2d_fillStyle_parse_current_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_current_basic");
+ }
+ try {
+  test_2d_fillStyle_parse_current_changed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_current_changed");
+ }
+ try {
+  test_2d_fillStyle_parse_current_removed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_current_removed");
+ }
+ try {
+  test_2d_fillStyle_parse_hex3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hex3");
+ }
+ try {
+  test_2d_fillStyle_parse_hex6();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hex6");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_1");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_2");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_3");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_4");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_5");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_clamp_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_clamp_1");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_clamp_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_clamp_2");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_clamp_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_clamp_3");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_clamp_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_clamp_4");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_1");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_2");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_1");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_2");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_3");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_4");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_5");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_6();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_6");
+ }
+ try {
+  test_2d_fillStyle_parse_html4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_html4");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hex3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hex3");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hex6();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hex6");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsl_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsl_1");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsl_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsl_2");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsl_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsl_3");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsl_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsl_4");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsl_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsl_5");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsla_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsla_1");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsla_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsla_2");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_1");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_2");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_3");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_4");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_5");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_6();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_6");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_7();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_7");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgba_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgba_1");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgba_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgba_2");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgba_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgba_3");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgba_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgba_4");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgba_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgba_5");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_clamp_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_clamp_1");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_clamp_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_clamp_2");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_clamp_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_clamp_3");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_clamp_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_clamp_4");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_clamp_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_clamp_5");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_num();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_num");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_percent();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_percent");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_clamp_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_clamp_1");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_clamp_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_clamp_2");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_num_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_num_1");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_num_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_num_2");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_percent();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_percent");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_solid_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_solid_1");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_solid_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_solid_2");
+ }
+ try {
+  test_2d_fillStyle_parse_svg_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_svg_1");
+ }
+ try {
+  test_2d_fillStyle_parse_svg_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_svg_2");
+ }
+ try {
+  test_2d_fillStyle_parse_system();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_system");
+ }
+ try {
+  test_2d_fillStyle_parse_transparent_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_transparent_1");
+ }
+ try {
+  test_2d_fillStyle_parse_transparent_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_transparent_2");
+ }
+ try {
+  test_2d_getcontext_exists();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_getcontext_exists");
+ }
+ try {
+  test_2d_getcontext_shared();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_getcontext_shared");
+ }
+ try {
+  test_2d_getcontext_unique();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_getcontext_unique");
+ }
+ try {
+  test_2d_gradient_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_empty");
+ }
+ try {
+  test_2d_gradient_interpolate_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_alpha");
+ }
+ try {
+  test_2d_gradient_interpolate_colour();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_colour");
+ }
+ try {
+  test_2d_gradient_interpolate_colouralpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_colouralpha");
+ }
+ try {
+  test_2d_gradient_interpolate_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_multiple");
+ }
+ try {
+  test_2d_gradient_interpolate_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_outside");
+ }
+ try {
+  test_2d_gradient_interpolate_overlap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_overlap");
+ }
+ try {
+  test_2d_gradient_interpolate_overlap2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_overlap2");
+ }
+ try {
+  test_2d_gradient_interpolate_solid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_solid");
+ }
+ try {
+  test_2d_gradient_interpolate_vertical();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_vertical");
+ }
+ try {
+  test_2d_gradient_interpolate_zerosize();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_zerosize");
+ }
+ try {
+  test_2d_gradient_linear_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_linear_nonfinite");
+ }
+ try {
+  test_2d_gradient_linear_transform_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_linear_transform_1");
+ }
+ try {
+  test_2d_gradient_linear_transform_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_linear_transform_2");
+ }
+ try {
+  test_2d_gradient_linear_transform_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_linear_transform_3");
+ }
+ try {
+  test_2d_gradient_object_compare();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_compare");
+ }
+ try {
+  test_2d_gradient_object_crosscanvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_crosscanvas");
+ }
+ try {
+  test_2d_gradient_object_invalidcolour();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_invalidcolour");
+ }
+ try {
+  test_2d_gradient_object_invalidoffset();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_invalidoffset");
+ }
+ try {
+  test_2d_gradient_object_return();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_return");
+ }
+ try {
+  test_2d_gradient_object_type();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_type");
+ }
+ try {
+  test_2d_gradient_object_update();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_update");
+ }
+ try {
+  test_2d_gradient_radial_cone_bottom();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_cone_bottom");
+ }
+ try {
+  test_2d_gradient_radial_cone_cylinder();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_cone_cylinder");
+ }
+ try {
+  test_2d_gradient_radial_cone_shape1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_cone_shape1");
+ }
+ try {
+  test_2d_gradient_radial_inside1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_inside1");
+ }
+ try {
+  test_2d_gradient_radial_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_negative");
+ }
+ try {
+  test_2d_gradient_radial_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_nonfinite");
+ }
+ try {
+  test_2d_gradient_radial_transform_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_transform_1");
+ }
+ try {
+  test_2d_gradient_radial_transform_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_transform_2");
+ }
+ try {
+  test_2d_gradient_radial_transform_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_transform_3");
+ }
+ try {
+  test_2d_imageData_create_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_basic");
+ }
+ try {
+  test_2d_imageData_create_initial();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_initial");
+ }
+ try {
+  test_2d_imageData_create_large();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_large");
+ }
+ try {
+  test_2d_imageData_create_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_negative");
+ }
+ try {
+  test_2d_imageData_create_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_nonfinite");
+ }
+ try {
+  test_2d_imageData_create_round();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_round");
+ }
+ try {
+  test_2d_imageData_create_tiny();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_tiny");
+ }
+ try {
+  test_2d_imageData_create_type();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_type");
+ }
+ try {
+  test_2d_imageData_create_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_zero");
+ }
+ try {
+  test_2d_imageData_get_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_basic");
+ }
+ try {
+  test_2d_imageData_get_clamp();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_clamp");
+ }
+ try {
+  test_2d_imageData_get_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_nonfinite");
+ }
+ try {
+  test_2d_imageData_get_nonpremul();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_nonpremul");
+ }
+ try {
+  test_2d_imageData_get_order_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_order_alpha");
+ }
+ try {
+  test_2d_imageData_get_order_cols();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_order_cols");
+ }
+ try {
+  test_2d_imageData_get_order_rgb();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_order_rgb");
+ }
+ try {
+  test_2d_imageData_get_order_rows();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_order_rows");
+ }
+ try {
+  test_2d_imageData_get_range();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_range");
+ }
+ try {
+  test_2d_imageData_get_source_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_source_negative");
+ }
+ try {
+  test_2d_imageData_get_source_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_source_outside");
+ }
+ try {
+  test_2d_imageData_get_source_size();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_source_size");
+ }
+ try {
+  test_2d_imageData_get_tiny();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_tiny");
+ }
+ try {
+  test_2d_imageData_get_type();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_type");
+ }
+ try {
+  test_2d_imageData_get_unaffected();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_unaffected");
+ }
+ try {
+  test_2d_imageData_get_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_zero");
+ }
+ try {
+  test_2d_imageData_object_clamp();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_clamp");
+ }
+ try {
+  test_2d_imageData_object_ctor();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_ctor");
+ }
+ try {
+  test_2d_imageData_object_nan();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_nan");
+ }
+ try {
+  test_2d_imageData_object_properties();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_properties");
+ }
+ try {
+  test_2d_imageData_object_readonly();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_readonly");
+ }
+ try {
+  test_2d_imageData_object_round();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_round");
+ }
+ try {
+  test_2d_imageData_object_set();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_set");
+ }
+ try {
+  test_2d_imageData_object_string();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_string");
+ }
+ try {
+  test_2d_imageData_object_undefined();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_undefined");
+ }
+ try {
+  test_2d_imageData_put_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_alpha");
+ }
+ try {
+  test_2d_imageData_put_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_basic");
+ }
+ try {
+  test_2d_imageData_put_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_clip");
+ }
+ try {
+  test_2d_imageData_put_created();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_created");
+ }
+ try {
+  test_2d_imageData_put_cross();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_cross");
+ }
+ try {
+  test_2d_imageData_put_dirty_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_dirty_negative");
+ }
+ try {
+  test_2d_imageData_put_dirty_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_dirty_outside");
+ }
+ try {
+  test_2d_imageData_put_dirty_rect1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_dirty_rect1");
+ }
+ try {
+  test_2d_imageData_put_dirty_rect2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_dirty_rect2");
+ }
+ try {
+  test_2d_imageData_put_dirty_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_dirty_zero");
+ }
+ try {
+  test_2d_imageData_put_modified();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_modified");
+ }
+ try {
+  test_2d_imageData_put_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_nonfinite");
+ }
+ try {
+  test_2d_imageData_put_null();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_null");
+ }
+ try {
+  test_2d_imageData_put_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_path");
+ }
+ try {
+  test_2d_imageData_put_unaffected();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_unaffected");
+ }
+ try {
+  test_2d_imageData_put_unchanged();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_unchanged");
+ }
+ try {
+  test_2d_imageData_put_wrongtype();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_wrongtype");
+ }
+ try {
+  test_2d_line_cap_butt();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cap_butt");
+ }
+ try {
+  test_2d_line_cap_invalid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cap_invalid");
+ }
+ try {
+  test_2d_line_cap_open();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cap_open");
+ }
+ try {
+  test_2d_line_cap_round();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cap_round");
+ }
+ try {
+  test_2d_line_cap_square();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cap_square");
+ }
+ try {
+  test_2d_line_cross();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cross");
+ }
+ try {
+  test_2d_line_defaults();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_defaults");
+ }
+ try {
+  test_2d_line_join_bevel();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_bevel");
+ }
+ try {
+  test_2d_line_join_closed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_closed");
+ }
+ try {
+  test_2d_line_join_invalid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_invalid");
+ }
+ try {
+  test_2d_line_join_miter();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_miter");
+ }
+ try {
+  test_2d_line_join_open();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_open");
+ }
+ try {
+  test_2d_line_join_round();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_round");
+ }
+ try {
+  test_2d_line_miter_acute();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_acute");
+ }
+ try {
+  test_2d_line_miter_exceeded();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_exceeded");
+ }
+ try {
+  test_2d_line_miter_invalid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_invalid");
+ }
+ try {
+  test_2d_line_miter_lineedge();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_lineedge");
+ }
+ try {
+  test_2d_line_miter_obtuse();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_obtuse");
+ }
+ try {
+  test_2d_line_miter_rightangle();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_rightangle");
+ }
+ try {
+  test_2d_line_miter_within();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_within");
+ }
+ try {
+  test_2d_line_union();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_union");
+ }
+ try {
+  test_2d_line_width_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_width_basic");
+ }
+ try {
+  test_2d_line_width_invalid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_width_invalid");
+ }
+ try {
+  test_2d_line_width_transformed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_width_transformed");
+ }
+ try {
+  test_2d_missingargs();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_missingargs");
+ }
+ try {
+  test_2d_path_arc_angle_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_1");
+ }
+ try {
+  test_2d_path_arc_angle_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_2");
+ }
+ try {
+  test_2d_path_arc_angle_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_3");
+ }
+ try {
+  test_2d_path_arc_angle_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_4");
+ }
+ try {
+  test_2d_path_arc_angle_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_5");
+ }
+ try {
+  test_2d_path_arc_angle_6();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_6");
+ }
+ try {
+  test_2d_path_arc_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_empty");
+ }
+ try {
+  test_2d_path_arc_end();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_end");
+ }
+ try {
+  test_2d_path_arc_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_negative");
+ }
+ try {
+  test_2d_path_arc_nonempty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_nonempty");
+ }
+ try {
+  test_2d_path_arc_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_nonfinite");
+ }
+ try {
+  test_2d_path_arc_scale_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_scale_1");
+ }
+ try {
+  test_2d_path_arc_scale_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_scale_2");
+ }
+ try {
+  test_2d_path_arc_selfintersect_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_selfintersect_1");
+ }
+ try {
+  test_2d_path_arc_selfintersect_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_selfintersect_2");
+ }
+ try {
+  test_2d_path_arc_shape_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_shape_1");
+ }
+ try {
+  test_2d_path_arc_shape_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_shape_2");
+ }
+ try {
+  test_2d_path_arc_shape_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_shape_4");
+ }
+ try {
+  test_2d_path_arc_shape_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_shape_5");
+ }
+ try {
+  test_2d_path_arc_twopie_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_twopie_1");
+ }
+ try {
+  test_2d_path_arc_twopie_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_twopie_2");
+ }
+ try {
+  test_2d_path_arc_twopie_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_twopie_3");
+ }
+ try {
+  test_2d_path_arc_twopie_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_twopie_4");
+ }
+ try {
+  test_2d_path_arc_zero_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_zero_1");
+ }
+ try {
+  test_2d_path_arc_zero_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_zero_2");
+ }
+ try {
+  test_2d_path_arc_zeroradius();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_zeroradius");
+ }
+ try {
+  test_2d_path_arcTo_coincide_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_coincide_1");
+ }
+ try {
+  test_2d_path_arcTo_coincide_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_coincide_2");
+ }
+ try {
+  test_2d_path_arcTo_collinear_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_collinear_1");
+ }
+ try {
+  test_2d_path_arcTo_collinear_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_collinear_2");
+ }
+ try {
+  test_2d_path_arcTo_collinear_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_collinear_3");
+ }
+ try {
+  test_2d_path_arcTo_emptysubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_emptysubpath");
+ }
+ try {
+  test_2d_path_arcTo_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_negative");
+ }
+ try {
+  test_2d_path_arcTo_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_nonfinite");
+ }
+ try {
+  test_2d_path_arcTo_scale();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_scale");
+ }
+ try {
+  test_2d_path_arcTo_shape_curve1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_shape_curve1");
+ }
+ try {
+  test_2d_path_arcTo_shape_curve2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_shape_curve2");
+ }
+ try {
+  test_2d_path_arcTo_shape_end();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_shape_end");
+ }
+ try {
+  test_2d_path_arcTo_shape_start();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_shape_start");
+ }
+ try {
+  test_2d_path_arcTo_transformation();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_transformation");
+ }
+ try {
+  test_2d_path_arcTo_zero_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_zero_1");
+ }
+ try {
+  test_2d_path_arcTo_zero_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_zero_2");
+ }
+ try {
+  test_2d_path_beginPath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_beginPath");
+ }
+ try {
+  test_2d_path_bezierCurveTo_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_bezierCurveTo_basic");
+ }
+ try {
+  test_2d_path_bezierCurveTo_emptysubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_bezierCurveTo_emptysubpath");
+ }
+ try {
+  test_2d_path_bezierCurveTo_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_bezierCurveTo_nonfinite");
+ }
+ try {
+  test_2d_path_bezierCurveTo_scaled();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_bezierCurveTo_scaled");
+ }
+ try {
+  test_2d_path_bezierCurveTo_shape();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_bezierCurveTo_shape");
+ }
+ try {
+  test_2d_path_clip_basic_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_basic_1");
+ }
+ try {
+  test_2d_path_clip_basic_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_basic_2");
+ }
+ try {
+  test_2d_path_clip_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_empty");
+ }
+ try {
+  test_2d_path_clip_intersect();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_intersect");
+ }
+ try {
+  test_2d_path_clip_unaffected();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_unaffected");
+ }
+ try {
+  test_2d_path_clip_winding_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_winding_1");
+ }
+ try {
+  test_2d_path_clip_winding_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_winding_2");
+ }
+ try {
+  test_2d_path_closePath_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_closePath_empty");
+ }
+ try {
+  test_2d_path_closePath_newline();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_closePath_newline");
+ }
+ try {
+  test_2d_path_closePath_nextpoint();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_closePath_nextpoint");
+ }
+ try {
+  test_2d_path_fill_closed_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_closed_basic");
+ }
+ try {
+  test_2d_path_fill_closed_unaffected();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_closed_unaffected");
+ }
+ try {
+  test_2d_path_fill_overlap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_overlap");
+ }
+ try {
+  test_2d_path_fill_winding_add();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_winding_add");
+ }
+ try {
+  test_2d_path_fill_winding_subtract_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_winding_subtract_1");
+ }
+ try {
+  test_2d_path_fill_winding_subtract_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_winding_subtract_2");
+ }
+ try {
+  test_2d_path_fill_winding_subtract_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_winding_subtract_3");
+ }
+ try {
+  test_2d_path_initial();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_initial");
+ }
+ try {
+  test_2d_path_isPointInPath_arc();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_arc");
+ }
+ try {
+  test_2d_path_isPointInPath_basic_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_basic_1");
+ }
+ try {
+  test_2d_path_isPointInPath_basic_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_basic_2");
+ }
+ try {
+  test_2d_path_isPointInPath_bezier();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_bezier");
+ }
+ try {
+  test_2d_path_isPointInPath_bigarc();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_bigarc");
+ }
+ try {
+  test_2d_path_isPointInPath_edge();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_edge");
+ }
+ try {
+  test_2d_path_isPointInPath_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_empty");
+ }
+ try {
+  test_2d_path_isPointInPath_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_nonfinite");
+ }
+ try {
+  test_2d_path_isPointInPath_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_outside");
+ }
+ try {
+  test_2d_path_isPointInPath_subpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_subpath");
+ }
+ try {
+  test_2d_path_isPointInPath_transform_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_transform_1");
+ }
+ try {
+  test_2d_path_isPointInPath_transform_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_transform_2");
+ }
+ try {
+  test_2d_path_isPointInPath_transform_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_transform_3");
+ }
+ try {
+  test_2d_path_isPointInPath_unclosed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_unclosed");
+ }
+ try {
+  test_2d_path_isPointInPath_winding();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_winding");
+ }
+ try {
+  test_2d_path_lineTo_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_lineTo_basic");
+ }
+ try {
+  test_2d_path_lineTo_emptysubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_lineTo_emptysubpath");
+ }
+ try {
+  test_2d_path_lineTo_nextpoint();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_lineTo_nextpoint");
+ }
+ try {
+  test_2d_path_lineTo_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_lineTo_nonfinite");
+ }
+ try {
+  test_2d_path_moveTo_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_moveTo_basic");
+ }
+ try {
+  test_2d_path_moveTo_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_moveTo_multiple");
+ }
+ try {
+  test_2d_path_moveTo_newsubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_moveTo_newsubpath");
+ }
+ try {
+  test_2d_path_moveTo_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_moveTo_nonfinite");
+ }
+ try {
+  test_2d_path_quadraticCurveTo_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_quadraticCurveTo_basic");
+ }
+ try {
+  test_2d_path_quadraticCurveTo_emptysubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_quadraticCurveTo_emptysubpath");
+ }
+ try {
+  test_2d_path_quadraticCurveTo_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_quadraticCurveTo_nonfinite");
+ }
+ try {
+  test_2d_path_quadraticCurveTo_scaled();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_quadraticCurveTo_scaled");
+ }
+ try {
+  test_2d_path_quadraticCurveTo_shape();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_quadraticCurveTo_shape");
+ }
+ try {
+  test_2d_path_rect_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_basic");
+ }
+ try {
+  test_2d_path_rect_closed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_closed");
+ }
+ try {
+  test_2d_path_rect_end_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_end_1");
+ }
+ try {
+  test_2d_path_rect_end_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_end_2");
+ }
+ try {
+  test_2d_path_rect_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_negative");
+ }
+ try {
+  test_2d_path_rect_newsubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_newsubpath");
+ }
+ try {
+  test_2d_path_rect_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_nonfinite");
+ }
+ try {
+  test_2d_path_rect_winding();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_winding");
+ }
+ try {
+  test_2d_path_rect_zero_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_zero_1");
+ }
+ try {
+  test_2d_path_rect_zero_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_zero_2");
+ }
+ try {
+  test_2d_path_rect_zero_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_zero_3");
+ }
+ try {
+  test_2d_path_rect_zero_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_zero_4");
+ }
+ try {
+  test_2d_path_rect_zero_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_zero_5");
+ }
+ try {
+  test_2d_path_stroke_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_empty");
+ }
+ try {
+  test_2d_path_stroke_overlap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_overlap");
+ }
+ try {
+  test_2d_path_stroke_prune_arc();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_arc");
+ }
+ try {
+  test_2d_path_stroke_prune_closed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_closed");
+ }
+ try {
+  test_2d_path_stroke_prune_corner();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_corner");
+ }
+ try {
+  test_2d_path_stroke_prune_curve();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_curve");
+ }
+ try {
+  test_2d_path_stroke_prune_line();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_line");
+ }
+ try {
+  test_2d_path_stroke_prune_rect();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_rect");
+ }
+ try {
+  test_2d_path_stroke_scale1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_scale1");
+ }
+ try {
+  test_2d_path_stroke_scale2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_scale2");
+ }
+ try {
+  test_2d_path_stroke_skew();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_skew");
+ }
+ try {
+  test_2d_path_stroke_unaffected();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_unaffected");
+ }
+ try {
+  test_2d_path_stroke_union();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_union");
+ }
+ try {
+  test_2d_path_transformation_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_transformation_basic");
+ }
+ try {
+  test_2d_path_transformation_changing();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_transformation_changing");
+ }
+ try {
+  test_2d_path_transformation_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_transformation_multiple");
+ }
+ try {
+  test_2d_pattern_animated_gif();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_animated_gif");
+ }
+ try {
+  test_2d_pattern_basic_canvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_basic_canvas");
+ }
+ try {
+  test_2d_pattern_basic_image();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_basic_image");
+ }
+ try {
+  test_2d_pattern_basic_nocontext();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_basic_nocontext");
+ }
+ try {
+  test_2d_pattern_basic_type();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_basic_type");
+ }
+ try {
+  test_2d_pattern_basic_zerocanvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_basic_zerocanvas");
+ }
+ try {
+  test_2d_pattern_crosscanvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_crosscanvas");
+ }
+ try {
+  test_2d_pattern_image_broken();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_image_broken");
+ }
+ try {
+  test_2d_pattern_image_incomplete();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_image_incomplete");
+ }
+ try {
+  test_2d_pattern_image_null();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_image_null");
+ }
+ try {
+  test_2d_pattern_image_string();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_image_string");
+ }
+ try {
+  test_2d_pattern_image_undefined();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_image_undefined");
+ }
+ try {
+  test_2d_pattern_modify_canvas1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_modify_canvas1");
+ }
+ try {
+  test_2d_pattern_modify_canvas2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_modify_canvas2");
+ }
+ try {
+  test_2d_pattern_modify_image1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_modify_image1");
+ }
+ try {
+  test_2d_pattern_modify_image2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_modify_image2");
+ }
+ try {
+  test_2d_pattern_paint_norepeat_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_norepeat_basic");
+ }
+ try {
+  test_2d_pattern_paint_norepeat_coord1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_norepeat_coord1");
+ }
+ try {
+  test_2d_pattern_paint_norepeat_coord2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_norepeat_coord2");
+ }
+ try {
+  test_2d_pattern_paint_norepeat_coord3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_norepeat_coord3");
+ }
+ try {
+  test_2d_pattern_paint_norepeat_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_norepeat_outside");
+ }
+ try {
+  test_2d_pattern_paint_orientation_canvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_orientation_canvas");
+ }
+ try {
+  test_2d_pattern_paint_orientation_image();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_orientation_image");
+ }
+ try {
+  test_2d_pattern_paint_repeat_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeat_basic");
+ }
+ try {
+  test_2d_pattern_paint_repeat_coord1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeat_coord1");
+ }
+ try {
+  test_2d_pattern_paint_repeat_coord2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeat_coord2");
+ }
+ try {
+  test_2d_pattern_paint_repeat_coord3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeat_coord3");
+ }
+ try {
+  test_2d_pattern_paint_repeat_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeat_outside");
+ }
+ try {
+  test_2d_pattern_paint_repeatx_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeatx_basic");
+ }
+ try {
+  test_2d_pattern_paint_repeatx_coord1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeatx_coord1");
+ }
+ try {
+  test_2d_pattern_paint_repeatx_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeatx_outside");
+ }
+ try {
+  test_2d_pattern_paint_repeaty_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeaty_basic");
+ }
+ try {
+  test_2d_pattern_paint_repeaty_coord1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeaty_coord1");
+ }
+ try {
+  test_2d_pattern_paint_repeaty_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeaty_outside");
+ }
+ try {
+  test_2d_pattern_repeat_case();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_case");
+ }
+ try {
+  test_2d_pattern_repeat_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_empty");
+ }
+ try {
+  test_2d_pattern_repeat_null();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_null");
+ }
+ try {
+  test_2d_pattern_repeat_nullsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_nullsuffix");
+ }
+ try {
+  test_2d_pattern_repeat_undefined();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_undefined");
+ }
+ try {
+  test_2d_pattern_repeat_unrecognised();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_unrecognised");
+ }
+ try {
+  test_2d_scaled();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_scaled");
+ }
+ try {
+  test_2d_shadow_alpha_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_alpha_1");
+ }
+ try {
+  test_2d_shadow_alpha_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_alpha_2");
+ }
+ try {
+  test_2d_shadow_alpha_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_alpha_3");
+ }
+ try {
+  test_2d_shadow_alpha_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_alpha_4");
+ }
+ try {
+  test_2d_shadow_alpha_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_alpha_5");
+ }
+ try {
+  test_2d_shadow_attributes_shadowBlur_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowBlur_1");
+ }
+ try {
+  test_2d_shadow_attributes_shadowBlur_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowBlur_2");
+ }
+ try {
+  test_2d_shadow_attributes_shadowColor_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowColor_1");
+ }
+ try {
+  test_2d_shadow_attributes_shadowColor_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowColor_2");
+ }
+ try {
+  test_2d_shadow_attributes_shadowOffset_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowOffset_1");
+ }
+ try {
+  test_2d_shadow_attributes_shadowOffset_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowOffset_2");
+ }
+ try {
+  test_2d_shadow_basic_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_basic_1");
+ }
+ try {
+  test_2d_shadow_basic_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_basic_2");
+ }
+ try {
+  test_2d_shadow_blur_high();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_blur_high");
+ }
+ try {
+  test_2d_shadow_blur_low();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_blur_low");
+ }
+ try {
+  test_2d_shadow_canvas_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_canvas_alpha");
+ }
+ try {
+  test_2d_shadow_canvas_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_canvas_basic");
+ }
+ try {
+  test_2d_shadow_canvas_transparent_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_canvas_transparent_1");
+ }
+ try {
+  test_2d_shadow_canvas_transparent_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_canvas_transparent_2");
+ }
+ try {
+  test_2d_shadow_clip_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_clip_1");
+ }
+ try {
+  test_2d_shadow_clip_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_clip_2");
+ }
+ try {
+  test_2d_shadow_clip_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_clip_3");
+ }
+ try {
+  test_2d_shadow_composite_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_composite_1");
+ }
+ try {
+  test_2d_shadow_composite_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_composite_2");
+ }
+ try {
+  test_2d_shadow_composite_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_composite_3");
+ }
+ try {
+  test_2d_shadow_composite_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_composite_4");
+ }
+ try {
+  test_2d_shadow_gradient_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_gradient_alpha");
+ }
+ try {
+  test_2d_shadow_gradient_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_gradient_basic");
+ }
+ try {
+  test_2d_shadow_gradient_transparent_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_gradient_transparent_1");
+ }
+ try {
+  test_2d_shadow_gradient_transparent_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_gradient_transparent_2");
+ }
+ try {
+  test_2d_shadow_image_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_alpha");
+ }
+ try {
+  test_2d_shadow_image_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_basic");
+ }
+ try {
+  test_2d_shadow_image_scale();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_scale");
+ }
+ try {
+  test_2d_shadow_image_section();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_section");
+ }
+ try {
+  test_2d_shadow_image_transparent_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_transparent_1");
+ }
+ try {
+  test_2d_shadow_image_transparent_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_transparent_2");
+ }
+ try {
+  test_2d_shadow_offset_negativeX();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_offset_negativeX");
+ }
+ try {
+  test_2d_shadow_offset_negativeY();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_offset_negativeY");
+ }
+ try {
+  test_2d_shadow_offset_positiveX();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_offset_positiveX");
+ }
+ try {
+  test_2d_shadow_offset_positiveY();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_offset_positiveY");
+ }
+ try {
+  test_2d_shadow_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_outside");
+ }
+ try {
+  test_2d_shadow_pattern_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_pattern_alpha");
+ }
+ try {
+  test_2d_shadow_pattern_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_pattern_basic");
+ }
+ try {
+  test_2d_shadow_pattern_transparent_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_pattern_transparent_1");
+ }
+ try {
+  test_2d_shadow_pattern_transparent_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_pattern_transparent_2");
+ }
+ try {
+  test_2d_shadow_stroke_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_basic");
+ }
+ try {
+  test_2d_shadow_stroke_cap_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_cap_1");
+ }
+ try {
+  test_2d_shadow_stroke_cap_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_cap_2");
+ }
+ try {
+  test_2d_shadow_stroke_join_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_join_1");
+ }
+ try {
+  test_2d_shadow_stroke_join_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_join_2");
+ }
+ try {
+  test_2d_shadow_stroke_join_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_join_3");
+ }
+ try {
+  test_2d_shadow_transform_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_transform_1");
+ }
+ try {
+  test_2d_shadow_transform_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_transform_2");
+ }
+ try {
+  test_2d_state_saverestore_bitmap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_bitmap");
+ }
+ try {
+  test_2d_state_saverestore_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_clip");
+ }
+ try {
+  test_2d_state_saverestore_fillStyle();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_fillStyle");
+ }
+ try {
+  test_2d_state_saverestore_globalAlpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_globalAlpha");
+ }
+ try {
+  test_2d_state_saverestore_globalCompositeOperation();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_globalCompositeOperation");
+ }
+ try {
+  test_2d_state_saverestore_lineCap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_lineCap");
+ }
+ try {
+  test_2d_state_saverestore_lineJoin();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_lineJoin");
+ }
+ try {
+  test_2d_state_saverestore_lineWidth();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_lineWidth");
+ }
+ try {
+  test_2d_state_saverestore_miterLimit();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_miterLimit");
+ }
+ try {
+  test_2d_state_saverestore_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_path");
+ }
+ try {
+  test_2d_state_saverestore_shadowBlur();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_shadowBlur");
+ }
+ try {
+  test_2d_state_saverestore_shadowColor();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_shadowColor");
+ }
+ try {
+  test_2d_state_saverestore_shadowOffsetX();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_shadowOffsetX");
+ }
+ try {
+  test_2d_state_saverestore_shadowOffsetY();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_shadowOffsetY");
+ }
+ try {
+  test_2d_state_saverestore_stack();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_stack");
+ }
+ try {
+  test_2d_state_saverestore_stackdepth();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_stackdepth");
+ }
+ try {
+  test_2d_state_saverestore_strokeStyle();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_strokeStyle");
+ }
+ try {
+  test_2d_state_saverestore_transformation();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_transformation");
+ }
+ try {
+  test_2d_state_saverestore_underflow();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_underflow");
+ }
+ try {
+  test_2d_strokeRect_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_basic");
+ }
+ try {
+  test_2d_strokeRect_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_clip");
+ }
+ try {
+  test_2d_strokeRect_globalalpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_globalalpha");
+ }
+ try {
+  test_2d_strokeRect_globalcomposite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_globalcomposite");
+ }
+ try {
+  test_2d_strokeRect_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_negative");
+ }
+ try {
+  test_2d_strokeRect_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_nonfinite");
+ }
+ try {
+  test_2d_strokeRect_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_path");
+ }
+ try {
+  test_2d_strokeRect_shadow();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_shadow");
+ }
+ try {
+  test_2d_strokeRect_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_transform");
+ }
+ try {
+  test_2d_strokeRect_zero_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_zero_1");
+ }
+ try {
+  test_2d_strokeRect_zero_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_zero_2");
+ }
+ try {
+  test_2d_strokeRect_zero_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_zero_3");
+ }
+ try {
+  test_2d_strokeRect_zero_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_zero_4");
+ }
+ try {
+  test_2d_strokeStyle_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeStyle_default");
+ }
+ try {
+  test_2d_transformation_order();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_order");
+ }
+ try {
+  test_2d_transformation_rotate_direction();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_direction");
+ }
+ try {
+  test_2d_transformation_rotate_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_nonfinite");
+ }
+ try {
+  test_2d_transformation_rotate_radians();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_radians");
+ }
+ try {
+  test_2d_transformation_rotate_wrap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_wrap");
+ }
+ try {
+  test_2d_transformation_rotate_wrapnegative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_wrapnegative");
+ }
+ try {
+  test_2d_transformation_rotate_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_zero");
+ }
+ try {
+  test_2d_transformation_scale_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_basic");
+ }
+ try {
+  test_2d_transformation_scale_large();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_large");
+ }
+ try {
+  test_2d_transformation_scale_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_multiple");
+ }
+ try {
+  test_2d_transformation_scale_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_negative");
+ }
+ try {
+  test_2d_transformation_scale_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_nonfinite");
+ }
+ try {
+  test_2d_transformation_scale_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_zero");
+ }
+ try {
+  test_2d_transformation_setTransform_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_setTransform_multiple");
+ }
+ try {
+  test_2d_transformation_setTransform_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_setTransform_nonfinite");
+ }
+ try {
+  test_2d_transformation_setTransform_skewed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_setTransform_skewed");
+ }
+ try {
+  test_2d_transformation_transform_identity();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_transform_identity");
+ }
+ try {
+  test_2d_transformation_transform_multiply();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_transform_multiply");
+ }
+ try {
+  test_2d_transformation_transform_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_transform_nonfinite");
+ }
+ try {
+  test_2d_transformation_transform_skewed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_transform_skewed");
+ }
+ try {
+  test_2d_transformation_translate_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_translate_basic");
+ }
+ try {
+  test_2d_transformation_translate_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_translate_nonfinite");
+ }
+ try {
+  test_2d_type_delete();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_type_delete");
+ }
+ try {
+  test_2d_type_exists();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_type_exists");
+ }
+ try {
+  test_2d_type_extend();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_type_extend");
+ }
+ try {
+  test_2d_type_prototype();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_type_prototype");
+ }
+ try {
+  test_2d_type_replace();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_type_replace");
+ }
+ try {
+  test_2d_voidreturn();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_voidreturn");
+ }
+ try {
+  test_bug397524();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_bug397524");
+ }
+ try {
+  test_bug405982();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_bug405982");
+ }
+ try {
+  test_context_arguments_extra();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_arguments_extra");
+ }
+ try {
+  test_context_arguments_missing();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_arguments_missing");
+ }
+ try {
+  test_context_casesensitive();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_casesensitive");
+ }
+ try {
+  test_context_emptystring();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_emptystring");
+ }
+ try {
+  test_context_unrecognised_badname();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_unrecognised_badname");
+ }
+ try {
+  test_context_unrecognised_badsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_unrecognised_badsuffix");
+ }
+ try {
+  test_context_unrecognised_nullsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_unrecognised_nullsuffix");
+ }
+ try {
+  test_context_unrecognised_unicode();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_unrecognised_unicode");
+ }
+ try {
+  test_fallback_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_fallback_basic");
+ }
+ try {
+  test_fallback_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_fallback_multiple");
+ }
+ try {
+  test_fallback_nested();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_fallback_nested");
+ }
+ try {
+  test_initial_colour();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_colour");
+ }
+ try {
+  test_initial_reset_2dstate();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_2dstate");
+ }
+ try {
+  test_initial_reset_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_clip");
+ }
+ try {
+  test_initial_reset_different();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_different");
+ }
+ try {
+  test_initial_reset_gradient();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_gradient");
+ }
+ try {
+  test_initial_reset_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_path");
+ }
+ try {
+  test_initial_reset_pattern();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_pattern");
+ }
+ try {
+  test_initial_reset_same();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_same");
+ }
+ try {
+  test_initial_reset_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_transform");
+ }
+ try {
+  test_size_attributes_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_default");
+ }
+ try {
+  test_size_attributes();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes");
+ }
+ try {
+  test_size_attributes_parse_badsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_badsuffix");
+ }
+ try {
+  test_size_attributes_parse_floatsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_floatsuffix");
+ }
+ try {
+  test_size_attributes_parse_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_negative");
+ }
+ try {
+  test_size_attributes_parse_nonnumber();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_nonnumber");
+ }
+ try {
+  test_size_attributes_parse_percentsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_percentsuffix");
+ }
+ try {
+  test_size_attributes_parse_whitespace();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_whitespace");
+ }
+ try {
+  test_size_attributes_parse_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_zero");
+ }
+ try {
+  test_size_attributes_parse_zerosuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_zerosuffix");
+ }
+ try {
+  test_size_attributes_reflect_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_reflect_1");
+ }
+ try {
+  test_size_attributes_reflect_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_reflect_2");
+ }
+ try {
+  test_size_attributes_removed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_removed");
+ }
+ try {
+  test_size_attributes_setAttribute_badsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_badsuffix");
+ }
+ try {
+  test_size_attributes_setAttribute_floatsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_floatsuffix");
+ }
+ try {
+  test_size_attributes_setAttribute_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_negative");
+ }
+ try {
+  test_size_attributes_setAttribute_nonnumber();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_nonnumber");
+ }
+ try {
+  test_size_attributes_setAttribute_percentsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_percentsuffix");
+ }
+ try {
+  test_size_attributes_setAttribute_whitespace();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_whitespace");
+ }
+ try {
+  test_size_attributes_setAttribute_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_zero");
+ }
+ try {
+  test_size_attributes_setAttribute_zerosuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_zerosuffix");
+ }
+ try {
+  test_size_attributes_style();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_style");
+ }
+ try {
+  test_size_attributes_type_get();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_type_get");
+ }
+ try {
+  test_size_attributes_type_set();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_type_set");
+ }
+ try {
+  test_text_font();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_text_font");
+ }
+ try {
+  test_text_measure();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_text_measure");
+ }
+ try {
+  test_text_space_replace();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_text_space_replace");
+ }
+ try {
+  test_text_textAlign();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_text_textAlign");
+ }
+ try {
+  test_text_textBaseline();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_text_textBaseline");
+ }
+ try {
+  test_toDataURL_arguments_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_arguments_1");
+ }
+ try {
+  test_toDataURL_arguments_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_arguments_2");
+ }
+ try {
+  test_toDataURL_arguments_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_arguments_3");
+ }
+ try {
+  test_toDataURL_complexcolours();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_complexcolours");
+ }
+ try {
+  test_toDataURL_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_default");
+ }
+ try {
+  test_toDataURL_lowercase();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_lowercase");
+ }
+ try {
+  test_toDataURL_nocontext();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_nocontext");
+ }
+ try {
+  test_toDataURL_png();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_png");
+ }
+ try {
+  test_toDataURL_primarycolours();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_primarycolours");
+ }
+ try {
+  test_toDataURL_unrecognised();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_unrecognised");
+ }
+ try {
+  test_toDataURL_zerosize();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_zerosize");
+ }
+ try {
+  test_type_delete();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_delete");
+ }
+ try {
+  test_type_exists();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_exists");
+ }
+ try {
+  test_type_extend();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_extend");
+ }
+ try {
+  test_type_name();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_name");
+ }
+ try {
+  test_type_prototype();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_prototype");
+ }
+ try {
+  test_2d_imagedata_coercion();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imagedata_coercion");
+ }
+ try {
+  test_2d_imageSmoothing();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageSmoothing");
+ }
+ try {
+  // run this test last since it replaces the getContext method
+  test_type_replace();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_replace");
+ }
+ 
+ //run the asynchronous tests
+ try {
+  test_2d_drawImage_animated_apng();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_animated_apng");
+ }
+ try {
+  test_2d_drawImage_animated_gif();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_animated_gif");
+ }
+ 
+ setTimeout(asyncTestsDone, 500);
+}
+
+MochiKit.DOM.addLoadEvent(runTests);
+
+</script>

From 78f5bb77bee6e446baa130feef7e38d9fbf3b726 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 15:16:44 +1200
Subject: [PATCH 002/175] Bug 486200. Add window.mozInnerScreenX/Y APIs to
 return usable screen coordinate APIs (as opposed to window.screenX/Y which
 return window frame coordinates and are unusable). Also adds
 window.mozScreenPixelsPerCSSPixel which chrome-prileged code can use to
 convert CSS pixels to actual screen pixels. r=dbaron,sr=jst

--HG--
extra : rebase_source : 30f4c953f3e3866da042b935953ba239ac0a93c4
---
 dom/base/nsGlobalWindow.cpp                   | 66 +++++++++++++++
 dom/base/nsGlobalWindow.h                     |  2 +
 dom/interfaces/base/nsIDOMWindowInternal.idl  |  5 +-
 dom/tests/mochitest/general/Makefile.in       |  4 +-
 .../mochitest/general/test_innerScreen.xul    | 83 +++++++++++++++++++
 5 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 dom/tests/mochitest/general/test_innerScreen.xul

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index ac280f57dc6..4123377d56c 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -3347,6 +3347,72 @@ nsGlobalWindow::GetScreenX(PRInt32* aScreenX)
   return NS_OK;
 }
 
+nsRect
+nsGlobalWindow::GetInnerScreenRect()
+{
+  if (!mDocShell)
+    return nsRect();
+
+  nsGlobalWindow* rootWindow =
+    static_cast<nsGlobalWindow*>(GetPrivateRoot());
+  if (rootWindow) {
+    rootWindow->FlushPendingNotifications(Flush_Layout);
+  }
+
+  nsCOMPtr<nsIPresShell> presShell;
+  mDocShell->GetPresShell(getter_AddRefs(presShell));
+  if (!presShell)
+    return nsRect();
+  nsIFrame* rootFrame = presShell->GetRootFrame();
+  if (!rootFrame)
+    return nsRect();
+
+  return rootFrame->GetScreenRectInAppUnits();
+}
+
+NS_IMETHODIMP
+nsGlobalWindow::GetMozInnerScreenX(float* aScreenX)
+{
+  FORWARD_TO_OUTER(GetMozInnerScreenX, (aScreenX), NS_ERROR_NOT_INITIALIZED);
+
+  nsRect r = GetInnerScreenRect();
+  *aScreenX = nsPresContext::AppUnitsToFloatCSSPixels(r.x);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGlobalWindow::GetMozInnerScreenY(float* aScreenY)
+{
+  FORWARD_TO_OUTER(GetMozInnerScreenY, (aScreenY), NS_ERROR_NOT_INITIALIZED);
+
+  nsRect r = GetInnerScreenRect();
+  *aScreenY = nsPresContext::AppUnitsToFloatCSSPixels(r.y);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGlobalWindow::GetMozScreenPixelsPerCSSPixel(float* aScreenPixels)
+{
+  FORWARD_TO_OUTER(GetMozScreenPixelsPerCSSPixel,
+      (aScreenPixels), NS_ERROR_NOT_INITIALIZED);
+
+  *aScreenPixels = 1;
+
+  if (!nsContentUtils::IsCallerTrustedForRead())
+    return NS_ERROR_DOM_SECURITY_ERR;
+  if (!mDocShell)
+    return NS_OK;
+  nsCOMPtr<nsPresContext> presContext;
+  mDocShell->GetPresContext(getter_AddRefs(presContext));
+  if (!presContext)
+    return NS_OK;
+
+  *aScreenPixels = float(nsPresContext::AppUnitsPerCSSPixel())/
+      presContext->AppUnitsPerDevPixel();
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsGlobalWindow::SetScreenX(PRInt32 aScreenX)
 {
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index e568c7279fc..7cd9814780a 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -90,6 +90,7 @@
 #include "nsIXPCScriptable.h"
 #include "nsPoint.h"
 #include "nsSize.h"
+#include "nsRect.h"
 #include "mozFlushType.h"
 #include "prclist.h"
 #include "nsIDOMStorageObsolete.h"
@@ -594,6 +595,7 @@ protected:
   
   nsresult GetOuterSize(nsIntSize* aSizeCSSPixels);
   nsresult SetOuterSize(PRInt32 aLengthCSSPixels, PRBool aIsWidth);
+  nsRect GetInnerScreenRect();
 
   PRBool IsFrame()
   {
diff --git a/dom/interfaces/base/nsIDOMWindowInternal.idl b/dom/interfaces/base/nsIDOMWindowInternal.idl
index ceeedf678e5..9cff9a929a3 100644
--- a/dom/interfaces/base/nsIDOMWindowInternal.idl
+++ b/dom/interfaces/base/nsIDOMWindowInternal.idl
@@ -44,7 +44,7 @@ interface nsIControllers;
 interface nsIDOMLocation;
 interface nsIVariant;
 
-[scriptable, uuid(3414EBC7-731F-4697-9F43-ACA6F5050875)]
+[scriptable, uuid(62579239-b619-4bf2-8d39-0b73e8663a85)]
 interface nsIDOMWindowInternal : nsIDOMWindow2
 {
   readonly attribute nsIDOMWindowInternal        window;
@@ -104,6 +104,9 @@ interface nsIDOMWindowInternal : nsIDOMWindow2
            attribute long                        outerHeight;
            attribute long                        screenX;
            attribute long                        screenY;
+  readonly attribute float                       mozInnerScreenX;
+  readonly attribute float                       mozInnerScreenY;
+  readonly attribute float                       mozScreenPixelsPerCSSPixel;
 
   /* The offset in pixels by which the window is scrolled */
   readonly attribute long                        pageXOffset;
diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in
index 36b8d81c289..120abbd0df6 100644
--- a/dom/tests/mochitest/general/Makefile.in
+++ b/dom/tests/mochitest/general/Makefile.in
@@ -44,7 +44,9 @@ relativesrcdir  = dom/tests/mochitest/general
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-_TEST_FILES = test_offsets.html \
+_TEST_FILES = \
+		test_innerScreen.xul \
+		test_offsets.html \
 		test_offsets.xul \
 		test_offsets.js \
 		test_domWindowUtils.html \
diff --git a/dom/tests/mochitest/general/test_innerScreen.xul b/dom/tests/mochitest/general/test_innerScreen.xul
new file mode 100644
index 00000000000..46fdabffd82
--- /dev/null
+++ b/dom/tests/mochitest/general/test_innerScreen.xul
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<!--
+  Tests for mozInnerScreenX/Y properties
+  -->
+<window title="Test mozInnerScreenX/Y Properties"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="text/javascript" src="/MochiKit/packed.js"/>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
+
+  <!-- test resuls are displayed in the html:body -->
+  <body xmlns="http://www.w3.org/1999/xhtml"
+        style="height: 400px; position:relative; overflow: auto;">
+    <iframe id="f"
+            style="position:absolute; left:100px;
+                   top:200px; width:200px; height:200px; border:none;"></iframe>
+  </body>
+
+  <!-- test code goes here -->
+  <script type="application/javascript"><![CDATA[
+
+function isRounded(a, b, msg) {
+  ok(Math.round(a) == Math.round(b),
+     msg + " (rounded), got " + a + ", expected " + b);
+}
+
+function doTests()
+{
+  var readable = false;
+  try
+  {
+    mozScreenPixelsPerCSSPixel;
+    readable = true;
+  }
+  catch(ex) { }
+  ok(!readable, "window pixels per css pixel shouldn't be readable to content");
+
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+
+  var devPxPerCSSPx = window.mozScreenPixelsPerCSSPixel;
+  var windowBO = document.documentElement.boxObject;
+ // isRounded(window.mozInnerScreenX*devPxPerCSSPx, windowBO.screenX,
+ //           "window screen X");
+  isRounded(window.mozInnerScreenY*devPxPerCSSPx, windowBO.screenY,
+            "window screen Y");
+
+  var f = document.getElementById("f");
+  var fBounds = f.getBoundingClientRect();
+
+  const CI = Components.interfaces;
+  var fshell = f.contentWindow.QueryInterface(CI.nsIInterfaceRequestor).getInterface(CI.nsIWebNavigation).QueryInterface(CI.nsIDocShell);
+  var fmudv = fshell.contentViewer.QueryInterface(CI.nsIMarkupDocumentViewer);
+
+  isRounded(f.contentWindow.mozInnerScreenX,
+            window.mozInnerScreenX + fBounds.left,
+            "frame screen X");
+  isRounded(f.contentWindow.mozInnerScreenY,
+            window.mozInnerScreenY + fBounds.top,
+            "frame screen Y");
+
+  fmudv.fullZoom *= 2;
+  is(f.contentWindow.mozScreenPixelsPerCSSPixel, 2*devPxPerCSSPx,
+     "frame screen pixels per CSS pixel");
+
+  isRounded(f.contentWindow.mozInnerScreenX*2,
+            window.mozInnerScreenX + fBounds.left,
+            "zoomed frame screen X");
+  isRounded(f.contentWindow.mozInnerScreenY*2,
+            window.mozInnerScreenY + fBounds.top,
+            "zoomed frame screen Y");
+  fmudv.fullZoom = 1.0;
+
+  SimpleTest.finish();
+}
+
+addLoadEvent(doTests);
+SimpleTest.waitForExplicitFinish();
+
+]]>
+</script>
+
+</window>

From 5fc2887b3c2f95fa46473a55a7d7c06f38cb42e5 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Thu, 30 Jul 2009 15:26:59 +1200
Subject: [PATCH 003/175] Bug 505988. Don't unwrap when we shouldn't. r=bz

--HG--
extra : rebase_source : d251c442ba2fae0f9ffcae99c2c84d780c99ea52
---
 js/src/xpconnect/src/xpcprivate.h             |  9 +--
 js/src/xpconnect/src/xpcvariant.cpp           | 69 +++++++++----------
 js/src/xpconnect/tests/mochitest/Makefile.in  |  1 +
 .../tests/mochitest/test_bug384632.html       | 32 +++++++++
 4 files changed, 70 insertions(+), 41 deletions(-)
 create mode 100644 js/src/xpconnect/tests/mochitest/test_bug384632.html

diff --git a/js/src/xpconnect/src/xpcprivate.h b/js/src/xpconnect/src/xpcprivate.h
index 2ce45487d1b..59db7a8afcc 100644
--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/src/xpconnect/src/xpcprivate.h
@@ -4007,7 +4007,7 @@ public:
 
     jsval GetJSVal() const {return mJSVal;}
 
-    XPCVariant(jsval aJSVal);
+    XPCVariant(XPCCallContext& ccx, jsval aJSVal);
 
     /**
      * Convert a variant into a jsval.
@@ -4032,6 +4032,7 @@ protected:
 protected:
     nsDiscriminatedUnion mData;
     jsval                mJSVal;
+    JSBool               mReturnRawObject;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(XPCVariant, XPCVARIANT_IID)
@@ -4040,10 +4041,10 @@ class XPCTraceableVariant: public XPCVariant,
                            public XPCRootSetElem
 {
 public:
-    XPCTraceableVariant(XPCJSRuntime *runtime, jsval aJSVal)
-        : XPCVariant(aJSVal)
+    XPCTraceableVariant(XPCCallContext& ccx, jsval aJSVal)
+        : XPCVariant(ccx, aJSVal)
     {
-        runtime->AddVariantRoot(this);
+        ccx.GetRuntime()->AddVariantRoot(this);
     }
 
     virtual ~XPCTraceableVariant();
diff --git a/js/src/xpconnect/src/xpcvariant.cpp b/js/src/xpconnect/src/xpcvariant.cpp
index 9ce012e82e1..6a5f0f6955c 100644
--- a/js/src/xpconnect/src/xpcvariant.cpp
+++ b/js/src/xpconnect/src/xpcvariant.cpp
@@ -55,10 +55,26 @@ NS_IMPL_CI_INTERFACE_GETTER2(XPCVariant, XPCVariant, nsIVariant)
 NS_IMPL_CYCLE_COLLECTING_ADDREF(XPCVariant)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(XPCVariant)
 
-XPCVariant::XPCVariant(jsval aJSVal)
+XPCVariant::XPCVariant(XPCCallContext& ccx, jsval aJSVal)
     : mJSVal(aJSVal)
 {
     nsVariant::Initialize(&mData);
+    if(!JSVAL_IS_PRIMITIVE(mJSVal))
+    {
+        // If the incoming object is an XPCWrappedNative, then it could be a
+        // double-wrapped object, and we should return the double-wrapped
+        // object back out to script.
+
+        JSObject* proto;
+        XPCWrappedNative* wn =
+            XPCWrappedNative::GetWrappedNativeOfJSObject(ccx,
+                                                         JSVAL_TO_OBJECT(mJSVal),
+                                                         nsnull,
+                                                         &proto);
+        mReturnRawObject = !wn && !proto;
+    }
+    else
+        mReturnRawObject = JS_FALSE;
 }
 
 XPCTraceableVariant::~XPCTraceableVariant()
@@ -119,9 +135,9 @@ XPCVariant* XPCVariant::newVariant(XPCCallContext& ccx, jsval aJSVal)
     XPCVariant* variant;
 
     if(!JSVAL_IS_TRACEABLE(aJSVal))
-        variant = new XPCVariant(aJSVal);
+        variant = new XPCVariant(ccx, aJSVal);
     else
-        variant = new XPCTraceableVariant(ccx.GetRuntime(), aJSVal);
+        variant = new XPCTraceableVariant(ccx, aJSVal);
 
     if(!variant)
         return nsnull;
@@ -401,6 +417,15 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
             return JS_TRUE;
         }
 
+        if(xpcvariant->mReturnRawObject)
+        {
+            NS_ASSERTION(type == nsIDataType::VTYPE_INTERFACE ||
+                         type == nsIDataType::VTYPE_INTERFACE_IS,
+                         "Weird variant");
+            *pJSVal = realVal;
+            return JS_TRUE;
+        }
+
         // else, it's an object and we really need to double wrap it if we've 
         // already decided that its 'natural' type is as some sort of interface.
         
@@ -641,40 +666,10 @@ VARIANT_DONE:
     }
     else
     {
-        // Last ditch check to prevent us from double-wrapping a regular JS
-        // object. This allows us to unwrap regular JS objects (since we
-        // normally can't double wrap them). See bug 384632.
-        *pJSVal = JSVAL_VOID;
-        if(type == nsIDataType::VTYPE_INTERFACE ||
-           type == nsIDataType::VTYPE_INTERFACE_IS)
-        {
-            nsISupports *src = reinterpret_cast<nsISupports *>(xpctvar.val.p);
-            if(nsXPCWrappedJSClass::IsWrappedJS(src))
-            {
-                // First QI the wrapper to the right interface.
-                nsCOMPtr<nsISupports> wrapper;
-                nsresult rv = src->QueryInterface(iid, getter_AddRefs(wrapper));
-                NS_ENSURE_SUCCESS(rv, JS_FALSE);
-
-                // Now, get the actual JS object out of the wrapper.
-                nsCOMPtr<nsIXPConnectJSObjectHolder> holder =
-                    do_QueryInterface(wrapper);
-                NS_ENSURE_TRUE(holder, JS_FALSE);
-
-                JSObject *obj;
-                holder->GetJSObject(&obj);
-                NS_ASSERTION(obj, "No JS object but the QIs above succeeded?");
-                *pJSVal = OBJECT_TO_JSVAL(obj);
-                success = JS_TRUE;
-            }
-        }
-        if(!JSVAL_IS_OBJECT(*pJSVal))
-        {
-            success = XPCConvert::NativeData2JS(ccx, pJSVal,
-                                                (const void*)&xpctvar.val,
-                                                xpctvar.type,
-                                                &iid, scope, pErr);
-        }
+        success = XPCConvert::NativeData2JS(ccx, pJSVal,
+                                            (const void*)&xpctvar.val,
+                                            xpctvar.type,
+                                            &iid, scope, pErr);
     }
 
     if(xpctvar.IsValAllocated())
diff --git a/js/src/xpconnect/tests/mochitest/Makefile.in b/js/src/xpconnect/tests/mochitest/Makefile.in
index 3ff1465c03e..90ed8ade38b 100644
--- a/js/src/xpconnect/tests/mochitest/Makefile.in
+++ b/js/src/xpconnect/tests/mochitest/Makefile.in
@@ -47,6 +47,7 @@ include $(topsrcdir)/config/rules.mk
 _TEST_FILES =	bug500931_helper.html \
 		inner.html \
 		test_bug361111.xul \
+		test_bug384632.html \
 		test_bug390488.html \
 		test_bug393269.html \
 		test_bug396851.html \
diff --git a/js/src/xpconnect/tests/mochitest/test_bug384632.html b/js/src/xpconnect/tests/mochitest/test_bug384632.html
new file mode 100644
index 00000000000..7cdc397adb4
--- /dev/null
+++ b/js/src/xpconnect/tests/mochitest/test_bug384632.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=384632
+-->
+<head>
+  <title>Test for Bug 384632</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/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=384632">Mozilla Bug 384632</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 384632 **/
+var div = $('content');
+var obj = {};
+div.setUserData("foopy", obj, function() {});
+ok(div.getUserData("foopy") === obj, "getUserData works with regular objects");
+div.setUserData("foopy1", sidebar, function() {});
+ok(div.getUserData("foopy1") === sidebar, "getUserData works with bizarre objects");
+
+</script>
+</pre>
+</body>
+</html>

From 3c037ab317368860deac2da213332a85f6af24cd Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Thu, 30 Jul 2009 15:27:24 +1200
Subject: [PATCH 004/175] Bug 506552. Fix testcase doctype. r=dbaron

--HG--
extra : rebase_source : ee371dbb3106880b1609e0d69d1824a3edb7a91e
---
 layout/reftests/css-mediaqueries/mq_print_orientation.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/css-mediaqueries/mq_print_orientation.xhtml b/layout/reftests/css-mediaqueries/mq_print_orientation.xhtml
index 418f0787f18..151686e72f3 100644
--- a/layout/reftests/css-mediaqueries/mq_print_orientation.xhtml
+++ b/layout/reftests/css-mediaqueries/mq_print_orientation.xhtml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD landscapeHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" class="reftest-print">
 <head>
   <title>Media Query - Print mode test - orientation</title>

From a703badcb627f45c0bbf82177e433f6d52ae391a Mon Sep 17 00:00:00 2001
From: Mook <mook.moz+mozbz@gmail.com>
Date: Thu, 30 Jul 2009 15:41:03 +1200
Subject: [PATCH 005/175] Bug 502188. Implement xptcall for mingw-Windows64.
 r=timeless

--HG--
extra : rebase_source : 2c03e2ae8d491059b9c3759e7e5082a20c1b715a
---
 .../reflect/xptcall/src/md/win32/Makefile.in  |   5 +
 .../src/md/win32/xptcinvoke_asm_x86_64_gnu.s  | 158 +++++++++
 .../src/md/win32/xptcstubs_x86_64_gnu.cpp     | 331 ++++++++++++++++++
 3 files changed, 494 insertions(+)
 create mode 100644 xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64_gnu.s
 create mode 100644 xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64_gnu.cpp

diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
index b08d2e5f7e6..4ab8dbae3e8 100644
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -82,8 +82,13 @@ ASFLAGS		+= /I../../..public
 endif
 
 ifeq ($(TARGET_CPU),x86_64)
+ifndef GNU_CXX
 CPPSRCS 	:= xptcinvoke_x86_64.cpp xptcstubs_x86_64.cpp
 ASFILES		:= xptcinvoke_asm_x86_64.asm xptcstubs_asm_x86_64.asm
+else #!GNU_CXX
+CPPSRCS		:= xptcinvoke_x86_64.cpp  xptcstubs_x86_64_gnu.cpp
+ASFILES		:= xptcinvoke_asm_x86_64_gnu.s
+endif #!GNU_CXX
 endif
 
 ifeq ($(OS_ARCH),WINCE)
diff --git a/xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64_gnu.s b/xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64_gnu.s
new file mode 100644
index 00000000000..dfd9ecc2001
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64_gnu.s
@@ -0,0 +1,158 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is 
+# Makoto Kato <m_kato@ga2.so-net.ne.jp>.
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+.extern _invoke_copy_to_stack
+
+
+.text
+.intel_syntax
+
+#
+#_XPTC__InvokebyIndex(nsISupports* that, PRUint32 methodIndex,
+#                    PRUint32 paramCount, nsXPTCVariant* params)
+#
+
+.globl _XPTC__InvokebyIndex
+.def _XPTC__InvokebyIndex
+   .scl 3
+   .type 46
+.endef
+_XPTC__InvokebyIndex:
+
+   #
+   # store register parameters
+   #
+
+    mov     qword ptr [rsp+32], r9        # params
+    mov     dword ptr [rsp+24], r8d       # paramCount
+    mov     dword ptr [rsp+16], edx       # methodIndex
+    mov     qword ptr [rsp+8], rcx        # that
+
+    #
+    # store RBX/RBP register for backup
+    #
+
+    mov     qword ptr [rsp-16], rbp
+
+    mov     rbp, rsp            # store current RSP to RBP
+    # .SETFRAME rbp, 0
+    # .ENDPROLOG
+
+    sub     rsp, 32
+
+    #
+    # maybe we don't have any parameters to copy
+    #
+
+    test    r8d, r8d
+    jz      noparams
+
+    #
+    # make space for 1st parameter
+
+    mov     eax, r8d
+    and     eax, 1              # AMD64 must be alignment to 16 bytes
+    add     eax, r8d
+    shl     rax, 3              # *= 8
+    sub     rsp, rax
+    mov     rcx, rsp
+
+    #
+    # 2nd parameter is parameter count
+    #
+
+    mov     edx, r8d
+
+    #
+    # 3rd parameter is params
+    #
+
+    mov     r8, r9
+
+    sub     rsp, 32
+
+    call    _invoke_copy_to_stack # rcx = d
+                                  # edx = paramCount
+                                  # r8  = s
+
+    add     rsp, 32
+
+    #
+    # Build parameters
+    #
+
+    mov     rdx, qword ptr [rsp] # 1st parameter
+    movsd   xmm1, qword ptr [rsp] # for double
+
+    mov     r8, qword ptr [rsp+8] # 2nd parameter
+    movsd   xmm2, qword ptr [rsp+8] # for double
+
+    mov     r9, qword ptr [rsp+16] # 3rd parameter
+    movsd   xmm3, qword ptr [rsp+16] # for double
+
+    #
+    # 1st parameter (this)
+    #
+
+    mov     rcx, qword ptr [rbp+8] # that
+
+noparams:
+
+    #
+    # calculate call address
+    #
+
+    mov     r11, qword ptr [rcx]
+    mov     eax, dword ptr [rbp+16] # methodIndex
+
+    #
+    # Now current stack has parameter list
+    # But, since callee function backups parameters, make space into stack.
+
+    sub     rsp, 8
+
+    call    qword ptr [r11+rax*8]      # stdcall, i.e. callee cleans up stack.
+
+    #
+    # restore registers
+    #
+
+    mov     rsp, rbp
+    mov     rbp, qword ptr [rsp-16]
+
+    ret
+
+
diff --git a/xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64_gnu.cpp b/xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64_gnu.cpp
new file mode 100644
index 00000000000..c55cba3ffde
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64_gnu.cpp
@@ -0,0 +1,331 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "xptcprivate.h"
+#include "xptiprivate.h"
+#include "../unix/xptc_gcc_x86_unix.h"
+
+/*
+ * This is for Windows 64 bit (x86_64) using GCC syntax
+ * Code was copied from the MSVC version.
+ */
+
+#if !defined(_AMD64_) || !defined(__GNUC__)
+#  error xptcstubs_x86_64_gnu.cpp being used unexpectedly
+#endif
+
+extern "C" nsresult
+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
+                   PRUint64 * args, PRUint64 * gprData, double *fprData)
+{
+#define PARAM_BUFFER_COUNT  16
+//
+// "this" pointer is first parameter, so parameter count is 3.
+//
+#define PARAM_GPR_COUNT   3
+#define PARAM_FPR_COUNT   3
+
+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
+    nsXPTCMiniVariant* dispatchParams = NULL;
+    const nsXPTMethodInfo* info = NULL;
+    PRUint8 paramCount;
+    PRUint8 i;
+    nsresult result = NS_ERROR_FAILURE;
+
+    NS_ASSERTION(self, "no self");
+
+    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
+    NS_ASSERTION(info, "no method info");
+
+    paramCount = info->GetParamCount();
+
+    //
+    // setup variant array pointer
+    //
+
+    if(paramCount > PARAM_BUFFER_COUNT)
+        dispatchParams = new nsXPTCMiniVariant[paramCount];
+    else
+        dispatchParams = paramBuffer;
+
+    NS_ASSERTION(dispatchParams,"no place for params");
+
+    PRUint64* ap = args;
+    PRUint32 iCount = 0;
+
+    for(i = 0; i < paramCount; i++)
+    {
+        const nsXPTParamInfo& param = info->GetParam(i);
+        const nsXPTType& type = param.GetType();
+        nsXPTCMiniVariant* dp = &dispatchParams[i];
+
+        if(param.IsOut() || !type.IsArithmetic())
+        {
+            if (iCount < PARAM_GPR_COUNT)
+                dp->val.p = (void*)gprData[iCount++];
+            else
+                dp->val.p = (void*)*ap++;
+
+            continue;
+        }
+        // else
+        switch(type)
+        {
+        case nsXPTType::T_I8:
+           if (iCount < PARAM_GPR_COUNT)
+              dp->val.i8  = (PRInt8)gprData[iCount++];
+           else
+              dp->val.i8  = *((PRInt8*)ap++);
+           break;
+
+        case nsXPTType::T_I16:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.i16  = (PRInt16)gprData[iCount++];
+            else
+               dp->val.i16  = *((PRInt16*)ap++);
+            break;
+
+        case nsXPTType::T_I32:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.i32  = (PRInt32)gprData[iCount++];
+            else
+               dp->val.i32  = *((PRInt32*)ap++);
+            break;
+
+        case nsXPTType::T_I64:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.i64  = (PRInt64)gprData[iCount++];
+            else
+               dp->val.i64  = *((PRInt64*)ap++);
+            break;
+
+        case nsXPTType::T_U8:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.u8  = (PRUint8)gprData[iCount++];
+            else
+               dp->val.u8  = *((PRUint8*)ap++);
+            break;
+
+        case nsXPTType::T_U16:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.u16  = (PRUint16)gprData[iCount++];
+            else
+                dp->val.u16  = *((PRUint16*)ap++);
+            break;
+
+        case nsXPTType::T_U32:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.u32  = (PRUint32)gprData[iCount++];
+            else
+               dp->val.u32  = *((PRUint32*)ap++);
+            break;
+
+        case nsXPTType::T_U64:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.u64  = (PRUint64)gprData[iCount++];
+            else
+               dp->val.u64  = *((PRUint64*)ap++);
+            break;
+
+        case nsXPTType::T_FLOAT:
+             if (iCount < PARAM_FPR_COUNT)
+                dp->val.f  = (float)fprData[iCount++];
+             else
+                dp->val.f  = *((float*)ap++);
+             break;
+
+        case nsXPTType::T_DOUBLE:
+              if (iCount < PARAM_FPR_COUNT)
+                 dp->val.d  = (double)fprData[iCount++];
+              else
+                 dp->val.d  = *((double*)ap++);
+              break;
+
+        case nsXPTType::T_BOOL:
+           if (iCount < PARAM_GPR_COUNT)
+              dp->val.b  = (PRBool)gprData[iCount++];
+           else
+              dp->val.b  = *((PRBool*)ap++);
+           break;
+
+        case nsXPTType::T_CHAR:
+           if (iCount < PARAM_GPR_COUNT)
+              dp->val.c  = (char)gprData[iCount++];
+           else
+              dp->val.c  = *((char*)ap++);
+           break;
+
+        case nsXPTType::T_WCHAR:
+           if (iCount < PARAM_GPR_COUNT)
+              dp->val.wc  = (wchar_t)gprData[iCount++];
+           else
+              dp->val.wc  = *((wchar_t*)ap++);
+           break;
+
+        default:
+            NS_ASSERTION(0, "bad type");
+            break;
+        }
+    }
+
+    result = self->mOuter->CallMethod((PRUint16)methodIndex, info, dispatchParams);
+
+    if(dispatchParams != paramBuffer)
+        delete [] dispatchParams;
+
+    return result;
+}
+
+__asm__ (
+  ".text\n"
+  ".intel_syntax\n"                     /* switch to Intel syntax to look like the MSVC assembly */
+  ".globl SharedStub\n"
+  ".def SharedStub ; .scl 3 ; .type 46 ; .endef \n"
+  "SharedStub:\n"
+
+  /* rcx is this pointer.  Need backup for optimized build */
+
+  "mov      qword ptr [rsp+88], rcx\n"
+
+  /*
+   * fist 4 parameters (1st is "this" pointer) are passed in registers.
+   */
+
+  /* for floating value */
+
+  "movsd   qword ptr [rsp+64], xmm1\n"
+  "movsd   qword ptr [rsp+72], xmm2\n"
+  "movsd   qword ptr [rsp+80], xmm3\n"
+
+  /* for integer value */
+
+  "mov     qword ptr [rsp+40], rdx\n"
+  "mov     qword ptr [rsp+48], r8\n"
+  "mov     qword ptr [rsp+56], r9\n"
+
+  /*
+   * Call PrepareAndDispatch function
+   */
+
+  /* 5th parameter (floating parameters) of PrepareAndDispatch */
+
+  "lea     r9, qword ptr [rsp+64]\n"
+  "mov     qword ptr [rsp+32], r9\n"
+
+  /* 4th parameter (normal parameters) of PrepareAndDispatch */
+
+  "lea     r9, qword ptr [rsp+40]\n"
+
+  /* 3rd parameter (pointer to args on stack) */
+
+  "lea     r8, qword ptr [rsp+40+104]\n"
+
+  /* 2nd parameter (vtbl_index) */
+
+  "mov     rdx, r11\n"
+
+  /* 1st parameter (this) (rcx) */
+
+  "call    _PrepareAndDispatch\n"
+
+  /* restore rcx */
+
+  "mov     rcx, qword ptr [rsp+88]\n"
+
+  /*
+   * clean up register
+   */
+
+  "add     rsp, 104+8\n"
+
+  /* set return address */
+
+  "mov     rdx, qword ptr [rsp-8]\n"
+
+  /* simulate __stdcall return */
+
+  "jmp     rdx\n"
+
+  /* back to AT&T syntax */
+  ".att_syntax\n"
+
+);
+
+#define STUB_ENTRY(n) \
+asm(".intel_syntax\n" /* this is in intel syntax */ \
+    ".text\n" \
+    ".align 2\n" \
+    ".if        " #n " < 10\n" \
+    ".globl     " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase5Stub" #n "Ev@4\n" \
+    ".def       " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase5Stub" #n "Ev@4\n" \
+    ".scl         3\n" /* private */ \
+    ".type        46\n" /* function returning unsigned int */ \
+    ".endef\n" \
+    SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase5Stub" #n "Ev@4:\n" \
+    ".elseif    " #n " < 100\n" \
+    ".globl     " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase6Stub" #n "Ev@4\n" \
+    ".def       " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase6Stub" #n "Ev@4\n" \
+    ".scl         3\n" /* private */\
+    ".type        46\n" /* function returning unsigned int */ \
+    ".endef\n" \
+    SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase6Stub" #n "Ev@4:\n" \
+    ".elseif    " #n " < 1000\n" \
+    ".globl     " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase7Stub" #n "Ev@4\n" \
+    ".def       " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase7Stub" #n "Ev@4\n" \
+    ".scl         3\n" /* private */ \
+    ".type        46\n" /* function returning unsigned int */ \
+    ".endef\n" \
+    SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase7Stub" #n "Ev@4:\n" \
+    ".else\n" \
+    ".err       \"stub number " #n " >= 1000 not yet supported\"\n" \
+    ".endif\n" \
+    "push         rbx\n" \
+    "mov          rbx, " #n "\n" \
+    "jmp          SharedStub\n" \
+    ".att_syntax\n" /* back to AT&T syntax */ \
+    "");
+
+#define SENTINEL_ENTRY(n) \
+nsresult nsXPTCStubBase::Sentinel##n() \
+{ \
+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
+    return NS_ERROR_NOT_IMPLEMENTED; \
+}
+
+#include "xptcstubsdef.inc"
+

From d72ab83441d6a7df2c620e2df21219a6b403d303 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zweinberg@mozilla.com>
Date: Thu, 30 Jul 2009 15:43:22 +1200
Subject: [PATCH 006/175] Bug 486065. Hack nsCSSOffsetState::InitOffsets to
 zero out computed padding and borders when the scrollbar size is zero.
 r=dbaron

--HG--
extra : rebase_source : 92bcaee46ded00722e3fc86b4ca538e5f90f16ef
---
 layout/generic/nsHTMLReflowState.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 7bdde4a9c4c..2a207e4da19 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -1925,7 +1925,8 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
   }
   mComputedBorderPadding += mComputedPadding;
 
-  if (frame->GetType() == nsGkAtoms::tableFrame) {
+  nsIAtom* frameType = frame->GetType();
+  if (frameType == nsGkAtoms::tableFrame) {
     nsTableFrame *tableFrame = static_cast<nsTableFrame*>(frame);
 
     if (tableFrame->IsBorderCollapse()) {
@@ -1936,6 +1937,23 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
       mComputedPadding.SizeTo(0,0,0,0);
       mComputedBorderPadding = tableFrame->GetIncludedOuterBCBorder();
     }
+  } else if (frameType == nsGkAtoms::scrollbarFrame) {
+    // scrollbars may have had their width or height smashed to zero
+    // by the associated scrollframe, in which case we must not report
+    // any padding or border on that axis.
+    nsSize size(frame->GetSize());
+    if (size.width == 0) {
+      mComputedPadding.left = 0;
+      mComputedPadding.right = 0;
+      mComputedBorderPadding.left = 0;
+      mComputedBorderPadding.right = 0;
+    }
+    if (size.height == 0) {
+      mComputedPadding.top = 0;
+      mComputedPadding.bottom = 0;
+      mComputedBorderPadding.top = 0;
+      mComputedBorderPadding.bottom = 0;
+    }
   }
 }
 

From d8373a09b7faae19407913f3ded1e719192c6738 Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Thu, 30 Jul 2009 15:28:53 +1200
Subject: [PATCH 007/175] Bug 500311 - Count tracks as active during
 initialization.  r=chris.double

--HG--
extra : rebase_source : 25e5d3aa9661a95e1a623a9fe15f5c12f31d13f3
---
 media/liboggplay/README_MOZILLA               |  2 +
 media/liboggplay/bug500311.patch              | 99 +++++++++++++++++++
 media/liboggplay/src/liboggplay/oggplay.c     |  3 +-
 .../src/liboggplay/oggplay_callback.c         |  4 +-
 media/liboggplay/update.sh                    |  1 +
 5 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 media/liboggplay/bug500311.patch

diff --git a/media/liboggplay/README_MOZILLA b/media/liboggplay/README_MOZILLA
index 2171af1dd1a..87b7fccd38c 100644
--- a/media/liboggplay/README_MOZILLA
+++ b/media/liboggplay/README_MOZILLA
@@ -45,3 +45,5 @@ oggplay_os2.patch: Bug 448918 - add OS/2 support (this patch should be
 
 bug498815.patch: Fix for bug 498815.
 bug498824.patch: Fix for bug 498824.
+bug500311.patch: Fix crash during decoder initialization.
+
diff --git a/media/liboggplay/bug500311.patch b/media/liboggplay/bug500311.patch
new file mode 100644
index 00000000000..c0ba0fb492a
--- /dev/null
+++ b/media/liboggplay/bug500311.patch
@@ -0,0 +1,99 @@
+diff --git a/media/liboggplay/src/liboggplay/oggplay.c b/media/liboggplay/src/liboggplay/oggplay.c
+--- a/media/liboggplay/src/liboggplay/oggplay.c
++++ b/media/liboggplay/src/liboggplay/oggplay.c
+@@ -129,16 +129,17 @@ oggplay_initialise(OggPlay *me, int bloc
+   }
+ 
+   /*
+    * set all the tracks to inactive
+    */
+   for (i = 0; i < me->num_tracks; i++) {
+     me->decode_data[i]->active = 0;
+   }
++  me->active_tracks = 0;
+ 
+   /*
+    * if the buffer was set up before initialisation, prepare it now
+    */
+   if (me->buffer != NULL) {
+     oggplay_buffer_prepare(me);
+   }
+ 
+@@ -693,18 +694,18 @@ read_more_data:
+     /* end-of-file */
+     if (r == 0) {
+       num_records = oggplay_callback_info_prepare(me, &info);
+      /*
+        * set all of the tracks to inactive
+        */
+       for (i = 0; i < me->num_tracks; i++) {
+         me->decode_data[i]->active = 0;
+-        me->active_tracks = 0;
+       }
++      me->active_tracks = 0;
+ 
+       if (info != NULL) {
+         me->callback (me, num_records, info, me->callback_user_ptr);
+         oggplay_callback_info_destroy(me, info);
+       }
+ 
+       /*
+        * ensure all tracks have their final data packet set to end_of_stream
+diff --git a/media/liboggplay/src/liboggplay/oggplay_callback.c b/media/liboggplay/src/liboggplay/oggplay_callback.c
+--- a/media/liboggplay/src/liboggplay/oggplay_callback.c
++++ b/media/liboggplay/src/liboggplay/oggplay_callback.c
+@@ -54,16 +54,17 @@ oggplay_init_theora(void *user_data) {
+   theora_info_init(&(decoder->video_info));
+   theora_comment_init(&(decoder->video_comment));
+   decoder->remaining_header_packets = 3;
+   decoder->granulepos_seen = 0;
+   decoder->frame_delta = 0;
+   decoder->y_width = 0;
+   decoder->convert_to_rgb = 0;
+   decoder->decoder.decoded_type = OGGPLAY_YUV_VIDEO;
++  decoder->decoder.player->active_tracks++;
+ }
+ 
+ void
+ oggplay_shutdown_theora(void *user_data) {
+ 
+   OggPlayTheoraDecode   * decoder = (OggPlayTheoraDecode *)user_data;
+ 
+   if (decoder->remaining_header_packets == 0) {
+@@ -366,16 +367,17 @@ oggplay_init_audio (void * user_data) {
+ 
+   decoder->sound_info.channels = 0;
+   fish_sound_set_interleave(decoder->sound_handle, 1);
+   fish_sound_set_decoded_float_ilv(decoder->sound_handle,
+                                       oggplay_fish_sound_callback_floats,
+                                       (void *)decoder);
+ 
+   decoder->decoder.decoded_type = OGGPLAY_FLOATS_AUDIO;
++  decoder->decoder.player->active_tracks++;
+ }
+ 
+ void
+ oggplay_shutdown_audio(void *user_data) {
+ 
+   OggPlayAudioDecode   * decoder = (OggPlayAudioDecode *)user_data;
+ 
+   fish_sound_delete(decoder->sound_handle);
+@@ -566,17 +568,17 @@ oggplay_initialise_decoder(OggPlay *me, 
+ 
+   if (decoder == NULL)
+     return NULL;
+ 
+   decoder->serialno = serialno;
+   decoder->content_type = content_type;
+   decoder->content_type_name =
+           oggz_stream_get_content_type (me->oggz, serialno);
+-  decoder->active = 0;
++  decoder->active = 1;
+   decoder->final_granulepos = -1;
+   decoder->player = me;
+   decoder->decoded_type = OGGPLAY_TYPE_UNKNOWN;
+ 
+   /*
+    * set the StreamInfo to unitialised until we get some real data in
+    */
+   decoder->stream_info = OGGPLAY_STREAM_UNINITIALISED;
diff --git a/media/liboggplay/src/liboggplay/oggplay.c b/media/liboggplay/src/liboggplay/oggplay.c
index ef822f8558d..98dd6a4b8f9 100644
--- a/media/liboggplay/src/liboggplay/oggplay.c
+++ b/media/liboggplay/src/liboggplay/oggplay.c
@@ -134,6 +134,7 @@ oggplay_initialise(OggPlay *me, int block) {
   for (i = 0; i < me->num_tracks; i++) {
     me->decode_data[i]->active = 0;
   }
+  me->active_tracks = 0;
 
   /*
    * if the buffer was set up before initialisation, prepare it now
@@ -698,8 +699,8 @@ read_more_data:
        */
       for (i = 0; i < me->num_tracks; i++) {
         me->decode_data[i]->active = 0;
-        me->active_tracks = 0;
       }
+      me->active_tracks = 0;
 
       if (info != NULL) {
         me->callback (me, num_records, info, me->callback_user_ptr);
diff --git a/media/liboggplay/src/liboggplay/oggplay_callback.c b/media/liboggplay/src/liboggplay/oggplay_callback.c
index a98aef6bc8e..b0b21412c0d 100644
--- a/media/liboggplay/src/liboggplay/oggplay_callback.c
+++ b/media/liboggplay/src/liboggplay/oggplay_callback.c
@@ -59,6 +59,7 @@ oggplay_init_theora(void *user_data) {
   decoder->y_width = 0;
   decoder->convert_to_rgb = 0;
   decoder->decoder.decoded_type = OGGPLAY_YUV_VIDEO;
+  decoder->decoder.player->active_tracks++;
 }
 
 void
@@ -371,6 +372,7 @@ oggplay_init_audio (void * user_data) {
                                       (void *)decoder);
 
   decoder->decoder.decoded_type = OGGPLAY_FLOATS_AUDIO;
+  decoder->decoder.player->active_tracks++;
 }
 
 void
@@ -571,7 +573,7 @@ oggplay_initialise_decoder(OggPlay *me, int content_type, int serialno) {
   decoder->content_type = content_type;
   decoder->content_type_name =
           oggz_stream_get_content_type (me->oggz, serialno);
-  decoder->active = 0;
+  decoder->active = 1;
   decoder->final_granulepos = -1;
   decoder->player = me;
   decoder->decoded_type = OGGPLAY_TYPE_UNKNOWN;
diff --git a/media/liboggplay/update.sh b/media/liboggplay/update.sh
index d0c9e239ffb..1d4788edd6b 100644
--- a/media/liboggplay/update.sh
+++ b/media/liboggplay/update.sh
@@ -64,3 +64,4 @@ patch -p3 < bug498815.patch
 patch -p3 < bug498824.patch
 patch -p3 < bug496529.patch
 patch -p3 < bug499519.patch
+patch -p3 < bug500311.patch

From 0cf332a1871d48a8857d32f8448f3f8329aa626d Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Wed, 29 Jul 2009 21:27:46 -0700
Subject: [PATCH 008/175] Bug 332173 - Followup followup fix for trunk-only
 necessary-for-templatization changes (not needed for any branches, that is).

--HG--
extra : rebase_source : 767c90867afbbe7bf52e29820c987e45c9e60d03
---
 xpcom/io/nsWildCard.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xpcom/io/nsWildCard.cpp b/xpcom/io/nsWildCard.cpp
index 90f3d718178..2f788ba9ae7 100644
--- a/xpcom/io/nsWildCard.cpp
+++ b/xpcom/io/nsWildCard.cpp
@@ -222,7 +222,7 @@ _handle_union(const T *str, const T *expr, PRBool case_insensitive,
     if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */
         return ABORTED;
     ++cp;                /* now index of char after closing parenthesis */
-    e2 = (T *) NS_Alloc(1 + nsCharTraits<T>::length(expr));
+    e2 = (T *) NS_Alloc((1 + nsCharTraits<T>::length(expr)) * sizeof(T));
     if (!e2)
         return ABORTED;
     for (sx = 1; ; ++sx) {
@@ -386,7 +386,7 @@ ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive)
     if (!nsCharTraits<T>::find(xp, nsCharTraits<T>::length(xp), T('~')))
         return _shexp_match(str, xp, case_insensitive, 0);
 
-    expr = (T *) NS_Alloc(nsCharTraits<T>::length(xp) + 1);
+    expr = (T *) NS_Alloc((nsCharTraits<T>::length(xp) + 1) * sizeof(T));
     if(!expr)
         return NOMATCH;
 

From cc98ef94548819888b97f71814146e23581ceb60 Mon Sep 17 00:00:00 2001
From: Josh Aas <joshmoz@gmail.com>
Date: Thu, 30 Jul 2009 00:47:06 -0400
Subject: [PATCH 009/175] Cache UTF-8 POSIX path in Mac OS X nsIFile impl.
 b=505792 r=mstange sr=bsmedberg

---
 xpcom/io/nsLocalFileOSX.h  |  10 +--
 xpcom/io/nsLocalFileOSX.mm | 172 +++++++++++--------------------------
 2 files changed, 53 insertions(+), 129 deletions(-)

diff --git a/xpcom/io/nsLocalFileOSX.h b/xpcom/io/nsLocalFileOSX.h
index f818e742898..957e2d3abfa 100644
--- a/xpcom/io/nsLocalFileOSX.h
+++ b/xpcom/io/nsLocalFileOSX.h
@@ -95,21 +95,17 @@ private:
 
 protected:
   nsLocalFile(const nsLocalFile& src);
-
   nsresult SetBaseURL(CFURLRef aCFURLRef); // retains aCFURLRef
-
   nsresult GetFSRefInternal(FSRef& aFSRef);
-  nsresult GetPathInternal(nsACString& path); // Returns path WRT mFollowLinks
+  nsresult GetPathInternal(nsACString& path); // Returns path respecting mFollowLinks
   nsresult CopyInternal(nsIFile* newParentDir,
                         const nsAString& newName,
                         PRBool followLinks);
   nsresult FillStatBufferInternal(struct STAT *statBuffer);
 
-  static nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr);
-
 protected:
-  CFURLRef mBaseURL; // The FS object we represent
-
+  CFURLRef     mBaseURL; // The FS object we represent
+  char         mPath[PATH_MAX]; // POSIX path, UTF-8, NULL terminated
   PRPackedBool mFollowLinks;
 };
 
diff --git a/xpcom/io/nsLocalFileOSX.mm b/xpcom/io/nsLocalFileOSX.mm
index 8f6a4fea256..14e13d89b58 100644
--- a/xpcom/io/nsLocalFileOSX.mm
+++ b/xpcom/io/nsLocalFileOSX.mm
@@ -76,6 +76,7 @@
 
 static nsresult MacErrorMapper(OSErr inErr);
 static void CopyUTF8toUTF16NFC(const nsACString& aSrc, nsAString& aResult);
+static nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr);
 
 #pragma mark -
 #pragma mark [FSRef operator==]
@@ -281,30 +282,23 @@ class nsDirEnumerator : public nsISimpleEnumerator,
 
 NS_IMPL_ISUPPORTS2(nsDirEnumerator, nsISimpleEnumerator, nsIDirectoryEnumerator)
 
-#define FILENAME_BUFFER_SIZE 512
-
 const char kPathSepChar = '/';
 
 #pragma mark -
 #pragma mark [CTORs/DTOR]
 
 nsLocalFile::nsLocalFile() :
-  mBaseURL(nsnull),
+  mBaseURL(NULL),
   mFollowLinks(PR_TRUE)
 {
+  mPath[0] = '\0';
 }
 
 nsLocalFile::nsLocalFile(const nsLocalFile& src) :
-  mBaseURL(src.mBaseURL),
+  mBaseURL(NULL),
   mFollowLinks(src.mFollowLinks)
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // CFURL objects are immutable so no need to copy, just retain.
-  if (mBaseURL)
-    ::CFRetain(mBaseURL);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
+  SetBaseURL(src.mBaseURL);
 }
 
 nsLocalFile::~nsLocalFile()
@@ -388,14 +382,8 @@ NS_IMETHODIMP nsLocalFile::Normalize()
 
   CHECK_INIT();
 
-  // CFURL doesn't doesn't seem to resolve paths containing relative
-  // components, so we'll nick the stdlib code from nsLocalFileUnix
-  UInt8 path[PATH_MAX] = "";
-  if (!::CFURLGetFileSystemRepresentation(mBaseURL, true, path, PATH_MAX))
-    return NS_ERROR_FAILURE;
-
   char resolved_path[PATH_MAX] = "";
-  if (!realpath((char*)path, resolved_path))
+  if (!realpath(mPath, resolved_path))
       return NSRESULT_FOR_ERRNO();
 
   // Need to know whether we're a directory to create a new CFURLRef
@@ -437,7 +425,7 @@ NS_IMETHODIMP nsLocalFile::Create(PRUint32 type, PRUint32 permissions)
   CFURLRef pathURLRef = mBaseURL;
   FSRef pathFSRef;
   CFStringRef leafStrRef = nsnull;
-  nsAutoTArray<UniChar, FILENAME_BUFFER_SIZE> buffer;
+  nsAutoTArray<UniChar, NAME_MAX> buffer;
   Boolean success;
   
   // Work backwards through the path to find the last node which
@@ -607,12 +595,6 @@ NS_IMETHODIMP nsLocalFile::MoveToNative(nsIFile *newParentDir, const nsACString&
   if (NS_FAILED(rv))
     return rv;
 
-  // Get the source path.
-  nsCAutoString srcPath;
-  rv = GetNativePath(srcPath);
-  if (NS_FAILED(rv))
-    return rv;
-
   // Build the destination path.
   nsCOMPtr<nsIFile> parentDir = newParentDir;
   if (!parentDir) {
@@ -650,7 +632,7 @@ NS_IMETHODIMP nsLocalFile::MoveToNative(nsIFile *newParentDir, const nsACString&
   }
 
   // Perform the move.
-  if (rename(srcPath.get(), destPath.get()) != 0) {
+  if (rename(mPath, destPath.get()) != 0) {
     if (errno == EXDEV) {
       // Can't move across volume (device) boundaries.  Copy and remove.
       rv = CopyToNative(parentDir, newName);
@@ -706,17 +688,11 @@ NS_IMETHODIMP nsLocalFile::Remove(PRBool recursive)
     }
   }
   else {
-    nsCAutoString path;
-    rv = GetNativePath(path);
-    if (NS_FAILED(rv))
-      return rv;
-
-    const char* pathPtr = path.get();
     int status;
     if (isDirectory)
-      status = rmdir(pathPtr);
+      status = rmdir(mPath);
     else
-      status = unlink(pathPtr);
+      status = unlink(mPath);
 
     if (status != 0)
       rv = NSRESULT_FOR_ERRNO();
@@ -750,12 +726,7 @@ NS_IMETHODIMP nsLocalFile::SetPermissions(PRUint32 aPermissions)
 {
   CHECK_INIT();
 
-  nsCAutoString path;
-  nsresult rv = GetPathInternal(path);
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (chmod(path.get(), aPermissions) < 0)
+  if (chmod(mPath, aPermissions) < 0)
     return NSRESULT_FOR_ERRNO();
 
   return NS_OK;
@@ -847,15 +818,11 @@ NS_IMETHODIMP nsLocalFile::GetFileSize(PRInt64 *aFileSize)
   NS_ENSURE_ARG_POINTER(aFileSize);
   *aFileSize = 0;
 
-  nsCAutoString path;
-  nsresult rv = GetPathInternal(path);
+  struct STAT buf;
+  nsresult rv = FillStatBufferInternal(&buf);
   if (NS_FAILED(rv))
     return rv;
 
-  struct STAT buf;
-  if (STAT(path.get(), &buf) != 0)
-    return NSRESULT_FOR_ERRNO();
-
   if (!S_ISDIR(buf.st_mode))
     *aFileSize = (PRInt64)buf.st_size;
 
@@ -866,13 +833,8 @@ NS_IMETHODIMP nsLocalFile::SetFileSize(PRInt64 aFileSize)
 {
   CHECK_INIT();
 
-  nsCAutoString path;
-  nsresult rv = GetPathInternal(path);
-  if (NS_FAILED(rv))
-    return rv;
-
   off_t size = (off_t)aFileSize;
-  if (truncate(path.get(), size) == -1)
+  if (truncate(mPath, size) == -1)
     return NSRESULT_FOR_ERRNO();
 
   return NS_OK;
@@ -910,13 +872,8 @@ NS_IMETHODIMP nsLocalFile::GetNativeTarget(nsACString& aNativeTarget)
   if (!isSymLink)
     return NS_ERROR_FILE_INVALID_PATH;
 
-  nsCAutoString nativeString;
-  rv = GetNativePath(nativeString);
-  if (NS_FAILED(rv))
-    return rv;
-
   char resolvedPathBuf[PATH_MAX];
-  if (!realpath(nativeString.get(), resolvedPathBuf))
+  if (!realpath(mPath, resolvedPathBuf))
     return NS_ERROR_FILE_INVALID_PATH;
 
   unsigned int resolvedPathLength = strlen(resolvedPathBuf);
@@ -940,32 +897,19 @@ NS_IMETHODIMP nsLocalFile::GetPath(nsAString& aPath)
 
 NS_IMETHODIMP nsLocalFile::GetNativePath(nsACString& aNativePath)
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
   CHECK_INIT();
 
-  nsresult rv = NS_ERROR_FAILURE;
-  CFStringRef pathStrRef = ::CFURLCopyFileSystemPath(mBaseURL, kCFURLPOSIXPathStyle);
-  if (pathStrRef) {
-    rv = CFStringReftoUTF8(pathStrRef, aNativePath);
-    ::CFRelease(pathStrRef);
-  }
-  return rv;
+  aNativePath.Assign(mPath);
 
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsLocalFile::Exists(PRBool *_retval)
 {
   NS_ENSURE_ARG_POINTER(_retval);
 
-  nsCAutoString path;
-  nsresult rv = GetPathInternal(path);
-  if (NS_FAILED(rv))
-    return rv;
-
   struct STAT buf;
-  *_retval = (STAT(path.get(), &buf) == 0);
+  *_retval = (STAT(mPath, &buf) == 0);
 
   return NS_OK;
 }
@@ -1098,26 +1042,17 @@ NS_IMETHODIMP nsLocalFile::IsFile(PRBool *_retval)
 
 NS_IMETHODIMP nsLocalFile::IsSymlink(PRBool *_retval)
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
   CHECK_INIT();
 
   NS_ENSURE_ARG(_retval);
   *_retval = PR_FALSE;
 
-  // First see if we are an actual symlink
-  nsCAutoString path;
-  nsresult rv = GetNativePath(path);
-  if (NS_FAILED(rv))
-    return rv;
   struct stat symStat;
-  if (lstat(path.get(), &symStat) < 0)
+  if (lstat(mPath, &symStat) < 0)
     return NSRESULT_FOR_ERRNO();
   *_retval = S_ISLNK(symStat.st_mode);
 
   return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
 NS_IMETHODIMP nsLocalFile::IsSpecial(PRBool *_retval)
@@ -1149,12 +1084,7 @@ NS_IMETHODIMP nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
   if (NS_FAILED(rv))
     return rv;
 
-  nsCAutoString thisPath;
-  rv = GetNativePath(thisPath);
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = !strcmp(inPath.get(), thisPath.get());
+  *_retval = !strcmp(mPath, inPath.get());
   return NS_OK;
 }
 
@@ -1976,6 +1906,9 @@ nsresult nsLocalFile::SetBaseURL(CFURLRef aCFURLRef)
     ::CFRelease(mBaseURL);
   mBaseURL = aCFURLRef;
 
+  if (!::CFURLGetFileSystemRepresentation(mBaseURL, NO, (UInt8*)mPath, PATH_MAX))
+    return NS_ERROR_FAILURE;
+
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@@ -2082,43 +2015,14 @@ nsresult nsLocalFile::FillStatBufferInternal(struct STAT *statBuffer)
 {
   CHECK_INIT();
 
-  char path[PATH_MAX] = "";
-  Boolean gotPath = ::CFURLGetFileSystemRepresentation(mBaseURL, true, (UInt8*)path, PATH_MAX);
-  if (!gotPath)
-    return NS_ERROR_FAILURE;
-
-  if (STAT(path, statBuffer) == -1) {
-    if (LSTAT(path, statBuffer) == -1)
+  if (STAT(mPath, statBuffer) == -1) {
+    if (LSTAT(mPath, statBuffer) == -1)
       return NSRESULT_FOR_ERRNO();
   }
 
   return NS_OK;
 }
 
-nsresult nsLocalFile::CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // first see if the conversion would succeed and find the length of the result
-  CFIndex usedBufLen, inStrLen = ::CFStringGetLength(aInStrRef);
-  CFIndex charsConverted = ::CFStringGetBytes(aInStrRef, CFRangeMake(0, inStrLen),
-                                              kCFStringEncodingUTF8, 0, PR_FALSE,
-                                              NULL, 0, &usedBufLen);
-  if (charsConverted == inStrLen) {
-    // all characters converted, do the actual conversion
-    aOutStr.SetLength(usedBufLen);
-    if (aOutStr.Length() != (unsigned int)usedBufLen)
-      return NS_ERROR_OUT_OF_MEMORY;
-    UInt8 *buffer = (UInt8*)aOutStr.BeginWriting();
-    ::CFStringGetBytes(aInStrRef, CFRangeMake(0, inStrLen), kCFStringEncodingUTF8,
-                       0, false, buffer, usedBufLen, &usedBufLen);
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
 // nsIHashable
 
 NS_IMETHODIMP
@@ -2304,7 +2208,7 @@ static void CopyUTF8toUTF16NFC(const nsACString& aSrc, nsAString& aResult)
     aResult.Assign(chars, length);
   }
   else {
-    nsAutoTArray<UniChar, FILENAME_BUFFER_SIZE> buffer;
+    nsAutoTArray<UniChar, PATH_MAX> buffer;
     if (!buffer.SetLength(length)) {
       CopyUTF8toUTF16(aSrc, aResult);
     }
@@ -2317,3 +2221,27 @@ static void CopyUTF8toUTF16NFC(const nsACString& aSrc, nsAString& aResult)
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
+
+nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
+
+  // first see if the conversion would succeed and find the length of the result
+  CFIndex usedBufLen, inStrLen = ::CFStringGetLength(aInStrRef);
+  CFIndex charsConverted = ::CFStringGetBytes(aInStrRef, CFRangeMake(0, inStrLen),
+                                              kCFStringEncodingUTF8, 0, PR_FALSE,
+                                              NULL, 0, &usedBufLen);
+  if (charsConverted == inStrLen) {
+    // all characters converted, do the actual conversion
+    aOutStr.SetLength(usedBufLen);
+    if (aOutStr.Length() != (unsigned int)usedBufLen)
+      return NS_ERROR_OUT_OF_MEMORY;
+    UInt8 *buffer = (UInt8*)aOutStr.BeginWriting();
+    ::CFStringGetBytes(aInStrRef, CFRangeMake(0, inStrLen), kCFStringEncodingUTF8,
+                       0, false, buffer, usedBufLen, &usedBufLen);
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
+}

From c842f83d5b641507901d6eea54c884813a4065a4 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Wed, 29 Jul 2009 23:01:27 -0700
Subject: [PATCH 010/175] Bug 492152 - Scrollable menus should support panning
 on Win7. r=jmathies, sr=vlad

---
 widget/src/windows/nsWinGesture.cpp |  8 ++++----
 widget/src/windows/nsWinGesture.h   |  4 ++--
 widget/src/windows/nsWindow.cpp     | 19 ++++++++++++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/widget/src/windows/nsWinGesture.cpp b/widget/src/windows/nsWinGesture.cpp
index 887812a1025..24cf2b23fb1 100644
--- a/widget/src/windows/nsWinGesture.cpp
+++ b/widget/src/windows/nsWinGesture.cpp
@@ -461,11 +461,11 @@ inline PRBool TestTransition(PRInt32 a, PRInt32 b)
 }
 
 void
-nsWinGesture::UpdatePanFeedbackX(HWND hWnd, nsMouseScrollEvent& evt, PRBool& endFeedback)
+nsWinGesture::UpdatePanFeedbackX(HWND hWnd, PRInt32 scrollOverflow, PRBool& endFeedback)
 {
   // If scroll overflow was returned indicating we panned past the bounds of
   // the scrollable view port, start feeback.
-  if (evt.scrollOverflow != 0) {
+  if (scrollOverflow != 0) {
     if (!mFeedbackActive) {
       BeginPanningFeedback(hWnd);
       mFeedbackActive = PR_TRUE;
@@ -490,11 +490,11 @@ nsWinGesture::UpdatePanFeedbackX(HWND hWnd, nsMouseScrollEvent& evt, PRBool& end
 }
 
 void
-nsWinGesture::UpdatePanFeedbackY(HWND hWnd, nsMouseScrollEvent& evt, PRBool& endFeedback)
+nsWinGesture::UpdatePanFeedbackY(HWND hWnd, PRInt32 scrollOverflow, PRBool& endFeedback)
 {
   // If scroll overflow was returned indicating we panned past the bounds of
   // the scrollable view port, start feeback.
-  if (evt.scrollOverflow != 0) {
+  if (scrollOverflow != 0) {
     if (!mFeedbackActive) {
       BeginPanningFeedback(hWnd);
       mFeedbackActive = PR_TRUE;
diff --git a/widget/src/windows/nsWinGesture.h b/widget/src/windows/nsWinGesture.h
index a21b26d5a72..c8b3c9d4786 100644
--- a/widget/src/windows/nsWinGesture.h
+++ b/widget/src/windows/nsWinGesture.h
@@ -206,8 +206,8 @@ public:
   PRBool ProcessPanMessage(HWND hWnd, WPARAM wParam, LPARAM lParam);
   PRBool PanDeltaToPixelScrollX(nsMouseScrollEvent& evt);
   PRBool PanDeltaToPixelScrollY(nsMouseScrollEvent& evt);
-  void UpdatePanFeedbackX(HWND hWnd, nsMouseScrollEvent& evt, PRBool& endFeedback);
-  void UpdatePanFeedbackY(HWND hWnd, nsMouseScrollEvent& evt, PRBool& endFeedback);
+  void UpdatePanFeedbackX(HWND hWnd, PRInt32 scrollOverflow, PRBool& endFeedback);
+  void UpdatePanFeedbackY(HWND hWnd, PRInt32 scrollOverflow, PRBool& endFeedback);
   void PanFeedbackFinalize(HWND hWnd, PRBool endFeedback);
   
 public:
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index d6976c8f08d..3bd7c73bd86 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -4620,17 +4620,26 @@ PRBool nsWindow::OnGesture(WPARAM wParam, LPARAM lParam)
     event.time      = ::GetMessageTime();
 
     PRBool endFeedback = PR_TRUE;
-    
+
+    PRInt32 scrollOverflowX = 0;
+    PRInt32 scrollOverflowY = 0;
+
     if (mGesture.PanDeltaToPixelScrollX(event)) {
       DispatchEvent(&event, status);
+      scrollOverflowX = event.scrollOverflow;
     }
-    mGesture.UpdatePanFeedbackX(mWnd, event, endFeedback);
-    
+
     if (mGesture.PanDeltaToPixelScrollY(event)) {
       DispatchEvent(&event, status);
+      scrollOverflowY = event.scrollOverflow;
     }
-    mGesture.UpdatePanFeedbackY(mWnd, event, endFeedback);
-    mGesture.PanFeedbackFinalize(mWnd, endFeedback);
+
+    if (mWindowType != eWindowType_popup) {
+      mGesture.UpdatePanFeedbackX(mWnd, scrollOverflowX, endFeedback);
+      mGesture.UpdatePanFeedbackY(mWnd, scrollOverflowY, endFeedback);
+      mGesture.PanFeedbackFinalize(mWnd, endFeedback);
+    }
+
     mGesture.CloseGestureInfoHandle((HGESTUREINFO)lParam);
 
     return PR_TRUE;

From 9adf284bf2d8954cbcec5685934c184555a06f8f Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Wed, 29 Jul 2009 23:01:36 -0700
Subject: [PATCH 011/175] Bug 506696 - [WinCE] updater.exe doesn't use the
 working directory when applying the update. r=bsmedberg, r=blassey

---
 .../update/src/updater/archivereader.cpp      |  10 +-
 .../update/src/updater/archivereader.h        |  15 +-
 .../mozapps/update/src/updater/updater.cpp    | 233 ++++++++++++------
 .../update/src/updater/updater_wince.cpp      |  94 +++----
 .../update/src/updater/updater_wince.h        |   6 +-
 5 files changed, 208 insertions(+), 150 deletions(-)

diff --git a/toolkit/mozapps/update/src/updater/archivereader.cpp b/toolkit/mozapps/update/src/updater/archivereader.cpp
index a2686a99069..10f81ea2f6e 100644
--- a/toolkit/mozapps/update/src/updater/archivereader.cpp
+++ b/toolkit/mozapps/update/src/updater/archivereader.cpp
@@ -53,11 +53,7 @@
 #endif
 
 int
-#ifdef XP_WIN
-ArchiveReader::Open(const WCHAR *path)
-#else
-ArchiveReader::Open(const char *path)
-#endif
+ArchiveReader::Open(const NS_tchar *path)
 {
   if (mArchive)
     Close();
@@ -83,14 +79,14 @@ ArchiveReader::Close()
 }
 
 int
-ArchiveReader::ExtractFile(const char *name, const char *dest)
+ArchiveReader::ExtractFile(const char *name, const NS_tchar *dest)
 {
   const MarItem *item = mar_find_item(mArchive, name);
   if (!item)
     return READ_ERROR;
 
 #ifdef XP_WIN
-  FILE* fp = fopen(dest, "wb+");
+  FILE* fp = _wfopen(dest, L"wb+");
 #else
   int fd = creat(dest, item->flags);
   if (fd == -1)
diff --git a/toolkit/mozapps/update/src/updater/archivereader.h b/toolkit/mozapps/update/src/updater/archivereader.h
index 2421faedee9..ce3fc6a9a39 100644
--- a/toolkit/mozapps/update/src/updater/archivereader.h
+++ b/toolkit/mozapps/update/src/updater/archivereader.h
@@ -42,6 +42,12 @@
 #include <stdio.h>
 #include "mar.h"
 
+#ifdef XP_WIN
+# define NS_tchar WCHAR
+#else
+# define NS_tchar char
+#endif
+
 // This class provides an API to extract files from an update archive.
 class ArchiveReader
 {
@@ -49,15 +55,10 @@ public:
   ArchiveReader() : mArchive(NULL) {}
   ~ArchiveReader() { Close(); }
 
-#ifdef XP_WIN
-  int Open(const WCHAR *path);
-#else
-  int Open(const char *path);
-#endif
-
+  int Open(const NS_tchar *path);
   void Close();
 
-  int ExtractFile(const char *item, const char *destination);
+  int ExtractFile(const char *item, const NS_tchar *destination);
   int ExtractFileToStream(const char *item, FILE *fp);
 
 private:
diff --git a/toolkit/mozapps/update/src/updater/updater.cpp b/toolkit/mozapps/update/src/updater/updater.cpp
index b41bff278dc..f41a06dd14f 100644
--- a/toolkit/mozapps/update/src/updater/updater.cpp
+++ b/toolkit/mozapps/update/src/updater/updater.cpp
@@ -59,15 +59,23 @@
 # define putenv _putenv
 # define snprintf _snprintf
 # define fchmod(a,b)
-# define mkdir(path, perms) _mkdir(path)
 
 # define NS_T(str) L ## str
 # define NS_tsnprintf _snwprintf
 # define NS_tstrrchr wcsrchr
+# define NS_taccess _waccess
 # define NS_tchdir _wchdir
+# define NS_tchmod _wchmod
+# define NS_tmkdir(path, perms) _wmkdir(path)
 # define NS_tremove _wremove
 # define NS_tfopen _wfopen
 # define NS_tatoi _wtoi64
+#ifndef WINCE
+# define stat _stat
+#endif
+# define NS_tstat _wstat
+# define BACKUP_EXT L".moz-backup"
+# define LOG_S "%S"
 #else
 # include <sys/wait.h>
 # include <unistd.h>
@@ -75,10 +83,16 @@
 # define NS_T(str) str
 # define NS_tsnprintf snprintf
 # define NS_tstrrchr strrchr
+# define NS_taccess access
 # define NS_tchdir chdir
+# define NS_tchmod chmod
+# define NS_tmkdir mkdir
 # define NS_tremove remove
 # define NS_tfopen fopen
 # define NS_tatoi atoi
+# define NS_tstat stat
+# define BACKUP_EXT ".moz-backup"
+# define LOG_S "%s"
 #endif
 
 #include "bspatch.h"
@@ -297,6 +311,11 @@ private:
 
 //-----------------------------------------------------------------------------
 
+#ifdef WINCE
+// Since WinCE doesn't have a current working directory store the current
+// working directory specified in the command line arguments 
+static NS_tchar* gDestPath;
+#endif
 static NS_tchar* gSourcePath;
 static ArchiveReader gArchiveReader;
 #ifdef XP_WIN
@@ -392,10 +411,38 @@ mstrtok(const char *delims, char **str)
   return ret;
 }
 
-static void ensure_write_permissions(const char *path)
+#ifdef XP_WIN
+// Returns a wchar path. The path returned will be absolute on Windows CE /
+// Windows Mobile and relative on all other versions of Windows.
+static NS_tchar*
+get_wide_path(const char *path)
+{
+  WCHAR *s = (WCHAR*) malloc(MAXPATHLEN * sizeof(WCHAR));
+  if (!s)
+    return NULL;
+
+  WCHAR *c = s;
+  WCHAR wpath[MAXPATHLEN];
+  MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, MAXPATHLEN);
+#ifndef WINCE
+  wcscpy(c, wpath);
+  c += wcslen(wpath);
+#else
+  wcscpy(c, gDestPath);
+  c += wcslen(gDestPath);
+  wcscat(c, wpath);
+  c += wcslen(wpath);
+#endif
+  *c = NS_T('\0');
+  c++;
+  return s;
+}
+#endif
+
+static void ensure_write_permissions(const NS_tchar *path)
 {
 #ifdef XP_WIN
-  (void) chmod(path, _S_IREAD | _S_IWRITE);
+  (void) _wchmod(path, _S_IREAD | _S_IWRITE);
 #else
   struct stat fs;
   if (!stat(path, &fs) && !(fs.st_mode & S_IWUSR)) {
@@ -404,25 +451,25 @@ static void ensure_write_permissions(const char *path)
 #endif
 }
 
-static int ensure_remove(const char *path)
+static int ensure_remove(const NS_tchar *path)
 {
   ensure_write_permissions(path);
-  int rv = remove(path);
+  int rv = NS_tremove(path);
   if (rv)
-    LOG(("remove failed: %d,%d (%s)\n", rv, errno, path));
+    LOG(("remove failed: %d,%d (" LOG_S ")\n", rv, errno, path));
   return rv;
 }
 
-static FILE* ensure_open(const char *path, const char* flags, unsigned int options)
+static FILE* ensure_open(const NS_tchar *path, const NS_tchar* flags, unsigned int options)
 {
   ensure_write_permissions(path);
-  FILE* f = fopen(path, flags);
-  if (chmod(path, options) != 0) {
+  FILE* f = NS_tfopen(path, flags);
+  if (NS_tchmod(path, options) != 0) {
     fclose(f);
     return NULL;
   }
   struct stat ss;
-  if (stat(path, &ss) != 0 || ss.st_mode != options) {
+  if (NS_tstat(path, &ss) != 0 || ss.st_mode != options) {
     fclose(f);
     return NULL;
   }
@@ -430,30 +477,30 @@ static FILE* ensure_open(const char *path, const char* flags, unsigned int optio
 }
 
 // Ensure that the directory containing this file exists.
-static int ensure_parent_dir(const char *path)
+static int ensure_parent_dir(const NS_tchar *path)
 {
   int rv = OK;
 
-  char *slash = (char *) strrchr(path, '/');
-  if (slash)
-  {
-    *slash = '\0';
+  NS_tchar *slash = (NS_tchar *) NS_tstrrchr(path, NS_T('/'));
+  if (slash) {
+    *slash = NS_T('\0');
     rv = ensure_parent_dir(path);
     if (rv == OK) {
-      rv = mkdir(path, 0755);
-      // If the directory already exists, then ignore the error.
+      rv = NS_tmkdir(path, 0755);
+      // If the directory already exists, then ignore the error. On WinCE rv
+      // will equal 0 if the directory already exists.
       if (rv < 0 && errno != EEXIST) {
         rv = WRITE_ERROR;
       } else {
         rv = OK;
       }
     }
-    *slash = '/';
+    *slash = NS_T('/');
   }
   return rv;
 }
 
-static int copy_file(const char *spath, const char *dpath)
+static int copy_file(const NS_tchar *spath, const NS_tchar *dpath)
 {
   int rv = ensure_parent_dir(dpath);
   if (rv)
@@ -461,15 +508,15 @@ static int copy_file(const char *spath, const char *dpath)
 
   struct stat ss;
 
-  AutoFile sfile = fopen(spath, "rb");
+  AutoFile sfile = NS_tfopen(spath, NS_T("rb"));
   if (sfile == NULL || fstat(fileno(sfile), &ss)) {
-    LOG(("copy_file: failed to open or stat: %p,%s,%d\n", sfile.get(), spath, errno));
+    LOG(("copy_file: failed to open or stat: %p," LOG_S ",%d\n", sfile, spath, errno));
     return READ_ERROR;
   }
 
-  AutoFile dfile = ensure_open(dpath, "wb+", ss.st_mode); 
+  AutoFile dfile = ensure_open(dpath, NS_T("wb+"), ss.st_mode); 
   if (dfile == NULL) {
-    LOG(("copy_file: failed to open: %s,%d\n", dpath, errno));
+    LOG(("copy_file: failed to open: " LOG_S ",%d\n", dpath, errno));
     return WRITE_ERROR;
   }
 
@@ -498,13 +545,11 @@ static int copy_file(const char *spath, const char *dpath)
 
 //-----------------------------------------------------------------------------
 
-#define BACKUP_EXT ".moz-backup"
-
 // Create a backup copy of the specified file alongside it.
-static int backup_create(const char *path)
+static int backup_create(const NS_tchar *path)
 {
-  char backup[MAXPATHLEN];
-  snprintf(backup, sizeof(backup), "%s" BACKUP_EXT, path);
+  NS_tchar backup[MAXPATHLEN];
+  NS_tsnprintf(backup, sizeof(backup), NS_T("%s" BACKUP_EXT), path);
 
   return copy_file(path, backup);
 }
@@ -512,10 +557,10 @@ static int backup_create(const char *path)
 // Copy the backup copy of the specified file back overtop
 // the specified file.
 // XXX should be a file move instead
-static int backup_restore(const char *path)
+static int backup_restore(const NS_tchar *path)
 {
-  char backup[MAXPATHLEN];
-  snprintf(backup, sizeof(backup), "%s" BACKUP_EXT, path);
+  NS_tchar backup[MAXPATHLEN];
+  NS_tsnprintf(backup, sizeof(backup), NS_T("%s" BACKUP_EXT), path);
 
   int rv = copy_file(backup, path);
   if (rv)
@@ -529,10 +574,10 @@ static int backup_restore(const char *path)
 }
 
 // Discard the backup copy of the specified file.
-static int backup_discard(const char *path)
+static int backup_discard(const NS_tchar *path)
 {
-  char backup[MAXPATHLEN];
-  snprintf(backup, sizeof(backup), "%s" BACKUP_EXT, path);
+  NS_tchar backup[MAXPATHLEN];
+  NS_tsnprintf(backup, sizeof(backup), NS_T("%s" BACKUP_EXT), path);
 
   int rv = ensure_remove(backup);
   if (rv)
@@ -542,7 +587,7 @@ static int backup_discard(const char *path)
 }
 
 // Helper function for post-processing a temporary backup.
-static void backup_finish(const char *path, int status)
+static void backup_finish(const NS_tchar *path, int status)
 {
   if (status == OK)
     backup_discard(path);
@@ -586,7 +631,7 @@ private:
 class RemoveFile : public Action
 {
 public:
-  RemoveFile() : mFile(NULL), mSkip(0) { }
+  RemoveFile() : mFile(NULL), mDestFile(NULL), mSkip(0) { }
 
   int Parse(char *line);
   int Prepare();
@@ -595,6 +640,7 @@ public:
 
 private:
   const char* mFile;
+  const NS_tchar* mDestFile;
   int mSkip;
 };
 
@@ -607,35 +653,45 @@ RemoveFile::Parse(char *line)
   if (!mFile)
     return PARSE_ERROR;
 
+#ifdef XP_WIN
+  mDestFile = get_wide_path(mFile);
+  if (!mDestFile)
+    return PARSE_ERROR;
+#else
+  mDestFile = mFile;
+#endif
+
   return OK;
 }
 
 int
 RemoveFile::Prepare()
 {
-  LOG(("PREPARE REMOVE %s\n", mFile));
+  LOG(("PREPARE REMOVE " LOG_S "\n", mDestFile));
 
   // We expect the file to exist if we are to remove it.
-  int rv = access(mFile, F_OK);
+  int rv = NS_taccess(mDestFile, F_OK);
   if (rv) {
     LOG(("file cannot be removed because it does not exist; skipping\n"));
     mSkip = 1;
     return OK;
   }
 
-  char *slash = (char *) strrchr(mFile, '/');
+#ifndef WINCE
+  NS_tchar *slash = (NS_tchar *) NS_tstrrchr(mDestFile, NS_T('/'));
   if (slash) {
-    *slash = '\0';
-    rv = access(mFile, W_OK);
-    *slash = '/';
+    *slash = NS_T('\0');
+    rv = NS_taccess(mDestFile, W_OK);
+    *slash = NS_T('/');
   } else {
-    rv = access(".", W_OK);
+    rv = NS_taccess(NS_T("."), W_OK);
   }
 
   if (rv) {
     LOG(("access failed: %d\n", errno));
     return WRITE_ERROR;
   }
+#endif
 
   return OK;
 }
@@ -643,7 +699,7 @@ RemoveFile::Prepare()
 int
 RemoveFile::Execute()
 {
-  LOG(("EXECUTE REMOVE %s\n", mFile));
+  LOG(("EXECUTE REMOVE " LOG_S "\n", mDestFile));
 
   if (mSkip)
     return OK;
@@ -651,7 +707,7 @@ RemoveFile::Execute()
   // We expect the file to exist if we are to remove it.  We check here as well
   // as in PREPARE since we might have been asked to remove the same file more
   // than once: bug 311099.
-  int rv = access(mFile, F_OK);
+  int rv = NS_taccess(mDestFile, F_OK);
   if (rv) {
     LOG(("file cannot be removed because it does not exist; skipping\n"));
     mSkip = 1;
@@ -661,13 +717,13 @@ RemoveFile::Execute()
   // save a complete copy of the old file, and then remove the
   // old file.  we'll clean up the copy in Finish.
 
-  rv = backup_create(mFile);
+  rv = backup_create(mDestFile);
   if (rv) {
     LOG(("backup_create failed: %d\n", rv));
     return rv;
   }
 
-  rv = ensure_remove(mFile);
+  rv = ensure_remove(mDestFile);
   if (rv)
     return WRITE_ERROR;
 
@@ -677,18 +733,18 @@ RemoveFile::Execute()
 void
 RemoveFile::Finish(int status)
 {
-  LOG(("FINISH REMOVE %s\n", mFile));
+  LOG(("FINISH REMOVE " LOG_S "\n", mDestFile));
 
   if (mSkip)
     return;
 
-  backup_finish(mFile, status);
+  backup_finish(mDestFile, status);
 }
 
 class AddFile : public Action
 {
 public:
-  AddFile() : mFile(NULL) { }
+  AddFile() : mFile(NULL), mDestFile(NULL) { }
 
   virtual int Parse(char *line);
   virtual int Prepare(); // check that the source file exists
@@ -697,6 +753,7 @@ public:
 
 private:
   const char *mFile;
+  const NS_tchar *mDestFile;
 };
 
 int
@@ -708,13 +765,21 @@ AddFile::Parse(char *line)
   if (!mFile)
     return PARSE_ERROR;
 
+#ifdef XP_WIN
+  mDestFile = get_wide_path(mFile);
+  if (!mDestFile)
+    return PARSE_ERROR;
+#else
+  mDestFile = mFile;
+#endif
+
   return OK;
 }
 
 int
 AddFile::Prepare()
 {
-  LOG(("PREPARE ADD %s\n", mFile));
+  LOG(("PREPARE ADD " LOG_S "\n", mDestFile));
 
   return OK;
 }
@@ -722,37 +787,35 @@ AddFile::Prepare()
 int
 AddFile::Execute()
 {
-  LOG(("EXECUTE ADD %s\n", mFile));
+  LOG(("EXECUTE ADD " LOG_S "\n", mDestFile));
 
   int rv;
 
   // First make sure that we can actually get rid of any existing file.
-  if (access(mFile, F_OK) == 0)
-  {
-    rv = backup_create(mFile);
+  rv = NS_taccess(mDestFile, F_OK);
+  if (rv == 0) {
+    rv = backup_create(mDestFile);
     if (rv)
       return rv;
 
-    rv = ensure_remove(mFile);
+    rv = ensure_remove(mDestFile);
     if (rv)
       return WRITE_ERROR;
-  }
-  else
-  {
-    rv = ensure_parent_dir(mFile);
+  } else {
+    rv = ensure_parent_dir(mDestFile);
     if (rv)
       return rv;
   }
-    
-  return gArchiveReader.ExtractFile(mFile, mFile);
+
+  return gArchiveReader.ExtractFile(mFile, mDestFile);
 }
 
 void
 AddFile::Finish(int status)
 {
-  LOG(("FINISH ADD %s\n", mFile));
+  LOG(("FINISH ADD " LOG_S "\n", mDestFile));
 
-  backup_finish(mFile, status);
+  backup_finish(mDestFile, status);
 }
 
 class PatchFile : public Action
@@ -773,6 +836,7 @@ private:
 
   const char *mPatchFile;
   const char *mFile;
+  const NS_tchar *mDestFile;
   int mPatchIndex;
   MBSPatchHeader header;
   FILE* pfile;
@@ -855,13 +919,21 @@ PatchFile::Parse(char *line)
   if (!mFile)
     return PARSE_ERROR;
 
+#ifdef XP_WIN
+  mDestFile = get_wide_path(mFile);
+  if (!mDestFile)
+    return PARSE_ERROR;
+#else
+  mDestFile = mFile;
+#endif
+
   return OK;
 }
 
 int
 PatchFile::Prepare()
 {
-  LOG(("PREPARE PATCH %s\n", mFile));
+  LOG(("PREPARE PATCH " LOG_S "\n", mDestFile));
 
   // extract the patch to a temporary file
   mPatchIndex = sPatchIndex++;
@@ -893,7 +965,7 @@ PatchFile::Prepare()
   if (rv)
     return rv;
 
-  AutoFile ofile = fopen(mFile, "rb");
+  AutoFile ofile = NS_tfopen(mDestFile, NS_T("rb"));
   if (ofile == NULL)
     return READ_ERROR;
 
@@ -906,23 +978,23 @@ PatchFile::Prepare()
 int
 PatchFile::Execute()
 {
-  LOG(("EXECUTE PATCH %s\n", mFile));
+  LOG(("EXECUTE PATCH %s\n", mDestFile));
 
   // Create backup copy of the destination file before proceeding.
 
   struct stat ss;
-  if (stat(mFile, &ss))
+  if (NS_tstat(mDestFile, &ss))
     return READ_ERROR;
 
-  int rv = backup_create(mFile);
+  int rv = backup_create(mDestFile);
   if (rv)
     return rv;
 
-  rv = ensure_remove(mFile);
+  rv = ensure_remove(mDestFile);
   if (rv)
     return WRITE_ERROR;
 
-  AutoFile ofile = ensure_open(mFile, "wb+", ss.st_mode);
+  AutoFile ofile = ensure_open(mDestFile, NS_T("wb+"), ss.st_mode);
   if (ofile == NULL)
     return WRITE_ERROR;
 
@@ -932,9 +1004,9 @@ PatchFile::Execute()
 void
 PatchFile::Finish(int status)
 {
-  LOG(("FINISH PATCH %s\n", mFile));
+  LOG(("FINISH PATCH %s\n", mDestFile));
 
-  backup_finish(mFile, status);
+  backup_finish(mDestFile, status);
 }
 
 class AddIfFile : public AddFile
@@ -1177,7 +1249,7 @@ LaunchCallbackApp(const NS_tchar *workingDir, int argc, NS_tchar **argv)
 
   // Run from the specified working directory (see bug 312360).
   if(NS_tchdir(workingDir) != 0)
-    LOG(("Warning: chdir failed"));
+    LOG(("Warning: chdir failed\n"));
 
 #if defined(USE_EXECV)
   execv(argv[0], argv);
@@ -1250,10 +1322,17 @@ int NS_main(int argc, NS_tchar **argv)
   // necessary for the parent process to exit before its executable image may
   // be altered.
 
+#ifndef WINCE
   if (argc < 2) {
     fprintf(stderr, "Usage: updater <dir-path> [parent-pid [working-dir callback args...]]\n");
     return 1;
   }
+#else
+  if (argc < 4) {
+    fprintf(stderr, "Usage: updater <dir-path> parent-pid <working-dir> [callback args...]]\n");
+    return 1;
+  }
+#endif
 
   if (argc > 2 ) {
     int pid = NS_tatoi(argv[2]);
@@ -1366,6 +1445,9 @@ int NS_main(int argc, NS_tchar **argv)
 #endif
 
   gSourcePath = argv[1];
+#ifdef WINCE
+  gDestPath = argv[3];
+#endif
 
   LogInit();
 
@@ -1477,8 +1559,7 @@ ActionList::Execute()
     UpdateProgressUI(1.0f + float(i++) / divisor);
 
     int rv = a->Execute();
-    if (rv)
-    {
+    if (rv) {
       LOG(("### execution failed\n"));
       return rv;
     }
diff --git a/toolkit/mozapps/update/src/updater/updater_wince.cpp b/toolkit/mozapps/update/src/updater/updater_wince.cpp
index 3f6ea35712b..04ca864ca24 100644
--- a/toolkit/mozapps/update/src/updater/updater_wince.cpp
+++ b/toolkit/mozapps/update/src/updater/updater_wince.cpp
@@ -42,55 +42,39 @@
 # define W_OK 02
 # define R_OK 04
 
-int remove(const char* path) 
+int chmod(const char* path, unsigned int mode) 
 {
-  if (!_unlink(path)) {
-    return 0;
-  } 
-  else if (GetLastError() == ERROR_ACCESS_DENIED) {
-    WCHAR wpath[MAX_PATH];
-  
-    MultiByteToWideChar(CP_ACP,
-			0,
-			path,
-			-1,
-			wpath,
-			MAX_PATH );
-    return RemoveDirectoryW(wpath) ? 0:-1;
-  } 
-  else {
-    return -1;
-  }
+  return 0;
 }
 
-int chmod(const char* path, unsigned int mode) 
+int _wchmod(const WCHAR* path, unsigned int mode) 
 {
   return 0;
 }
 
 int fstat(FILE* handle, struct stat* buff)
 {
-    int position = ftell(handle);
-    if (position < 0)
-        return -1;
+  int position = ftell(handle);
+  if (position < 0)
+    return -1;
 
-    if (fseek(handle, 0, SEEK_END) < 0)
-        return -1;
+  if (fseek(handle, 0, SEEK_END) < 0)
+    return -1;
 
-    buff->st_size = ftell(handle);
+  buff->st_size = ftell(handle);
 
-    if (fseek(handle, position, SEEK_SET) < 0)
-        return -1;
+  if (fseek(handle, position, SEEK_SET) < 0)
+    return -1;
 
-    if (buff->st_size < 0)
-        return -1;
+  if (buff->st_size < 0)
+    return -1;
 
-    buff->st_mode = _S_IFREG | _S_IREAD | _S_IWRITE | _S_IEXEC;
-    /* can't get time from a file handle on wince */
-    buff->st_ctime = 0;
-    buff->st_atime = 0;
-    buff->st_mtime = 0;
-    return 0;
+  buff->st_mode = _S_IFREG | _S_IREAD | _S_IWRITE | _S_IEXEC;
+  /* can't get time from a file handle on wince */
+  buff->st_ctime = 0;
+  buff->st_atime = 0;
+  buff->st_mtime = 0;
+  return 0;
 }
 
 int stat(const char* path, struct stat* buf) 
@@ -101,16 +85,20 @@ int stat(const char* path, struct stat* buf)
   return rv;
 }
 
-int _mkdir(const char* path) 
+int _wstat(const WCHAR* path, struct stat* buf) 
 {
-  WCHAR wpath[MAX_PATH];
-  MultiByteToWideChar(CP_ACP,
-		      0,
-		      path,
-		      -1,
-		      wpath,
-		      MAX_PATH );
-  return CreateDirectoryW(wpath, NULL) ? 0 : -1;
+  FILE* f = _wfopen(path, L"r");
+  int rv = fstat(f, buf);
+  fclose(f);
+  return rv;
+}
+
+int _wmkdir(const WCHAR* path) 
+{
+  DWORD dwAttr = GetFileAttributesW(path);
+  if (dwAttr != INVALID_FILE_ATTRIBUTES)
+    return (dwAttr & FILE_ATTRIBUTE_DIRECTORY) ? 0 : -1;
+  return CreateDirectoryW(path, NULL) ? 0 : -1;
 }
 
 FILE* fileno(FILE* f) 
@@ -127,22 +115,14 @@ int _access(const char* path, int amode)
 		      -1,
 		      wpath,
 		      MAX_PATH );
-   switch (amode) {
-    case R_OK:
-      return (GetFileAttributesW(wpath) != INVALID_FILE_ATTRIBUTES);
-    default:
-      return 0;
-  }
+  return _waccess(wpath, amode);
 }
+
 int _waccess(const WCHAR* path, int amode)
 {
-  switch (amode) {
-    case R_OK:
-      return (GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES);
-    default:
-      return 0;
-  }
-
+  if (amode == F_OK)
+    return (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) ? -1 : 0;
+  return -1;
 }
 
 int _wremove(const WCHAR* wpath) 
diff --git a/toolkit/mozapps/update/src/updater/updater_wince.h b/toolkit/mozapps/update/src/updater/updater_wince.h
index 11e300f72da..a32d6a69087 100644
--- a/toolkit/mozapps/update/src/updater/updater_wince.h
+++ b/toolkit/mozapps/update/src/updater/updater_wince.h
@@ -54,11 +54,11 @@ struct stat {
   time_t st_atime;
   time_t st_mtime;
 };
-int remove(const char* path);
-int chmod(const char* path, unsigned int mode);
+int _wchmod(const WCHAR* path, unsigned int mode);
 int fstat(FILE* handle, struct stat* buff);
 int stat(const char* path, struct stat* buf);
-int _mkdir(const char* path);
+int _wstat(const WCHAR* path, struct stat* buf);
+int _wmkdir(const WCHAR* path);
 int access(const char* path, int amode);
 int _waccess(const WCHAR* path, int amode);
 int _wremove(const WCHAR* wpath);

From 1627769f99bab3fd25acb0b9b80d20dd8ffa5e7d Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Wed, 29 Jul 2009 23:01:43 -0700
Subject: [PATCH 012/175] Updated tests for Bug 506696. r=me

---
 .../test/unit/data/aus-0110_general.mar       | Bin 1444 -> 1577 bytes
 .../test/unit/data/aus-0111_general.mar       | Bin 1255 -> 1392 bytes
 .../update/test/unit/test_0110_general.js     |  46 ++--
 .../update/test/unit/test_0111_general.js     |  63 +++---
 .../update/test/unit/test_0112_general.js     | 199 ++++++++++++++++++
 5 files changed, 258 insertions(+), 50 deletions(-)
 create mode 100644 toolkit/mozapps/update/test/unit/test_0112_general.js

diff --git a/toolkit/mozapps/update/test/unit/data/aus-0110_general.mar b/toolkit/mozapps/update/test/unit/data/aus-0110_general.mar
index f24dfd4fc9c532b4ba405b17346ff814a625f754..9642ff94e25a0842136a381bbb341f823eff4540 100644
GIT binary patch
delta 302
zcmZ3&y^<%>*D=VDfq}KaDJsL#&@oaiI5KVRDH#R^rP~b*0s)L07#J9qEsk+eU<g<y
z?8~@JVWJ4Ht+PPGhFt&NCR-oBB)**?JU(h--C?&*m^zjORLDl^_$ED^^Gbr>`RSpc
z{o+Ng76B7LMsAF~$TIl{i)H;*pphIvoXEhyxUIAxC9xz`FE=qSGcC2a1Srgq$-uyp
z4wB1FEQ&7y3hEo`8^(iid}eN9da9vbK^{;61Iq;<VS+<tNoqw2&|?g&EI`5xNs&3S
ac_39rAXQdqs!H^Y^o@X)0x{4HAfo`cAXpgy

delta 221
zcmZ3<vxGa=*D=VDfq_-eDJsL#&@oaiI5OPsP#OaRcXR`TKmg+g1_p*@i(?!V7#wab
z$z1$Z@l}<;GGSlFWom~l->()q6&K8G=Q+WetGu&W_~6UQ-p--%-8+@$Xn1JPPc&xO
zn0b+<3}`|T5OV-=C<6oIw$g%>#FA9K+{C=hwAA7fpfE!$0|QGsNG><AD82+JsGpge
kn4W5=SC9u3W?(r2Bur4`OHwOJfbM2s`2i%%Fr<ta0EE#(bpQYW

diff --git a/toolkit/mozapps/update/test/unit/data/aus-0111_general.mar b/toolkit/mozapps/update/test/unit/data/aus-0111_general.mar
index 68a8983ed1d9dc7f3ef21347a4084f0163078894..ccad6aab4fa66c64161db68fa71f1f2b23d6989e 100644
GIT binary patch
delta 323
zcmaFP`GKq6*D=VDfq`YCQ&fhfp<|?4aOD0-gKZ29G0_bS0s)LW7#JAVJ-+Lpz>s0E
zvg1GlL)WZc;VWqimwokjRu|jlExbx}%E=z~76qs7qMR2xt|uK@b~<}mE}P{j$f@me
z_aUc^c-;=Yh!sX5PriAc`jC?s7p)^2qwhKMiCow6q<0=1%ejQaU#p27*qHa1d9odg
zfz589jT}H+&%nUAt+XH|u_RS5H!&|WEw#7=D9q5#z`(o^B$u056kh@q)Hl>Oj0fZR
v$qQISax{R7^l>OCNv$XWdY6GE97yQmQDh8K)PkYNSl<|E6%Ye$2AKo^l?i7E

delta 228
zcmeys^_;Wb*D=VDfq^C4DJsL#&@oaiIC7G%i3tOP*6jucfdIxG3=9nG9^Z9PVDRwt
zIB_|{p~}HEAcM_u;$)S$ZLKfPE;}(Tjn#;GVc(=8RX_g>KL<;umh+xVb|`CEE&brN
zbdJ}ux0~w4i(D-NCV<RE*kb<LCX9ihWaErC%sfClDu9>+h|?zTWf2$3V_;xj$iTq3
pEjO_!z9hA{M1S%J77=59paOjq;gZyf5}@-LSnPm=E{2pb0{}LsNPYkS

diff --git a/toolkit/mozapps/update/test/unit/test_0110_general.js b/toolkit/mozapps/update/test/unit/test_0110_general.js
index 372bea97050..fa77b9d1af0 100644
--- a/toolkit/mozapps/update/test/unit/test_0110_general.js
+++ b/toolkit/mozapps/update/test/unit/test_0110_general.js
@@ -36,15 +36,14 @@
  * ***** END LICENSE BLOCK *****
  */
 
-/* General Complete MAR File Patch Apply Tests */
+/* General Complete MAR File Patch Apply Test */
 
 function run_test() {
   // The directory the updates will be applied to is the current working
   // directory and not dist/bin.
-  var testDir = do_get_cwd();
+  var testDir = do_get_file("mar_test", true);
   // The mar files were created with all files in a subdirectory named
   // mar_test... clear it out of the way if it exists and then create it.
-  testDir.append("mar_test");
   try {
     if (testDir.exists())
       testDir.remove(true);
@@ -55,12 +54,12 @@ function run_test() {
   }
   dump("Testing: successful removal of the directory used to apply the mar file\n");
   do_check_false(testDir.exists());
+  testDir = do_get_file("mar_test/1/1_1/", true);
   testDir.create(AUS_Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY);
 
   // Create an empty test file to test the complete mar's ability to replace an
   // existing file.
-  var testFile = testDir.clone();
-  testFile.append("text1");
+  var testFile = do_get_file("mar_test/1/1_1/1_1_text1", true);
   testFile.create(AUS_Ci.nsIFile.NORMAL_FILE_TYPE, PERMS_FILE);
 
   var binDir = getGREDir();
@@ -81,9 +80,7 @@ function run_test() {
   }
 
   // Use a directory outside of dist/bin to lessen the garbage in dist/bin
-  var updatesSubDir = do_get_cwd();
-  updatesSubDir.append("0110_complete_mar");
-
+  var updatesSubDir = do_get_file("0110_complete_mar", true);
   try {
     // Mac OS X intermittently fails when removing the dir where the updater
     // binary was launched.
@@ -104,14 +101,24 @@ function run_test() {
        "a complete mar\n");
   do_check_eq(exitValue, 0);
 
+  dump("Testing: update.status should be set to STATE_SUCCEEDED\n");
+  testFile = updatesSubDir.clone();
+  testFile.append("update.status");
+  do_check_eq(readFile(testFile).split("\n")[0], STATE_SUCCEEDED);
+
   dump("Testing: contents of files added by a complete mar\n");
-  do_check_eq(getFileBytes(getTestFile(testDir, "text1")), "ToBeModified\n");
-  do_check_eq(getFileBytes(getTestFile(testDir, "text2")), "ToBeDeleted\n");
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text1", true)),
+              "ToBeModified\n");
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text2", true)),
+              "ToBeDeleted\n");
 
   var refImage = do_get_file("data/aus-0110_general_ref_image.png");
-  var srcImage = getTestFile(testDir, "image1.png");
+  var srcImage = do_get_file("mar_test/1/1_1/1_1_image1.png", true);
   do_check_eq(getFileBytes(srcImage), getFileBytes(refImage));
 
+  do_check_eq(getFileBytes(do_get_file("mar_test/2/2_1/2_1_text1", true)),
+              "ToBeDeleted\n");
+
   try {
     // Mac OS X intermittently fails when removing the dir where the updater
     // binary was launched.
@@ -146,25 +153,18 @@ function runUpdate(aUpdatesSubDir, aUpdater) {
   if (/ /.test(updatesSubDirPath))
     updatesSubDirPath = '"' + updatesSubDirPath + '"';
 
+  var cwdPath = do_get_file("/", true).path;
+  if (/ /.test(cwdPath))
+    cwdPath = '"' + cwdPath + '"';
+
   var process = AUS_Cc["@mozilla.org/process/util;1"].
                 createInstance(AUS_Ci.nsIProcess);
   process.init(updateBin);
-  var args = [updatesSubDirPath];
+  var args = [updatesSubDirPath, 0, cwdPath];
   process.run(true, args, args.length);
   return process.exitValue;
 }
 
-// Gets a file in the mar_test subdirectory of the current working directory
-// which is where the mar will be applied.
-function getTestFile(aDir, aLeafName) {
-  var file = aDir.clone();
-  file.append(aLeafName);
-  if (!(file instanceof AUS_Ci.nsILocalFile))
-    do_throw("File must be a nsILocalFile for this test! File: " + aLeafName);
-
-  return file;
-}
-
 // Returns the binary contents of a file
 function getFileBytes(aFile) {
   var fis = AUS_Cc["@mozilla.org/network/file-input-stream;1"].
diff --git a/toolkit/mozapps/update/test/unit/test_0111_general.js b/toolkit/mozapps/update/test/unit/test_0111_general.js
index 6639ef5b913..17dcb54dbac 100644
--- a/toolkit/mozapps/update/test/unit/test_0111_general.js
+++ b/toolkit/mozapps/update/test/unit/test_0111_general.js
@@ -36,15 +36,14 @@
  * ***** END LICENSE BLOCK *****
  */
 
-/* General Partial MAR File Patch Apply Tests */
+/* General Partial MAR File Patch Apply Test */
 
 function run_test() {
   // The directory the updates will be applied to is the current working
   // directory and not dist/bin.
-  var testDir = do_get_cwd();
+  var testDir = do_get_file("mar_test", true);
   // The mar files were created with all files in a subdirectory named
   // mar_test... clear it out of the way if it exists and then create it.
-  testDir.append("mar_test");
   try {
     if (testDir.exists())
       testDir.remove(true);
@@ -55,20 +54,22 @@ function run_test() {
   }
   dump("Testing: successful removal of the directory used to apply the mar file\n");
   do_check_false(testDir.exists());
+  testDir = do_get_file("mar_test/1/1_1/", true);
   testDir.create(AUS_Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY);
 
   // Create the files to test the partial mar's ability to modify and delete
   // files.
-  var testFile = testDir.clone();
-  testFile.append("text1");
+  var testFile = do_get_file("mar_test/1/1_1/1_1_text1", true);
   writeFile(testFile, "ToBeModified\n");
 
-  testFile = testDir.clone();
-  testFile.append("text2");
+  testFile = do_get_file("mar_test/1/1_1/1_1_text2", true);
   writeFile(testFile, "ToBeDeleted\n");
 
   testFile = do_get_file("data/aus-0110_general_ref_image.png");
-  testFile.copyTo(testDir, "image1.png");
+  testFile.copyTo(testDir, "1_1_image1.png");
+
+  testFile = do_get_file("mar_test/2/2_1/2_1_text1", true);
+  writeFile(testFile, "ToBeDeleted\n");
 
   var binDir = getGREDir();
 
@@ -88,9 +89,7 @@ function run_test() {
   }
 
   // Use a directory outside of dist/bin to lessen the garbage in dist/bin
-  var updatesSubDir = do_get_cwd();
-  updatesSubDir.append("0111_partial_mar");
-
+  var updatesSubDir = do_get_file("0111_complete_mar", true);
   try {
     // Mac OS X intermittently fails when removing the dir where the updater
     // binary was launched.
@@ -111,16 +110,33 @@ function run_test() {
        "a partial mar\n");
   do_check_eq(exitValue, 0);
 
+  dump("Testing: update.status should be set to STATE_SUCCEEDED\n");
+  testFile = updatesSubDir.clone();
+  testFile.append("update.status");
+  do_check_eq(readFile(testFile).split("\n")[0], STATE_SUCCEEDED);
+
   dump("Testing: removal of a file and contents of added / modified files by " +
        "a partial mar\n");
-  do_check_eq(getFileBytes(getTestFile(testDir, "text1")), "Modified\n");
-  do_check_false(getTestFile(testDir, "text2").exists()); // file removed
-  do_check_eq(getFileBytes(getTestFile(testDir, "text3")), "Added\n");
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text1", true)),
+              "Modified\n");
+  do_check_false(do_get_file("mar_test/1/1_1/1_1_text2", true).exists());
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text3", true)),
+              "Added\n");
 
   var refImage = do_get_file("data/aus-0111_general_ref_image.png");
-  var srcImage = getTestFile(testDir, "image1.png");
+  var srcImage = do_get_file("mar_test/1/1_1/1_1_image1.png", true);
   do_check_eq(getFileBytes(srcImage), getFileBytes(refImage));
 
+  dump("Testing: removal of a file by a partial mar\n");
+  do_check_false(do_get_file("mar_test/2/2_1/2_1_text1", true).exists());
+
+  do_check_eq(getFileBytes(do_get_file("mar_test/3/3_1/3_1_text1", true)),
+              "Added\n");
+
+  dump("Testing: directory still exists after removal of the last file in " +
+       "the directory (bug 386760)\n");
+  do_check_true(do_get_file("mar_test/2/2_1/", true).exists());
+
   try {
     // Mac OS X intermittently fails when removing the dir where the updater
     // binary was launched.
@@ -155,25 +171,18 @@ function runUpdate(aUpdatesSubDir, aUpdater) {
   if (/ /.test(updatesSubDirPath))
     updatesSubDirPath = '"' + updatesSubDirPath + '"';
 
+  var cwdPath = do_get_file("/", true).path;
+  if (/ /.test(cwdPath))
+    cwdPath = '"' + cwdPath + '"';
+
   var process = AUS_Cc["@mozilla.org/process/util;1"].
                 createInstance(AUS_Ci.nsIProcess);
   process.init(updateBin);
-  var args = [updatesSubDirPath];
+  var args = [updatesSubDirPath, 0, cwdPath];
   process.run(true, args, args.length);
   return process.exitValue;
 }
 
-// Gets a file in the mar_test subdirectory of the current working directory
-// which is where the mar will be applied.
-function getTestFile(aDir, aLeafName) {
-  var file = aDir.clone();
-  file.append(aLeafName);
-  if (!(file instanceof AUS_Ci.nsILocalFile))
-    do_throw("File must be a nsILocalFile for this test! File: " + aLeafName);
-
-  return file;
-}
-
 // Returns the binary contents of a file
 function getFileBytes(aFile) {
   var fis = AUS_Cc["@mozilla.org/network/file-input-stream;1"].
diff --git a/toolkit/mozapps/update/test/unit/test_0112_general.js b/toolkit/mozapps/update/test/unit/test_0112_general.js
new file mode 100644
index 00000000000..1672ca99aba
--- /dev/null
+++ b/toolkit/mozapps/update/test/unit/test_0112_general.js
@@ -0,0 +1,199 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Application Update Service.
+ *
+ * The Initial Developer of the Original Code is
+ * Robert Strong <robert.bugzilla@gmail.com>.
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Mozilla Foundation <http://www.mozilla.org/>. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+/* General Partial MAR File Patch Apply Failure Test */
+
+function run_test() {
+  // The directory the updates will be applied to is the current working
+  // directory and not dist/bin.
+  var testDir = do_get_file("mar_test", true);
+  // The mar files were created with all files in a subdirectory named
+  // mar_test... clear it out of the way if it exists and then create it.
+  try {
+    if (testDir.exists())
+      testDir.remove(true);
+  }
+  catch (e) {
+    dump("Unable to remove directory\npath: " + testDir.path +
+         "\nException: " + e + "\n");
+  }
+  dump("Testing: successful removal of the directory used to apply the mar file\n");
+  do_check_false(testDir.exists());
+  testDir = do_get_file("mar_test/1/1_1/", true);
+  testDir.create(AUS_Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY);
+
+  // Create the files to test the partial mar's ability to modify and delete
+  // files.
+  var testFile = do_get_file("mar_test/1/1_1/1_1_text1", true);
+  writeFile(testFile, "ShouldNotBeModified\n");
+
+  testFile = do_get_file("mar_test/1/1_1/1_1_text2", true);
+  writeFile(testFile, "ShouldNotBeDeleted\n");
+
+  testFile = do_get_file("data/aus-0111_general_ref_image.png");
+  testFile.copyTo(testDir, "1_1_image1.png");
+
+  testFile = do_get_file("mar_test/2/2_1/2_1_text1", true);
+  writeFile(testFile, "ShouldNotBeDeleted\n");
+
+  var binDir = getGREDir();
+
+  // The updater binary file
+  var updater = binDir.clone();
+  updater.append("updater.app");
+  if (!updater.exists()) {
+    updater = binDir.clone();
+    updater.append("updater.exe");
+    if (!updater.exists()) {
+      updater = binDir.clone();
+      updater.append("updater");
+      if (!updater.exists()) {
+        do_throw("Unable to find updater binary!");
+      }
+    }
+  }
+
+  // Use a directory outside of dist/bin to lessen the garbage in dist/bin
+  var updatesSubDir = do_get_file("0112_complete_mar", true);
+  try {
+    // Mac OS X intermittently fails when removing the dir where the updater
+    // binary was launched.
+    if (updatesSubDir.exists())
+      updatesSubDir.remove(true);
+  }
+  catch (e) {
+    dump("Unable to remove directory\npath: " + updatesSubDir.path +
+         "\nException: " + e + "\n");
+  }
+
+  var mar = do_get_file("data/aus-0111_general.mar");
+  mar.copyTo(updatesSubDir, "update.mar");
+
+  // apply the partial mar and check the innards of the files
+  var exitValue = runUpdate(updatesSubDir, updater);
+  dump("Testing: updater binary process exitValue for success when applying " +
+       "a partial mar\n");
+  do_check_eq(exitValue, 0);
+
+  dump("Testing: update.status should be set to STATE_FAILED\n");
+  testFile = updatesSubDir.clone();
+  testFile.append("update.status");
+  // The update status format for a failure is failed: # where # is the error
+  // code for the failure.
+  do_check_eq(readFile(testFile).split(": ")[0], STATE_FAILED);
+
+  dump("Testing: files should not be modified or deleted when an update " +
+       "fails\n");
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text1", true)),
+              "ShouldNotBeModified\n");
+  do_check_true(do_get_file("mar_test/1/1_1/1_1_text2", true).exists());
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text2", true)),
+              "ShouldNotBeDeleted\n");
+
+  var refImage = do_get_file("data/aus-0111_general_ref_image.png");
+  var srcImage = do_get_file("mar_test/1/1_1/1_1_image1.png", true);
+  do_check_eq(getFileBytes(srcImage), getFileBytes(refImage));
+
+  dump("Testing: removal of a file by a partial mar\n");
+  do_check_true(do_get_file("mar_test/2/2_1/2_1_text1", true).exists());
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text2", true)),
+              "ShouldNotBeDeleted\n");
+
+  do_check_false(do_get_file("mar_test/3/3_1/3_1_text1", true).exists());
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text2", true)),
+              "ShouldNotBeDeleted\n");
+
+  try {
+    // Mac OS X intermittently fails when removing the dir where the updater
+    // binary was launched.
+    if (updatesSubDir.exists())
+      updatesSubDir.remove(true);
+  }
+  catch (e) {
+    dump("Unable to remove directory\npath: " + updatesSubDir.path +
+         "\nException: " + e + "\n");
+  }
+
+  cleanUp();
+}
+
+// Launches the updater binary to apply a mar file
+function runUpdate(aUpdatesSubDir, aUpdater) {
+  // Copy the updater binary to the update directory so the updater.ini is not
+  // in the same directory as it is. This prevents ui from displaying and the
+  // PostUpdate executable which is defined in the updater.ini from launching.
+  aUpdater.copyTo(aUpdatesSubDir, aUpdater.leafName);
+  var updateBin = aUpdatesSubDir.clone();
+  updateBin.append(aUpdater.leafName);
+  if (updateBin.leafName == "updater.app") {
+    updateBin.append("Contents");
+    updateBin.append("MacOS");
+    updateBin.append("updater");
+    if (!updateBin.exists())
+      do_throw("Unable to find the updater executable!");
+  }
+
+  var updatesSubDirPath = aUpdatesSubDir.path;
+  if (/ /.test(updatesSubDirPath))
+    updatesSubDirPath = '"' + updatesSubDirPath + '"';
+
+  var cwdPath = do_get_file("/", true).path;
+  if (/ /.test(cwdPath))
+    cwdPath = '"' + cwdPath + '"';
+
+  var process = AUS_Cc["@mozilla.org/process/util;1"].
+                createInstance(AUS_Ci.nsIProcess);
+  process.init(updateBin);
+  var args = [updatesSubDirPath, 0, cwdPath];
+  process.run(true, args, args.length);
+  return process.exitValue;
+}
+
+// Returns the binary contents of a file
+function getFileBytes(aFile) {
+  var fis = AUS_Cc["@mozilla.org/network/file-input-stream;1"].
+            createInstance(AUS_Ci.nsIFileInputStream);
+  fis.init(aFile, -1, -1, false);
+  var bis = AUS_Cc["@mozilla.org/binaryinputstream;1"].
+            createInstance(AUS_Ci.nsIBinaryInputStream);
+  bis.setInputStream(fis);
+  var data = bis.readBytes(bis.available());
+  bis.close();
+  fis.close();
+  return data;
+}

From 478624283e827d457d5259895c4b7c076c7f5116 Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Wed, 29 Jul 2009 23:01:50 -0700
Subject: [PATCH 013/175] Bug 504432 - [WinCE] updater.exe not launched when
 there is an update during startup. r=vlad

---
 toolkit/xre/nsUpdateDriver.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp
index ba6f94ff055..6d981e3865d 100644
--- a/toolkit/xre/nsUpdateDriver.cpp
+++ b/toolkit/xre/nsUpdateDriver.cpp
@@ -125,12 +125,11 @@ GetCurrentWorkingDir(char *buf, size_t size)
   if (DosQueryPathInfo( ".", FIL_QUERYFULLNAME, buf, size))
     return NS_ERROR_FAILURE;
 #elif defined(XP_WIN)
-  wchar_t *wpath = _wgetcwd(NULL, size);
-  if (!wpath)
+  wchar_t wpath[MAX_PATH];
+  if (!_wgetcwd(wpath, size))
     return NS_ERROR_FAILURE;
   NS_ConvertUTF16toUTF8 path(wpath);
   strncpy(buf, path.get(), size);
-  free(wpath);
 #else
   if(!getcwd(buf, size))
     return NS_ERROR_FAILURE;

From 500d9d724c630e3e2a456c8d969195fcc04b9011 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Thu, 28 May 2009 11:09:05 -0700
Subject: [PATCH 014/175] Bug 189519 - Implement CSS3 (-moz- for
 now)background-size.  r=dbaron, other useful review comments from roc/bz

---
 dom/interfaces/css/nsIDOMNSCSS2Properties.idl |   5 +-
 gfx/public/nsCoord.h                          |  23 +-
 layout/base/nsCSSRendering.cpp                | 216 ++++++++++++++----
 layout/base/nsStyleConsts.h                   |   5 +
 .../background-size-auto-auto.html            |  20 ++
 .../background-size-auto-length-ref.html      |  23 ++
 .../background-size-auto-length.html          |  25 ++
 .../background-size-auto-percent.html         |  25 ++
 .../backgrounds/background-size-auto-ref.html |  24 ++
 .../backgrounds/background-size-auto.html     |  20 ++
 ...ackground-size-body-contain-no-repeat.html |  17 ++
 ...ackground-size-body-contain-not-fixed.html |  17 ++
 .../background-size-body-contain.html         |  16 ++
 .../background-size-body-cover-no-repeat.html |  17 ++
 .../background-size-body-cover-not-fixed.html |  17 ++
 .../background-size-body-cover-ref.html       |  14 ++
 .../background-size-body-cover.html           |  16 ++
 ...d-size-body-percent-percent-no-repeat.html |  17 ++
 ...d-size-body-percent-percent-not-fixed.html |  16 ++
 ...ize-body-percent-percent-overflow-ref.html |  14 ++
 ...nd-size-body-percent-percent-overflow.html |  31 +++
 ...kground-size-body-percent-percent-ref.html |  14 ++
 .../background-size-body-percent-percent.html |  16 ++
 ...background-size-body-single-not-fixed.html |  16 ++
 .../background-size-bounding-box.html         |  36 +++
 ...ckground-size-contain-clip-border-ref.html |  29 +++
 .../background-size-contain-clip-border.html  |  27 +++
 ...lip-padding-origin-border-padding-ref.html |  40 ++++
 ...in-clip-padding-origin-border-padding.html |  30 +++
 ...ontain-clip-padding-origin-border-ref.html |  29 +++
 ...ze-contain-clip-padding-origin-border.html |  28 +++
 ...kground-size-contain-clip-padding-ref.html |  29 +++
 .../background-size-contain-clip-padding.html |  27 +++
 ...size-contain-position-fifty-fifty-ref.html |  28 +++
 ...und-size-contain-position-fifty-fifty.html |  26 +++
 .../background-size-contain-ref.html          |  23 ++
 .../backgrounds/background-size-contain.html  |  25 ++
 .../background-size-continuous.html           |  36 +++
 .../background-size-cover-bounding-box.html   |  37 +++
 .../background-size-cover-continuous.html     |  37 +++
 .../background-size-cover-each-box.html       |  37 +++
 .../background-size-cover-ref.html            |  18 ++
 .../backgrounds/background-size-cover.html    |  20 ++
 .../backgrounds/background-size-each-box.html |  36 +++
 .../background-size-length-auto.html          |  25 ++
 .../background-size-length-length-ref.html    |  23 ++
 .../background-size-length-length.html        |  25 ++
 .../background-size-length-percent-ref.html   |  23 ++
 .../background-size-length-percent.html       |  25 ++
 .../backgrounds/background-size-length.html   |  25 ++
 ...nd-size-no-intrinsic-height-image-ref.html |  23 ++
 ...ground-size-no-intrinsic-height-image.html |  25 ++
 ...und-size-no-intrinsic-width-image-ref.html |  23 ++
 ...kground-size-no-intrinsic-width-image.html |  25 ++
 .../background-size-percent-auto.html         |  25 ++
 .../background-size-percent-length.html       |  25 ++
 .../background-size-percent-percent-ref.html  |  23 ++
 ...ound-size-percent-percent-stretch-ref.html |  39 ++++
 ...ckground-size-percent-percent-stretch.html |  33 +++
 .../background-size-percent-percent.html      |  25 ++
 .../backgrounds/background-size-percent.html  |  25 ++
 .../background-size-zoom-no-repeat-ref.html   |  34 +++
 .../background-size-zoom-no-repeat.html       |  35 +++
 .../background-size-zoom-repeat-ref.html      |  60 +++++
 .../background-size-zoom-repeat.html          |  61 +++++
 .../green-8x20-blue-8x20-vertical.png         | Bin 0 -> 107 bytes
 .../backgrounds/no-intrinsic-size.svg         |   8 +
 layout/reftests/backgrounds/reftest.list      |  69 ++++++
 layout/style/nsCSSDeclaration.cpp             |  22 +-
 layout/style/nsCSSKeywordList.h               |   2 +
 layout/style/nsCSSParser.cpp                  | 123 +++++++++-
 layout/style/nsCSSPropList.h                  |  10 +
 layout/style/nsCSSProps.cpp                   |   7 +
 layout/style/nsCSSProps.h                     |   1 +
 layout/style/nsCSSStruct.cpp                  |   2 +
 layout/style/nsCSSStruct.h                    |   1 +
 layout/style/nsComputedDOMStyle.cpp           |  79 ++++++-
 layout/style/nsComputedDOMStyle.h             |   1 +
 layout/style/nsRuleNode.cpp                   |  98 ++++++++
 layout/style/nsStyleStruct.cpp                |  45 ++++
 layout/style/nsStyleStruct.h                  |  40 +++-
 layout/style/test/property_database.js        |  12 +-
 82 files changed, 2302 insertions(+), 67 deletions(-)
 create mode 100644 layout/reftests/backgrounds/background-size-auto-auto.html
 create mode 100644 layout/reftests/backgrounds/background-size-auto-length-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-auto-length.html
 create mode 100644 layout/reftests/backgrounds/background-size-auto-percent.html
 create mode 100644 layout/reftests/backgrounds/background-size-auto-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-auto.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-contain-no-repeat.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-contain-not-fixed.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-contain.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-cover-no-repeat.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-cover-not-fixed.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-cover-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-cover.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent-overflow-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-single-not-fixed.html
 create mode 100644 layout/reftests/backgrounds/background-size-bounding-box.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-border-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-border.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-position-fifty-fifty-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain.html
 create mode 100644 layout/reftests/backgrounds/background-size-continuous.html
 create mode 100644 layout/reftests/backgrounds/background-size-cover-bounding-box.html
 create mode 100644 layout/reftests/backgrounds/background-size-cover-continuous.html
 create mode 100644 layout/reftests/backgrounds/background-size-cover-each-box.html
 create mode 100644 layout/reftests/backgrounds/background-size-cover-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-cover.html
 create mode 100644 layout/reftests/backgrounds/background-size-each-box.html
 create mode 100644 layout/reftests/backgrounds/background-size-length-auto.html
 create mode 100644 layout/reftests/backgrounds/background-size-length-length-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-length-length.html
 create mode 100644 layout/reftests/backgrounds/background-size-length-percent-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-length-percent.html
 create mode 100644 layout/reftests/backgrounds/background-size-length.html
 create mode 100644 layout/reftests/backgrounds/background-size-no-intrinsic-height-image-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html
 create mode 100644 layout/reftests/backgrounds/background-size-no-intrinsic-width-image-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-auto.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-length.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-percent-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-percent-stretch-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-percent-stretch.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-percent.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent.html
 create mode 100644 layout/reftests/backgrounds/background-size-zoom-no-repeat-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-zoom-no-repeat.html
 create mode 100644 layout/reftests/backgrounds/background-size-zoom-repeat-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-zoom-repeat.html
 create mode 100644 layout/reftests/backgrounds/green-8x20-blue-8x20-vertical.png
 create mode 100644 layout/reftests/backgrounds/no-intrinsic-size.svg

diff --git a/dom/interfaces/css/nsIDOMNSCSS2Properties.idl b/dom/interfaces/css/nsIDOMNSCSS2Properties.idl
index f8c5ebb3a41..c7929428e4e 100644
--- a/dom/interfaces/css/nsIDOMNSCSS2Properties.idl
+++ b/dom/interfaces/css/nsIDOMNSCSS2Properties.idl
@@ -39,7 +39,7 @@
 
 #include "nsIDOMCSS2Properties.idl"
 
-[scriptable, uuid(e7245a21-3f46-4e67-82bf-a9b326fe74ee)]
+[scriptable, uuid(643f64d3-6b95-4d9a-ac75-c01a6f4c88cb)]
 interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
 {
            /* Non-DOM 2 extensions */
@@ -256,5 +256,8 @@ interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
 
            attribute DOMString        MozWindowShadow;
                                         // raises(DOMException) on setting
+
+           attribute DOMString        MozBackgroundSize;
+                                        // raises(DOMException) on setting
 	
 };
diff --git a/gfx/public/nsCoord.h b/gfx/public/nsCoord.h
index eb28a240eb6..baee38e4af8 100644
--- a/gfx/public/nsCoord.h
+++ b/gfx/public/nsCoord.h
@@ -88,12 +88,29 @@ inline void VERIFY_COORD(nscoord aCoord) {
 #endif
 }
 
-inline nscoord NSCoordMultiply(nscoord aCoord, float aVal) {
+/**
+ * Returns aCoord * aVal, capping the product to nscoord_MAX.
+ *
+ * Note: If/when we start using floats for nscoords, this function won't be
+ * necessary.  Normal float multiplication correctly handles overflowing
+ * multiplications, automatically saturating to infinity.
+ */
+inline nscoord NSCoordSaturatingMultiply(nscoord aCoord, float aVal) {
   VERIFY_COORD(aCoord);
+  NS_ABORT_IF_FALSE(aVal >= 0.0f,
+                    "negative scaling factors must be handled manually");
 #ifdef NS_COORD_IS_FLOAT
-  return floorf(aCoord*aVal);
+  return floorf(aCoord * aVal);
 #else
-  return (PRInt32)(aCoord*aVal);
+  // This one's only a warning because it's possible to trigger
+  NS_WARN_IF_FALSE(aCoord > 0
+                   ? floorf(aCoord * aVal) < nscoord_MAX
+                   : ceilf(aCoord * aVal) > nscoord_MIN,
+                   "nscoord multiplication capped");
+
+  if (aCoord > 0)
+    return PRInt32(PR_MIN(nscoord_MAX, aCoord * aVal));
+  return PRInt32(PR_MAX(nscoord_MIN, aCoord * aVal));
 #endif
 }
 
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index e6bbc6cc030..ded69d92211 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -27,6 +27,7 @@
  *   L. David Baron <dbaron@dbaron.org>, Mozilla Corporation
  *   Michael Ventnor <m.ventnor@gmail.com>
  *   Rob Arnold <robarnold@mozilla.com>
+ *   Jeff Walden <jwalden+code@mit.edu>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -1395,8 +1396,12 @@ IsSolidBorder(const nsStyleBorder& aBorder)
   return PR_TRUE;
 }
 
+/**
+ * Returns true if the given request is for a background image (that is, it is
+ * non-null) and that image is fully loaded and its size calculated.
+ */
 static PRBool
-UseImageRequestForBackground(imgIRequest *aRequest)
+HaveCompleteBackgroundImage(imgIRequest *aRequest)
 {
   if (!aRequest)
     return PR_FALSE;
@@ -1496,37 +1501,37 @@ static nscolor
 DetermineBackgroundColorInternal(nsPresContext* aPresContext,
                                  const nsStyleBackground& aBackground,
                                  nsIFrame* aFrame,
-                                 PRBool* aDrawBackgroundImage,
-                                 PRBool* aDrawBackgroundColor,
+                                 PRBool& aDrawBackgroundImage,
+                                 PRBool& aDrawBackgroundColor,
                                  nsCOMPtr<imgIRequest>& aBottomImage)
 {
-  *aDrawBackgroundImage = PR_TRUE;
-  *aDrawBackgroundColor = PR_TRUE;
+  aDrawBackgroundImage = PR_TRUE;
+  aDrawBackgroundColor = PR_TRUE;
 
   if (aFrame->HonorPrintBackgroundSettings()) {
-    *aDrawBackgroundImage = aPresContext->GetBackgroundImageDraw();
-    *aDrawBackgroundColor = aPresContext->GetBackgroundColorDraw();
+    aDrawBackgroundImage = aPresContext->GetBackgroundImageDraw();
+    aDrawBackgroundColor = aPresContext->GetBackgroundColorDraw();
   }
 
   aBottomImage = aBackground.BottomLayer().mImage;
 
-  if (!aDrawBackgroundImage || !UseImageRequestForBackground(aBottomImage)) {
+  if (!aDrawBackgroundImage || !HaveCompleteBackgroundImage(aBottomImage)) {
     aBottomImage = nsnull;
   }
 
   nscolor bgColor;
-  if (*aDrawBackgroundColor) {
+  if (aDrawBackgroundColor) {
     bgColor = aBackground.mBackgroundColor;
     if (NS_GET_A(bgColor) == 0)
-      *aDrawBackgroundColor = PR_FALSE;
+      aDrawBackgroundColor = PR_FALSE;
   } else {
     // If GetBackgroundColorDraw() is false, we are still expected to
     // draw color in the background of any frame that's not completely
     // transparent, but we are expected to use white instead of whatever
     // color was specified.
     bgColor = NS_RGB(255, 255, 255);
-    if (*aDrawBackgroundImage || !aBackground.IsTransparent())
-      *aDrawBackgroundColor = PR_TRUE;
+    if (aDrawBackgroundImage || !aBackground.IsTransparent())
+      aDrawBackgroundColor = PR_TRUE;
     else
       bgColor = NS_RGBA(0,0,0,0);
   }
@@ -1545,8 +1550,8 @@ nsCSSRendering::DetermineBackgroundColor(nsPresContext* aPresContext,
   return DetermineBackgroundColorInternal(aPresContext,
                                           aBackground,
                                           aFrame,
-                                          &drawBackgroundImage,
-                                          &drawBackgroundColor,
+                                          drawBackgroundImage,
+                                          drawBackgroundColor,
                                           bottomImage);
 }
 
@@ -1596,8 +1601,8 @@ nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
   nscolor bgColor = DetermineBackgroundColorInternal(aPresContext,
                                                      aBackground,
                                                      aForFrame,
-                                                     &drawBackgroundImage,
-                                                     &drawBackgroundColor,
+                                                     drawBackgroundImage,
+                                                     drawBackgroundColor,
                                                      bottomImage);
 
   // At this point, drawBackgroundImage and drawBackgroundColor are
@@ -1628,7 +1633,7 @@ nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
   // determined by the value of 'background-clip' in
   // SetupCurrentBackgroundClip.  (Arguably it should be the
   // intersection, but that breaks the table painter -- in particular,
-  // taking the intersection breaks reftests/bugs/403429-1[ab].)
+  // taking the intersection breaks reftests/bugs/403249-1[ab].)
   nsRect bgClipArea, dirtyRect;
   gfxRect dirtyRectGfx;
   PRUint8 currentBackgroundClip;
@@ -1722,6 +1727,25 @@ nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
   }
 }
 
+static inline float
+ScaleDimension(nsStyleBackground::Size::Dimension aDimension,
+               PRUint8 aType,
+               nscoord aLength, nscoord aAvailLength)
+{
+  switch (aType) {
+    case nsStyleBackground::Size::ePercentage:
+      return double(aDimension.mFloat) * (double(aAvailLength) / double(aLength));
+    case nsStyleBackground::Size::eLength:
+      return double(aDimension.mCoord) / double(aLength);
+    default:
+      NS_ABORT_IF_FALSE(PR_FALSE, "bad aDimension.mType");
+      return 1.0f;
+    case nsStyleBackground::Size::eAuto:
+      NS_ABORT_IF_FALSE(PR_FALSE, "aDimension.mType == eAuto isn't handled");
+      return 1.0f;
+  }
+}
+
 static void
 PaintBackgroundLayer(nsPresContext* aPresContext,
                      nsIRenderingContext& aRenderingContext,
@@ -1732,15 +1756,69 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
                      const nsStyleBackground& aBackground,
                      const nsStyleBackground::Layer& aLayer)
 {
+  /*
+   * The background properties we need to keep in mind when drawing background
+   * layers are:
+   *
+   *   background-image
+   *   background-repeat
+   *   background-attachment
+   *   background-position
+   *   background-clip (-moz-background-clip)
+   *   background-origin (-moz-background-origin)
+   *   background-size (-moz-background-size)
+   *   background-break (-moz-background-inline-policy)
+   *
+   * (background-color applies to the entire element and not to individual
+   * layers, so it is irrelevant to this method.)
+   *
+   * These properties have the following dependencies upon each other when
+   * determining rendering:
+   *
+   *   background-image
+   *     no dependencies
+   *   background-repeat
+   *     no dependencies
+   *   background-attachment
+   *     no dependencies
+   *   background-position
+   *     depends upon background-size (for the image's scaled size) and
+   *     background-break (for the background positioning area)
+   *   background-clip
+   *     no dependencies
+   *   background-origin
+   *     depends upon background-attachment (only in the case where that value
+   *     is 'fixed')
+   *   background-size
+   *     depends upon background-break (for the background positioning area for
+   *     resolving percentages), background-image (for the image's intrinsic
+   *     size), background-repeat (if that value is 'round'), and
+   *     background-origin (for the background painting area, when
+   *     background-repeat is 'round')
+   *   background-break
+   *     depends upon background-origin (specifying how the boxes making up the
+   *     background positioning area are determined)
+   *
+   * As a result of only-if dependencies we don't strictly do a topological
+   * sort of the above properties when processing, but it's pretty close to one:
+   *
+   *   background-clip (by caller)
+   *   background-image
+   *   background-break, background-origin
+   *   background-attachment (postfix for background-{origin,break} if 'fixed')
+   *   background-size
+   *   background-position
+   *   background-repeat
+   */
+
   // Lookup the image
   imgIRequest *req = aLayer.mImage;
-  if (!UseImageRequestForBackground(req)) {
-    // There's no image or it's not ready to be painted.
+  if (!HaveCompleteBackgroundImage(req))
     return;
-  }
 
   nsCOMPtr<imgIContainer> image;
   req->GetImage(getter_AddRefs(image));
+  req = nsnull;
 
   nsIntSize imageIntSize;
   image->GetWidth(&imageIntSize.width);
@@ -1750,27 +1828,33 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
   imageSize.width = nsPresContext::CSSPixelsToAppUnits(imageIntSize.width);
   imageSize.height = nsPresContext::CSSPixelsToAppUnits(imageIntSize.height);
 
-  req = nsnull;
+  if (imageSize.width == 0 || imageSize.height == 0)
+    return;
 
   // relative to aBorderArea
-  nsRect bgOriginRect(0, 0, 0, 0);
+  nsRect bgPositioningArea(0, 0, 0, 0);
 
   nsIAtom* frameType = aForFrame->GetType();
   nsIFrame* geometryFrame = aForFrame;
   if (frameType == nsGkAtoms::inlineFrame ||
       frameType == nsGkAtoms::positionedInlineFrame) {
+    // XXXjwalden Strictly speaking this is not quite faithful to how
+    // background-break is supposed to interact with background-origin values,
+    // but it's a non-trivial amount of work to make it fully conformant, and
+    // until the specification is more finalized (and assuming background-break
+    // even makes the cut) it doesn't make sense to hammer out exact behavior.
     switch (aBackground.mBackgroundInlinePolicy) {
     case NS_STYLE_BG_INLINE_POLICY_EACH_BOX:
-      bgOriginRect = nsRect(nsPoint(0,0), aBorderArea.Size());
+      bgPositioningArea = nsRect(nsPoint(0,0), aBorderArea.Size());
       break;
     case NS_STYLE_BG_INLINE_POLICY_BOUNDING_BOX:
-      bgOriginRect = gInlineBGData->GetBoundingRect(aForFrame);
+      bgPositioningArea = gInlineBGData->GetBoundingRect(aForFrame);
       break;
     default:
       NS_ERROR("Unknown background-inline-policy value!  "
                "Please, teach me what to do.");
     case NS_STYLE_BG_INLINE_POLICY_CONTINUOUS:
-      bgOriginRect = gInlineBGData->GetContinuousRect(aForFrame);
+      bgPositioningArea = gInlineBGData->GetContinuousRect(aForFrame);
       break;
     }
   } else if (frameType == nsGkAtoms::canvasFrame) {
@@ -1780,10 +1864,10 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
     // finished and this page only displays the continuations of
     // absolutely positioned content).
     if (geometryFrame) {
-      bgOriginRect = geometryFrame->GetRect();
+      bgPositioningArea = geometryFrame->GetRect();
     }
   } else {
-    bgOriginRect = nsRect(nsPoint(0,0), aBorderArea.Size());
+    bgPositioningArea = nsRect(nsPoint(0,0), aBorderArea.Size());
   }
 
   // Background images are tiled over the 'background-clip' area
@@ -1791,11 +1875,11 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
   if (aLayer.mOrigin != NS_STYLE_BG_ORIGIN_BORDER && geometryFrame) {
     nsMargin border = geometryFrame->GetUsedBorder();
     geometryFrame->ApplySkipSides(border);
-    bgOriginRect.Deflate(border);
+    bgPositioningArea.Deflate(border);
     if (aLayer.mOrigin != NS_STYLE_BG_ORIGIN_PADDING) {
       nsMargin padding = geometryFrame->GetUsedPadding();
       geometryFrame->ApplySkipSides(padding);
-      bgOriginRect.Deflate(padding);
+      bgPositioningArea.Deflate(padding);
       NS_ASSERTION(aLayer.mOrigin == NS_STYLE_BG_ORIGIN_CONTENT,
                    "unknown background-origin value");
     }
@@ -1805,7 +1889,7 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
   //
   // relative to aBorderArea.TopLeft() (which is where the top-left
   // of aForFrame's border-box will be rendered)
-  nsPoint imageTopLeft, anchor;
+  nsPoint imageTopLeft, anchor, offset;
   if (NS_STYLE_BG_ATTACHMENT_FIXED == aLayer.mAttachment) {
     // If it's a fixed background attachment, then the image is placed
     // relative to the viewport, which is the area of the root frame
@@ -1827,7 +1911,8 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
       // else this is an embedded shell and its root frame is what we want
     }
 
-    nsRect viewportArea(nsPoint(0, 0), topFrame->GetSize());
+    // Set the background positioning area to the viewport's area.
+    bgPositioningArea.SetRect(nsPoint(0, 0), topFrame->GetSize());
 
     if (!pageContentFrame) {
       // Subtract the size of scrollbars.
@@ -1835,29 +1920,70 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
         aPresContext->PresShell()->GetRootScrollFrameAsScrollable();
       if (scrollableFrame) {
         nsMargin scrollbars = scrollableFrame->GetActualScrollbarSizes();
-        viewportArea.Deflate(scrollbars);
+        bgPositioningArea.Deflate(scrollbars);
       }
     }
-     
-    // Get the anchor point, relative to the viewport.
-    ComputeBackgroundAnchorPoint(aLayer, viewportArea.Size(), imageSize,
-                                 &imageTopLeft, &anchor);
 
-    // Convert the anchor point from viewport coordinates to aForFrame
-    // coordinates.
-    nsPoint offset = viewportArea.TopLeft() - aForFrame->GetOffsetTo(topFrame);
-    imageTopLeft += offset;
-    anchor += offset;
+    offset = bgPositioningArea.TopLeft() - aForFrame->GetOffsetTo(topFrame);
   } else {
-    ComputeBackgroundAnchorPoint(aLayer, bgOriginRect.Size(), imageSize,
-                                 &imageTopLeft, &anchor);
-    imageTopLeft += bgOriginRect.TopLeft();
-    anchor += bgOriginRect.TopLeft();
+    offset = bgPositioningArea.TopLeft();
   }
+     
+  // Scale the image as specified for background-size and as required for
+  // proper background positioning when background-position is defined with
+  // percentages.
+  float scaleX, scaleY;
+  switch (aLayer.mSize.mWidthType) {
+    case nsStyleBackground::Size::eContain:
+    case nsStyleBackground::Size::eCover: {
+      float scaleFitX = double(bgPositioningArea.width) / imageSize.width;
+      float scaleFitY = double(bgPositioningArea.height) / imageSize.height;
+      if (aLayer.mSize.mWidthType == nsStyleBackground::Size::eCover) {
+        scaleX = scaleY = PR_MAX(scaleFitX, scaleFitY);
+      } else {
+        scaleX = scaleY = PR_MIN(scaleFitX, scaleFitY);
+      }
+      break;
+    }
+    default: {
+      if (aLayer.mSize.mWidthType == nsStyleBackground::Size::eAuto) {
+        if (aLayer.mSize.mHeightType == nsStyleBackground::Size::eAuto) {
+          scaleX = scaleY = 1.0f;
+        } else {
+          scaleX = scaleY =
+            ScaleDimension(aLayer.mSize.mHeight, aLayer.mSize.mHeightType,
+                           imageSize.height, bgPositioningArea.height);
+        }
+      } else {
+        if (aLayer.mSize.mHeightType == nsStyleBackground::Size::eAuto) {
+          scaleX = scaleY =
+            ScaleDimension(aLayer.mSize.mWidth, aLayer.mSize.mWidthType,
+                           imageSize.width, bgPositioningArea.width);
+        } else {
+          scaleX = ScaleDimension(aLayer.mSize.mWidth, aLayer.mSize.mWidthType,
+                                  imageSize.width, bgPositioningArea.width);
+          scaleY = ScaleDimension(aLayer.mSize.mHeight, aLayer.mSize.mHeightType,
+                                  imageSize.height, bgPositioningArea.height);
+        }
+      }
+      break;
+    }
+  }
+  imageSize.width = NSCoordSaturatingMultiply(imageSize.width, scaleX);
+  imageSize.height = NSCoordSaturatingMultiply(imageSize.height, scaleY);
+
+  // Compute the position of the background now that the background's size is
+  // determined.
+  ComputeBackgroundAnchorPoint(aLayer, bgPositioningArea.Size(), imageSize,
+                               &imageTopLeft, &anchor);
+  imageTopLeft += offset;
+  anchor += offset;
 
   nsRect destArea(imageTopLeft + aBorderArea.TopLeft(), imageSize);
   nsRect fillArea = destArea;
   PRIntn repeat = aLayer.mRepeat;
+  PR_STATIC_ASSERT(NS_STYLE_BG_REPEAT_XY ==
+                   (NS_STYLE_BG_REPEAT_X | NS_STYLE_BG_REPEAT_Y));
   if (repeat & NS_STYLE_BG_REPEAT_X) {
     fillArea.x = aBGClipRect.x;
     fillArea.width = aBGClipRect.width;
diff --git a/layout/base/nsStyleConsts.h b/layout/base/nsStyleConsts.h
index 6926a24b01a..ee1f3a73e05 100644
--- a/layout/base/nsStyleConsts.h
+++ b/layout/base/nsStyleConsts.h
@@ -269,11 +269,16 @@
 #define NS_STYLE_BG_POSITION_RIGHT   (1<<4)
 
 // See nsStyleBackground
+// Code depends on (BG_REPEAT_X | BG_REPEAT_Y) == BG_REPEAT_XY
 #define NS_STYLE_BG_REPEAT_OFF                  0x00
 #define NS_STYLE_BG_REPEAT_X                    0x01
 #define NS_STYLE_BG_REPEAT_Y                    0x02
 #define NS_STYLE_BG_REPEAT_XY                   0x03
 
+// See nsStyleBackground
+#define NS_STYLE_BG_SIZE_CONTAIN  0
+#define NS_STYLE_BG_SIZE_COVER    1
+
 // See nsStyleTable
 #define NS_STYLE_BORDER_COLLAPSE                0
 #define NS_STYLE_BORDER_SEPARATE                1
diff --git a/layout/reftests/backgrounds/background-size-auto-auto.html b/layout/reftests/backgrounds/background-size-auto-auto.html
new file mode 100644
index 00000000000..22108f013d3
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto-auto.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto auto;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: auto auto;
+}
+  </style>
+</head>
+<body>
+<div id="outer"></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-auto-length-ref.html b/layout/reftests/backgrounds/background-size-auto-length-ref.html
new file mode 100644
index 00000000000..ae7535a84bf
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto-length-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto 16px; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 16px;
+  height: 16px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-auto-length.html b/layout/reftests/backgrounds/background-size-auto-length.html
new file mode 100644
index 00000000000..5d54b5c7579
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto-length.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto 16px;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: auto 16px;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-auto-percent.html b/layout/reftests/backgrounds/background-size-auto-percent.html
new file mode 100644
index 00000000000..b1bed853eec
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto-percent.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto 12.5%;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: auto 12.5%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-auto-ref.html b/layout/reftests/backgrounds/background-size-auto-ref.html
new file mode 100644
index 00000000000..8b2bd45d518
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 32px;
+  height: 32px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-auto.html b/layout/reftests/backgrounds/background-size-auto.html
new file mode 100644
index 00000000000..14a4bc9575a
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: auto;
+}
+  </style>
+</head>
+<body>
+<div id="outer"></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-contain-no-repeat.html b/layout/reftests/backgrounds/background-size-body-contain-no-repeat.html
new file mode 100644
index 00000000000..1afe70ea039
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-contain-no-repeat.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; on body, no-repeat, fixed</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-contain-not-fixed.html b/layout/reftests/backgrounds/background-size-body-contain-not-fixed.html
new file mode 100644
index 00000000000..371e08be1df
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-contain-not-fixed.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; not fixed, no-repeat on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: scroll;
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-contain.html b/layout/reftests/backgrounds/background-size-body-contain.html
new file mode 100644
index 00000000000..851a582f981
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-contain.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; fixed, repeat on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  -moz-background-size: contain;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-cover-no-repeat.html b/layout/reftests/backgrounds/background-size-body-cover-no-repeat.html
new file mode 100644
index 00000000000..b758d7a2f4d
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-cover-no-repeat.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; on body, no-repeat, fixed</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-cover-not-fixed.html b/layout/reftests/backgrounds/background-size-body-cover-not-fixed.html
new file mode 100644
index 00000000000..16e79583f31
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-cover-not-fixed.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; no-repeat, not-fixed on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: scroll;
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-cover-ref.html b/layout/reftests/backgrounds/background-size-body-cover-ref.html
new file mode 100644
index 00000000000..3dfe4ea6b7d
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-cover-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; on body reference</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-cover.html b/layout/reftests/backgrounds/background-size-body-cover.html
new file mode 100644
index 00000000000..09b4a83376c
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-cover.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  -moz-background-size: cover;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html b/layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html
new file mode 100644
index 00000000000..aba071be324
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; no-repeat/fixed on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  -moz-background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html b/layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html
new file mode 100644
index 00000000000..1d115317738
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; no-repeat/not fixed on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: scroll;
+  -moz-background-size: 100% 100%;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent-overflow-ref.html b/layout/reftests/backgrounds/background-size-body-percent-percent-overflow-ref.html
new file mode 100644
index 00000000000..c9bfd99819a
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-overflow-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(green-16x20.png);
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html b/layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html
new file mode 100644
index 00000000000..46085a90603
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(green-8x20-blue-8x20-vertical.png);
+  background-repeat: no-repeat;
+  background-attachment: fixed;
+  overflow: hidden;
+
+  /*
+   * This should not affect how the background paints, that is, how the
+   * background image is sized:
+   *
+   *   If the ‘background-attachment’ value for this image is ‘fixed’ [...] the
+   *   background positioning area is the initial containing block [CSS21].
+   *
+   * Thus '100% 100%' below is relative to the viewport size, so we expect to
+   * see a background which, modulo aliasing, is half green and half blue.
+   */
+  height: 10000px;
+
+  -moz-background-size: 100% 100%;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent-ref.html b/layout/reftests/backgrounds/background-size-body-percent-percent-ref.html
new file mode 100644
index 00000000000..3f03f74afaa
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; on body reference</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent.html b/layout/reftests/backgrounds/background-size-body-percent-percent.html
new file mode 100644
index 00000000000..e5722bd7ba5
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  -moz-background-size: 100% 100%;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-single-not-fixed.html b/layout/reftests/backgrounds/background-size-body-single-not-fixed.html
new file mode 100644
index 00000000000..e901abad621
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-single-not-fixed.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: scroll;
+  background-repeat: no-repeat;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-bounding-box.html b/layout/reftests/backgrounds/background-size-bounding-box.html
new file mode 100644
index 00000000000..6136a3729cf
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-bounding-box.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-break: bounding-box</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-inline-policy: bounding-box;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-border-ref.html b/layout/reftests/backgrounds/background-size-contain-clip-border-ref.html
new file mode 100644
index 00000000000..a061b39dd05
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-border-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: border reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid white;
+  width: 24px;
+  height: 88px;
+}
+#innermost
+{
+  width: 24px;
+  height: 24px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"><div id="innermost"></div></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-border.html b/layout/reftests/backgrounds/background-size-contain-clip-border.html
new file mode 100644
index 00000000000..76b209a1736
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-border.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: border</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid transparent;
+  width: 24px;
+  height: 88px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+  -moz-background-clip: border;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding-ref.html b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding-ref.html
new file mode 100644
index 00000000000..f3bb19eb168
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding-ref.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding reference, -moz-background-origin: border</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid white;
+  width: 24px;
+  height: 88px;
+}
+#innermost1
+{
+  width: 24px;
+  height: 44px;
+  background-image: url(aqua-32x32.png);
+}
+#innermost2
+{
+  width: 24px;
+  height: 44px;
+  background-color: lime;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div
+  id="inner"><div
+    id="innermost1"></div><div
+    id="innermost2"></div
+    ></div
+  ></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html
new file mode 100644
index 00000000000..12cdbc5a95d
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding, -moz-background-origin: border</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid transparent;
+  padding: 10px;
+  width: 4px;
+  height: 68px;
+  background-image: url(aqua-32x32.png);
+  background-color: lime;
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+  -moz-background-clip: padding;
+  -moz-background-origin: border;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-ref.html b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-ref.html
new file mode 100644
index 00000000000..7a3b9f7beb2
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding reference, -moz-background-origin: border</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid white;
+  width: 24px;
+  height: 88px;
+}
+#innermost
+{
+  width: 24px;
+  height: 44px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"><div id="innermost"></div></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html
new file mode 100644
index 00000000000..ab36021fb87
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding, -moz-background-origin: border</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid transparent;
+  width: 24px;
+  height: 88px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+  -moz-background-clip: padding;
+  -moz-background-origin: border;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding-ref.html b/layout/reftests/backgrounds/background-size-contain-clip-padding-ref.html
new file mode 100644
index 00000000000..3e2af30b903
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid white;
+  width: 24px;
+  height: 88px;
+}
+#innermost
+{
+  width: 24px;
+  height: 24px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"><div id="innermost"></div></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding.html b/layout/reftests/backgrounds/background-size-contain-clip-padding.html
new file mode 100644
index 00000000000..36408f785c7
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid transparent;
+  width: 24px;
+  height: 88px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+  -moz-background-clip: padding;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty-ref.html b/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty-ref.html
new file mode 100644
index 00000000000..811f4c047cd
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; background-position: 50% 50% reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner1
+{
+  width: 64px;
+  height: 32px;
+}
+#inner2
+{
+  width: 64px;
+  height: 64px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner1"></div><div id="inner2"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html b/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html
new file mode 100644
index 00000000000..7e3dab555e8
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; background-position: 50% 50%</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+  background-position: 50% 50%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-ref.html b/layout/reftests/backgrounds/background-size-contain-ref.html
new file mode 100644
index 00000000000..53c346cc74f
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 64px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain.html b/layout/reftests/backgrounds/background-size-contain.html
new file mode 100644
index 00000000000..654a94c122c
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain;</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-continuous.html b/layout/reftests/backgrounds/background-size-continuous.html
new file mode 100644
index 00000000000..4373cdcd238
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-continuous.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-break: continuous</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-inline-policy: continuous;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-cover-bounding-box.html b/layout/reftests/backgrounds/background-size-cover-bounding-box.html
new file mode 100644
index 00000000000..ca12800e0ab
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-cover-bounding-box.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; background-break: bounding-box</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+  -moz-background-inline-policy: bounding-box;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-cover-continuous.html b/layout/reftests/backgrounds/background-size-cover-continuous.html
new file mode 100644
index 00000000000..3f81d372b4b
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-cover-continuous.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; background-break: continuous</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+  -moz-background-inline-policy: continuous;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-cover-each-box.html b/layout/reftests/backgrounds/background-size-cover-each-box.html
new file mode 100644
index 00000000000..a53333fc644
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-cover-each-box.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; background-break: each-box</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+  -moz-background-inline-policy: each-box;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-cover-ref.html b/layout/reftests/backgrounds/background-size-cover-ref.html
new file mode 100644
index 00000000000..7d74f7b3c24
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-cover-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-cover.html b/layout/reftests/backgrounds/background-size-cover.html
new file mode 100644
index 00000000000..20e23eb2424
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-cover.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover;</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+}
+  </style>
+</head>
+<body>
+<div id="outer"></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-each-box.html b/layout/reftests/backgrounds/background-size-each-box.html
new file mode 100644
index 00000000000..35c1a205a77
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-each-box.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-break: each-box</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-inline-policy: each-box;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length-auto.html b/layout/reftests/backgrounds/background-size-length-auto.html
new file mode 100644
index 00000000000..9ef400915dd
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length-auto.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 16px auto;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 16px auto;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length-length-ref.html b/layout/reftests/backgrounds/background-size-length-length-ref.html
new file mode 100644
index 00000000000..05b5c675879
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length-length-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 32px 64px; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 32px;
+  height: 64px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length-length.html b/layout/reftests/backgrounds/background-size-length-length.html
new file mode 100644
index 00000000000..dca9c8bd834
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length-length.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 32px 64px;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 32px 64px;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length-percent-ref.html b/layout/reftests/backgrounds/background-size-length-percent-ref.html
new file mode 100644
index 00000000000..9c95873190e
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length-percent-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 16px 25%;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 16px;
+  height: 32px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length-percent.html b/layout/reftests/backgrounds/background-size-length-percent.html
new file mode 100644
index 00000000000..ae630d53f53
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length-percent.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 16px 25%;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 16px 25%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length.html b/layout/reftests/backgrounds/background-size-length.html
new file mode 100644
index 00000000000..362c601541d
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 16px;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 16px;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-no-intrinsic-height-image-ref.html b/layout/reftests/backgrounds/background-size-no-intrinsic-height-image-ref.html
new file mode 100644
index 00000000000..c453fed751d
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-no-intrinsic-height-image-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 32px auto; for image with no intrinsic height reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 32px;
+  height: 128px;
+  background-color: lime;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html b/layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html
new file mode 100644
index 00000000000..7b01c98465a
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 32px auto; for image with no intrinsic height</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(no-intrinsic-size.svg);
+  background-repeat: no-repeat;
+  -moz-background-size: 32px auto;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-no-intrinsic-width-image-ref.html b/layout/reftests/backgrounds/background-size-no-intrinsic-width-image-ref.html
new file mode 100644
index 00000000000..a01539de741
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-no-intrinsic-width-image-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 32px auto; for image with no intrinsic size reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 32px;
+  background-color: lime;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html b/layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html
new file mode 100644
index 00000000000..501085f4528
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto 32px; for image with no intrinsic width</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(no-intrinsic-size.svg);
+  background-repeat: no-repeat;
+  -moz-background-size: auto 32px;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-auto.html b/layout/reftests/backgrounds/background-size-percent-auto.html
new file mode 100644
index 00000000000..266619549b1
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-auto.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 25% auto;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 25% auto;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-length.html b/layout/reftests/backgrounds/background-size-percent-length.html
new file mode 100644
index 00000000000..695a7a506c2
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-length.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 25% 32px;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 25% 32px;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-percent-ref.html b/layout/reftests/backgrounds/background-size-percent-percent-ref.html
new file mode 100644
index 00000000000..a30b75c6b03
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-percent-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 50% 25%; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 32px;
+  height: 32px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-percent-stretch-ref.html b/layout/reftests/backgrounds/background-size-percent-percent-stretch-ref.html
new file mode 100644
index 00000000000..65c999d6d99
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-percent-stretch-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; stretch reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 60px;
+  height: 120px;
+}
+#inner1
+{
+  background: blue;
+  width: 15px;
+  height: 120px;
+  display: inline-block;
+  background-image: url(blue-16x20.png);
+
+  /* obscure sampling artifacts at the color boundary */
+  border-right: 5px solid black;
+}
+#inner2
+{
+  background: lime;
+  width: 35px;
+  height: 120px;
+  display: inline-block;
+  background-image: url(green-16x20.png);
+
+  /* obscure sampling artifacts at the color boundary */
+  border-left: 5px solid black;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner1"></div><div id="inner2"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-percent-stretch.html b/layout/reftests/backgrounds/background-size-percent-percent-stretch.html
new file mode 100644
index 00000000000..baf3e8e6c40
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-percent-stretch.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; stretch</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 60px;
+  height: 120px;
+}
+#inner
+{
+  width: 60px;
+  height: 120px;
+  background-image: url(blue-8x20-green-16x20.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 100% 100%;
+}
+#innermost
+{
+  width: 15px;
+  height: 120px;
+
+  /* obscure sampling artifacts at the color boundary */
+  border-right: 10px solid black;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"><div id="innermost"></div></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-percent.html b/layout/reftests/backgrounds/background-size-percent-percent.html
new file mode 100644
index 00000000000..64ce972c531
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-percent.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 50% 25%;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 50% 25%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent.html b/layout/reftests/backgrounds/background-size-percent.html
new file mode 100644
index 00000000000..76f26c2b839
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 25%;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 25%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-zoom-no-repeat-ref.html b/layout/reftests/backgrounds/background-size-zoom-no-repeat-ref.html
new file mode 100644
index 00000000000..dd05ee386af
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-zoom-no-repeat-ref.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size + zoom</title>
+  <style type="text/css">
+html
+{
+  margin: 0;
+  padding: 10px;
+}
+body
+{
+  margin: 0;
+  padding: 0;
+}
+#outer
+{
+  border: 2px solid black;
+  width: 128px;
+  height: 256px;
+}
+#inner
+{
+  width: 32px;
+  height: 32px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-zoom-no-repeat.html b/layout/reftests/backgrounds/background-size-zoom-no-repeat.html
new file mode 100644
index 00000000000..f89ff92dda4
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-zoom-no-repeat.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html reftest-zoom="2">
+<head>
+  <title>background-size + zoom</title>
+  <style type="text/css">
+html
+{
+  margin: 0;
+  padding: 5px;
+}
+body
+{
+  margin: 0;
+  padding: 0;
+}
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 25%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-zoom-repeat-ref.html b/layout/reftests/backgrounds/background-size-zoom-repeat-ref.html
new file mode 100644
index 00000000000..1a5a1fd0af3
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-zoom-repeat-ref.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 64px 40px; repeat, zoom reference</title>
+  <style type="text/css">
+html
+{
+  margin: 0;
+  padding: 0;
+}
+body
+{
+  margin: 0;
+  padding: 20px;
+}
+#outer
+{
+  width: 512px;
+  height: 320px;
+}
+  /*
+   * PRE-ZOOM:
+   *   2x size the image, then tile it 4x4 across the div; sampling artifacts at
+   *   32px horizontal offset, then every 64px for the full height of the div.
+   * POST-ZOOM:
+   *   4x size the image, then tile it 4x4 across the div; sampling artifacts at
+   *   64px horizontal offset, then every 128px for the full height of the div.
+   */
+
+/* Aargh, sampling artifacts, we hates them, precioussss. */
+#outer > div
+{
+  display: inline-block;
+  width: 56px;
+  height: 320px;
+}
+.blue
+{
+  background: url(blue-16x20.png);
+  border-right: 8px solid black;
+}
+.green
+{
+  background: url(green-16x20.png);
+  border-left: 8px solid black;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-zoom-repeat.html b/layout/reftests/backgrounds/background-size-zoom-repeat.html
new file mode 100644
index 00000000000..26581e57aff
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-zoom-repeat.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html reftest-zoom="2">
+<head>
+  <title>background-size: 64px 40px; repeat, zoom</title>
+  <style type="text/css">
+html
+{
+  margin: 0;
+  padding: 0;
+}
+body
+{
+  margin: 0;
+  padding: 10px;
+}
+#outer
+{
+  /*
+   * PRE-ZOOM:
+   *   2x size the image, then tile it 4x4 across the div; sampling artifacts at
+   *   32px horizontal offset, then every 64px for the full height of the div.
+   * POST-ZOOM:
+   *   4x size the image, then tile it 4x4 across the div; sampling artifacts at
+   *   64px horizontal offset, then every 128px for the full height of the div.
+   */
+  width: 256px;
+  height: 160px;
+  background-image: url(blue-16x20-green-16x20.png);
+  background-repeat: repeat;
+  -moz-background-size: 64px 40px;
+}
+
+/* Aargh, sampling artifacts, we hates them, precioussss. */
+#outer > div
+{
+  display: inline-block;
+  width: 28px;
+  height: 160px;
+}
+.blue
+{
+  border-right: 4px solid black;
+}
+.green
+{
+  border-left: 4px solid black;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/green-8x20-blue-8x20-vertical.png b/layout/reftests/backgrounds/green-8x20-blue-8x20-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..4236f5b1cebc8c9d6d22545135cf35425bfed836
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^B0wy_!3HG7B;uuk6k~CayA#8@b22Z1992&j#}JFt
z$yaKXf6j00YUpe{m2l<2!~})K4F`T-EV0OX;2_PxFljSOTti0iRG<b1Pgg&ebxsLQ
E0B+VG761SM

literal 0
HcmV?d00001

diff --git a/layout/reftests/backgrounds/no-intrinsic-size.svg b/layout/reftests/backgrounds/no-intrinsic-size.svg
new file mode 100644
index 00000000000..584de90778a
--- /dev/null
+++ b/layout/reftests/backgrounds/no-intrinsic-size.svg
@@ -0,0 +1,8 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/licenses/publicdomain/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <title>Image with no intrinsic size</title>
+  <rect width="100%" height="100%" fill="lime"/>
+</svg>
diff --git a/layout/reftests/backgrounds/reftest.list b/layout/reftests/backgrounds/reftest.list
index eada98ee65c..c037d0a0803 100644
--- a/layout/reftests/backgrounds/reftest.list
+++ b/layout/reftests/backgrounds/reftest.list
@@ -24,3 +24,72 @@
 == continuous-inline-4b.html continuous-inline-4-ref.html
 == continuous-inline-5a.html continuous-inline-5-ref.html
 == continuous-inline-5b.html continuous-inline-5-ref.html
+
+== background-size-auto-auto.html background-size-auto-ref.html
+== background-size-auto.html background-size-auto-ref.html
+== background-size-contain.html background-size-contain-ref.html
+== background-size-cover.html background-size-cover-ref.html
+== background-size-auto-length.html background-size-auto-length-ref.html
+== background-size-length-auto.html background-size-auto-length-ref.html
+== background-size-length.html background-size-auto-length-ref.html
+== background-size-auto-percent.html background-size-auto-length-ref.html
+== background-size-percent-auto.html background-size-auto-length-ref.html
+== background-size-percent.html background-size-auto-length-ref.html
+== background-size-length-percent.html background-size-length-percent-ref.html
+== background-size-percent-length.html background-size-length-percent-ref.html
+== background-size-percent-percent.html background-size-percent-percent-ref.html
+== background-size-length-length.html background-size-length-length-ref.html
+== background-size-percent-percent-stretch.html background-size-percent-percent-stretch-ref.html
+
+== background-size-body-percent-percent.html background-size-body-percent-percent-ref.html
+== background-size-body-percent-percent-no-repeat.html background-size-body-percent-percent-ref.html
+== background-size-body-percent-percent-not-fixed.html background-size-body-percent-percent-ref.html
+== background-size-body-cover.html background-size-body-cover-ref.html
+== background-size-body-cover-no-repeat.html background-size-body-cover-ref.html
+!= background-size-body-cover-not-fixed.html background-size-body-cover-ref.html
+!= background-size-body-cover-not-fixed.html background-size-body-single-not-fixed.html
+
+# relies on reftest window having greater height than width
+== background-size-body-contain.html background-size-body-cover-ref.html
+!= background-size-body-contain-no-repeat.html background-size-body-cover-ref.html
+!= background-size-body-contain-not-fixed.html background-size-body-cover-ref.html
+!= background-size-body-cover-not-fixed.html background-size-body-contain-not-fixed.html
+
+!= background-size-body-percent-percent-overflow.html background-size-body-percent-percent-overflow-ref.html
+
+== background-size-zoom-no-repeat.html background-size-zoom-no-repeat-ref.html
+
+== background-size-contain-clip-padding.html background-size-contain-clip-padding-ref.html
+== background-size-contain-clip-border.html background-size-contain-clip-border-ref.html
+== background-size-contain-position-fifty-fifty.html background-size-contain-position-fifty-fifty-ref.html
+== background-size-contain-clip-padding-origin-border.html background-size-contain-clip-padding-origin-border-ref.html
+== background-size-contain-clip-padding-origin-border-padding.html background-size-contain-clip-padding-origin-border-padding-ref.html
+
+# -moz-background-inline-policy is touchy and hard to test due to stretching
+# artifacts and the difficulty of covering exact lines, and its CSS3 analog is
+# on the chopping block at the moment, so just make sure background-size results
+# in a different rendering when present.
+!= background-size-cover-continuous.html background-size-continuous.html
+!= background-size-cover-each-box.html background-size-each-box.html
+!= background-size-cover-bounding-box.html background-size-bounding-box.html
+
+# ...and make sure each rendering with background-size is different from the
+# others
+!= background-size-cover-continuous.html background-size-cover-each-box.html
+!= background-size-cover-continuous.html background-size-cover-bounding-box.html
+!= background-size-cover-each-box.html background-size-cover-bounding-box.html
+
+
+# There seems to be a pixel-snapping problem here, where the repeated background
+# image isn't being snapped at its boundaries.  Note that the boundaries within
+# the image aren't the issue, because they're being obscured to avoid sampling
+# algorithm dependencies (at least assuming the sampling algorithm in use
+# doesn't sample too far astray from the boundaries).
+fails == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html
+
+# background-size affects images without intrinsic dimensions specially; we may
+# not support such image formats right now, but when we do, we want
+# background-size to be changed accordingly, and hopefully these tests should
+# start failing when we do.
+fails == background-size-no-intrinsic-width-image.html background-size-no-intrinsic-width-image-ref.html
+fails == background-size-no-intrinsic-height-image.html background-size-no-intrinsic-height-image-ref.html
diff --git a/layout/style/nsCSSDeclaration.cpp b/layout/style/nsCSSDeclaration.cpp
index 315fab2307e..4eebd5bf336 100644
--- a/layout/style/nsCSSDeclaration.cpp
+++ b/layout/style/nsCSSDeclaration.cpp
@@ -174,11 +174,16 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString&
             ((aProperty == eCSSProperty_background_position ||
               aProperty == eCSSProperty__moz_transform_origin) &&
              pair->mXValue.GetUnit() != eCSSUnit_Inherit &&
-             pair->mXValue.GetUnit() != eCSSUnit_Initial)) {
-          // Only output a Y value if it's different from the X value
+             pair->mXValue.GetUnit() != eCSSUnit_Initial) ||
+            (aProperty == eCSSProperty__moz_background_size &&
+             pair->mXValue.GetUnit() != eCSSUnit_Inherit &&
+             pair->mXValue.GetUnit() != eCSSUnit_Initial &&
+             pair->mXValue.GetUnit() != eCSSUnit_Enumerated)) {
+          // Only output a Y value if it's different from the X value,
           // or if it's a background-position value other than 'initial'
-          // or 'inherit' or if it's a -moz-transform-origin value other
-          // than 'initial' or 'inherit'.
+          // or 'inherit', or if it's a -moz-transform-origin value other
+          // than 'initial' or 'inherit', or if it's a -moz-background-size
+          // value other than 'initial' or 'inherit' or 'contain' or 'cover'.
           aResult.Append(PRUnichar(' '));
           AppendCSSValueToString(aProperty, pair->mYValue, aResult);
         }
@@ -772,6 +777,8 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
         * data->ValueListStorageFor(eCSSProperty__moz_background_clip);
       const nsCSSValueList *origin =
         * data->ValueListStorageFor(eCSSProperty__moz_background_origin);
+      const nsCSSValuePairList *size =
+        * data->ValuePairListStorageFor(eCSSProperty__moz_background_size);
       for (;;) {
         AppendCSSValueToString(eCSSProperty_background_image,
                                image->mValue, aValue);
@@ -800,7 +807,7 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
     // support for content-box on background-clip.
           PR_STATIC_ASSERT(NS_STYLE_BG_CLIP_BORDER ==
                            NS_STYLE_BG_ORIGIN_BORDER);
-          PR_STATIC_ASSERT(NS_STYLE_BG_CLIP_PADDING == 
+          PR_STATIC_ASSERT(NS_STYLE_BG_CLIP_PADDING ==
                            NS_STYLE_BG_ORIGIN_PADDING);
           // PR_STATIC_ASSERT(NS_STYLE_BG_CLIP_CONTENT == /* does not exist */
           //                  NS_STYLE_BG_ORIGIN_CONTENT);
@@ -824,16 +831,17 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
         position = position->mNext;
         clip = clip->mNext;
         origin = origin->mNext;
+        size = size->mNext;
 
         if (!image) {
-          if (repeat || attachment || position || clip || origin) {
+          if (repeat || attachment || position || clip || origin || size) {
             // Uneven length lists, so can't be serialized as shorthand.
             aValue.Truncate();
             return NS_OK;
           }
           break;
         }
-        if (!repeat || !attachment || !position || !clip || !origin) {
+        if (!repeat || !attachment || !position || !clip || !origin || !size) {
           // Uneven length lists, so can't be serialized as shorthand.
           aValue.Truncate();
           return NS_OK;
diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h
index 082933ccfc5..85e26b6cef7 100644
--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@@ -241,11 +241,13 @@ CSS_KEY(code, code)
 CSS_KEY(col-resize, col_resize)
 CSS_KEY(collapse, collapse)
 CSS_KEY(condensed, condensed)
+CSS_KEY(contain, contain)
 CSS_KEY(content, content)
 CSS_KEY(content-box, content_box)
 CSS_KEY(context-menu, context_menu)
 CSS_KEY(continuous, continuous)
 CSS_KEY(copy, copy)
+CSS_KEY(cover, cover)
 CSS_KEY(crop, crop)
 CSS_KEY(cross, cross)
 CSS_KEY(crosshair, crosshair)
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index e30a329af8b..6ac64e3691d 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -26,6 +26,7 @@
  *   Boris Zbarsky <bzbarsky@mit.edu>
  *   Mats Palmgren <mats.palmgren@bredband.net>
  *   Christian Biesinger <cbiesinger@web.de>
+ *   Jeff Walden <jwalden+code@mit.edu>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -407,6 +408,7 @@ protected:
     nsCSSValuePair mPosition;
     nsCSSValue mClip;
     nsCSSValue mOrigin;
+    nsCSSValuePair mSize;
     // The background-color is set as a side-effect, and if so, mLastItem
     // is set to true.
     PRBool mLastItem;
@@ -421,6 +423,8 @@ protected:
   PRBool ParseBackgroundList(nsCSSProperty aPropID); // a single value prop-id
   PRBool ParseBackgroundPosition();
   PRBool ParseBoxPositionValues(nsCSSValuePair& aOut);
+  PRBool ParseBackgroundSize();
+  PRBool ParseBackgroundSizeValues(nsCSSValuePair& aOut);
   PRBool ParseBorderColor();
   PRBool ParseBorderColors(nsCSSValueList** aResult,
                            nsCSSProperty aProperty);
@@ -5061,6 +5065,8 @@ CSSParserImpl::ParseProperty(nsCSSProperty aPropID)
   case eCSSProperty__moz_background_origin:
   case eCSSProperty_background_repeat:
     return ParseBackgroundList(aPropID);
+  case eCSSProperty__moz_background_size:
+    return ParseBackgroundSize();
   case eCSSProperty_border:
     return ParseBorderSide(kBorderTopIDs, PR_TRUE);
   case eCSSProperty_border_color:
@@ -5341,6 +5347,7 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
   case eCSSProperty_border_start:
   case eCSSProperty_border_top:
   case eCSSProperty_border_width:
+  case eCSSProperty__moz_background_size:
   case eCSSProperty__moz_border_radius:
   case eCSSProperty__moz_border_radius_topLeft:
   case eCSSProperty__moz_border_radius_topRight:
@@ -5986,6 +5993,7 @@ CSSParserImpl::ParseBackground()
 
   BackgroundItem bgitem;
   nsCSSValuePairList *positionHead = nsnull, **positionTail = &positionHead;
+  nsCSSValuePairList *sizeHead = nsnull, **sizeTail = &sizeHead;
   static const BackgroundItemSimpleValueInfo simpleValues[] = {
     { &BackgroundItem::mImage,      eCSSProperty_background_image },
     { &BackgroundItem::mRepeat,     eCSSProperty_background_repeat },
@@ -6003,6 +6011,7 @@ CSSParserImpl::ParseBackground()
     if (!ParseBackgroundItem(bgitem, !positionHead)) {
       break;
     }
+
     nsCSSValuePairList *positionItem = new nsCSSValuePairList;
     if (!positionItem) {
       mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
@@ -6013,6 +6022,16 @@ CSSParserImpl::ParseBackground()
     *positionTail = positionItem;
     positionTail = &positionItem->mNext;
 
+    nsCSSValuePairList *sizeItem = new nsCSSValuePairList;
+    if (!sizeItem) {
+      mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
+      break;
+    }
+    sizeItem->mXValue = bgitem.mSize.mXValue;
+    sizeItem->mYValue = bgitem.mSize.mYValue;
+    *sizeTail = sizeItem;
+    sizeTail = &sizeItem->mNext;
+
     PRBool fail = PR_FALSE;
     for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(simpleValues); ++i) {
       nsCSSValueList *item = new nsCSSValueList;
@@ -6037,6 +6056,7 @@ CSSParserImpl::ParseBackground()
     }
 
     mTempData.mColor.mBackPosition = positionHead;
+    mTempData.mColor.mBackSize = sizeHead;
     for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(simpleValues); ++i) {
       nsCSSValueList **source = static_cast<nsCSSValueList**>(
         mTempData.PropertyAt(simpleValues[i].propID));
@@ -6049,9 +6069,11 @@ CSSParserImpl::ParseBackground()
     mTempData.SetPropertyBit(eCSSProperty_background_position);
     mTempData.SetPropertyBit(eCSSProperty__moz_background_clip);
     mTempData.SetPropertyBit(eCSSProperty__moz_background_origin);
+    mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
     return PR_TRUE;
   }
   delete positionHead;
+  delete sizeHead;
   for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(simpleValues); ++i) {
     delete simpleHeads[i];
   }
@@ -6073,6 +6095,8 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
   aItem.mPosition.mYValue.SetPercentValue(0.0f);
   aItem.mClip.SetIntValue(NS_STYLE_BG_CLIP_BORDER, eCSSUnit_Enumerated);
   aItem.mOrigin.SetIntValue(NS_STYLE_BG_ORIGIN_PADDING, eCSSUnit_Enumerated);
+  aItem.mSize.mXValue.SetAutoValue();
+  aItem.mSize.mYValue.SetAutoValue();
   aItem.mLastItem = PR_FALSE;
 
   PRBool haveColor = PR_FALSE,
@@ -6113,6 +6137,8 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
         aItem.mPosition.SetBothValuesTo(val);
         aItem.mClip = val;
         aItem.mOrigin = val;
+        aItem.mSize.mXValue = val;
+        aItem.mSize.mYValue = val;
         aItem.mLastItem = PR_TRUE;
         haveSomething = PR_TRUE;
         break;
@@ -6160,9 +6186,9 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
     // support for content-box on background-clip.
       } else if (nsCSSProps::FindKeyword(keyword,
                    nsCSSProps::kBackgroundClipKTable, dummy)) {
-        // For now, we use the background-clip table, because we don't
-        // support 'content' on background-clip.  But that's dangerous
-        // if we eventually support no-clip.
+        // For now, we use the background-clip table rather than have a special
+        // background-origin table, because we don't support 'content-box' on
+        // background-origin.
         NS_ASSERTION(
           nsCSSProps::kBackgroundClipKTable[0] == eCSSKeyword_border &&
           nsCSSProps::kBackgroundClipKTable[2] == eCSSKeyword_padding &&
@@ -6230,7 +6256,8 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
   return haveSomething;
 }
 
-// This function is very similar to ParseBackgroundPosition.
+// This function is very similar to ParseBackgroundPosition and
+// ParseBackgroundSize.
 PRBool
 CSSParserImpl::ParseBackgroundList(nsCSSProperty aPropID)
 {
@@ -6271,7 +6298,7 @@ CSSParserImpl::ParseBackgroundList(nsCSSProperty aPropID)
   return PR_FALSE;
 }
 
-// This function is very similar to ParseBackgroundList.
+// This function is very similar to ParseBackgroundList and ParseBackgroundSize.
 PRBool
 CSSParserImpl::ParseBackgroundPosition()
 {
@@ -6316,7 +6343,7 @@ CSSParserImpl::ParseBackgroundPosition()
  * values corresponding to percentages of the box, raw offsets, or keywords
  * like "top," "left center," etc.
  *
- * @param aOut The nsCSSValuePair where to place the result.
+ * @param aOut The nsCSSValuePair in which to place the result.
  * @return Whether or not the operation succeeded.
  */
 PRBool CSSParserImpl::ParseBoxPositionValues(nsCSSValuePair &aOut)
@@ -6398,6 +6425,90 @@ PRBool CSSParserImpl::ParseBoxPositionValues(nsCSSValuePair &aOut)
   return PR_TRUE;
 }
 
+// This function is very similar to ParseBackgroundList and
+// ParseBackgroundPosition.
+PRBool
+CSSParserImpl::ParseBackgroundSize()
+{
+  nsCSSValuePair valuePair;
+  nsCSSValuePairList *head = nsnull, **tail = &head;
+  if (ParseVariant(valuePair.mXValue, VARIANT_INHERIT, nsnull)) {
+    // 'initial' and 'inherit' stand alone, no second value.
+    head = new nsCSSValuePairList;
+    if (!head) {
+      mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
+      return PR_FALSE;
+    }
+    head->mXValue = valuePair.mXValue;
+    head->mYValue.Reset();
+    mTempData.mColor.mBackSize = head;
+    mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
+    return ExpectEndProperty();
+  }
+
+  for (;;) {
+    if (!ParseBackgroundSizeValues(valuePair)) {
+      break;
+    }
+    nsCSSValuePairList *item = new nsCSSValuePairList;
+    if (!item) {
+      mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
+      break;
+    }
+    item->mXValue = valuePair.mXValue;
+    item->mYValue = valuePair.mYValue;
+    *tail = item;
+    tail = &item->mNext;
+    if (ExpectSymbol(',', PR_TRUE)) {
+      continue;
+    }
+    if (!ExpectEndProperty()) {
+      break;
+    }
+    mTempData.mColor.mBackSize = head;
+    mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
+    return PR_TRUE;
+  }
+  delete head;
+  return PR_FALSE;
+}
+
+/**
+ * Parses two values that correspond to lengths for the -moz-background-size
+ * property.  These can be one or two lengths (or the 'auto' keyword) or
+ * percentages corresponding to the element's dimensions or the single keywords
+ * 'contain' or 'cover'.  'initial' and 'inherit' must be handled by the caller
+ * if desired.
+ *
+ * @param aOut The nsCSSValuePair in which to place the result.
+ * @return Whether or not the operation succeeded.
+ */
+PRBool CSSParserImpl::ParseBackgroundSizeValues(nsCSSValuePair &aOut)
+{
+  // First try a percentage or a length value
+  nsCSSValue &xValue = aOut.mXValue,
+             &yValue = aOut.mYValue;
+  if (ParseNonNegativeVariant(xValue, VARIANT_LP | VARIANT_AUTO, nsnull)) {
+    // We have one percentage/length/auto. Get the optional second
+    // percentage/length/keyword.
+    if (ParseNonNegativeVariant(yValue, VARIANT_LP | VARIANT_AUTO, nsnull)) {
+      // We have a second percentage/length/auto.
+      return PR_TRUE;
+    }
+
+    // If only one percentage or length value is given, it sets the
+    // horizontal size only, and the vertical size will be as if by 'auto'.
+    yValue.SetAutoValue();
+    return PR_TRUE;
+  }
+
+  // Now address 'contain' and 'cover'.
+  if (!ParseEnum(xValue, nsCSSProps::kBackgroundSizeKTable))
+    return PR_FALSE;
+  yValue.Reset();
+  return PR_TRUE;
+}
+
 PRBool
 CSSParserImpl::ParseBorderColor()
 {
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index baccdb9522a..32da6d747e6 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -470,6 +470,16 @@ CSS_PROP_BACKGROUND(
     mBackRepeat,
     eCSSType_ValueList,
     kBackgroundRepeatKTable)
+CSS_PROP_BACKGROUND(
+    -moz-background-size,
+    _moz_background_size,
+    MozBackgroundSize,
+    CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
+        CSS_PROPERTY_VALUE_LIST_USES_COMMAS,
+    Color,
+    mBackSize,
+    eCSSType_ValuePairList,
+    kBackgroundSizeKTable)
 CSS_PROP_DISPLAY(
     -moz-binding,
     binding,
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index 71aca561afd..161aefc6e8d 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -527,6 +527,12 @@ const PRInt32 nsCSSProps::kBackgroundRepeatKTable[] = {
   eCSSKeyword_UNKNOWN,-1
 };
 
+const PRInt32 nsCSSProps::kBackgroundSizeKTable[] = {
+  eCSSKeyword_contain, NS_STYLE_BG_SIZE_CONTAIN,
+  eCSSKeyword_cover,   NS_STYLE_BG_SIZE_COVER,
+  eCSSKeyword_UNKNOWN,-1
+};
+
 const PRInt32 nsCSSProps::kBorderCollapseKTable[] = {
   eCSSKeyword_collapse,  NS_STYLE_BORDER_COLLAPSE,
   eCSSKeyword_separate,  NS_STYLE_BORDER_SEPARATE,
@@ -1502,6 +1508,7 @@ static const nsCSSProperty gBackgroundSubpropTable[] = {
   eCSSProperty_background_position,
   eCSSProperty__moz_background_clip,
   eCSSProperty__moz_background_origin,
+  eCSSProperty__moz_background_size,
   eCSSProperty_UNKNOWN
 };
 
diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h
index 4a4a04c96a5..7bd5836cc6f 100644
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -170,6 +170,7 @@ public:
   static const PRInt32 kBackgroundOriginKTable[];
   static const PRInt32 kBackgroundPositionKTable[];
   static const PRInt32 kBackgroundRepeatKTable[];
+  static const PRInt32 kBackgroundSizeKTable[];
   static const PRInt32 kBorderCollapseKTable[];
   static const PRInt32 kBorderColorKTable[];
   static const PRInt32 kBorderImageKTable[];
diff --git a/layout/style/nsCSSStruct.cpp b/layout/style/nsCSSStruct.cpp
index 71805fa2f91..05e413b518b 100644
--- a/layout/style/nsCSSStruct.cpp
+++ b/layout/style/nsCSSStruct.cpp
@@ -110,6 +110,7 @@ nsCSSColor::nsCSSColor(void)
   , mBackRepeat(nsnull)
   , mBackAttachment(nsnull)
   , mBackPosition(nsnull)
+  , mBackSize(nsnull)
   , mBackClip(nsnull)
   , mBackOrigin(nsnull)
 {
@@ -124,6 +125,7 @@ nsCSSColor::~nsCSSColor(void)
   delete mBackRepeat;
   delete mBackAttachment;
   delete mBackPosition;
+  delete mBackSize;
   delete mBackClip;
   delete mBackOrigin;
 }
diff --git a/layout/style/nsCSSStruct.h b/layout/style/nsCSSStruct.h
index a928cdd325c..cb617f35e9c 100644
--- a/layout/style/nsCSSStruct.h
+++ b/layout/style/nsCSSStruct.h
@@ -312,6 +312,7 @@ struct nsCSSColor : public nsCSSStruct  {
   nsCSSValueList* mBackRepeat;
   nsCSSValueList* mBackAttachment;
   nsCSSValuePairList* mBackPosition;
+  nsCSSValuePairList* mBackSize;
   nsCSSValueList* mBackClip;
   nsCSSValueList* mBackOrigin;
   nsCSSValue      mBackInlinePolicy;
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index b63091e582f..c299ffa80d5 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -1209,7 +1209,7 @@ nsComputedDOMStyle::GetBackgroundList(PRUint8 nsStyleBackground::Layer::* aMembe
       delete valueList;
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    val->SetIdent(nsCSSProps::ValueToKeywordEnum(bg->mLayers[i].*aMember, 
+    val->SetIdent(nsCSSProps::ValueToKeywordEnum(bg->mLayers[i].*aMember,
                                                  aTable));
   }
 
@@ -1358,6 +1358,82 @@ nsComputedDOMStyle::GetBackgroundRepeat(nsIDOMCSSValue** aValue)
                            aValue);
 }
 
+nsresult
+nsComputedDOMStyle::GetMozBackgroundSize(nsIDOMCSSValue** aValue)
+{
+  const nsStyleBackground* bg = GetStyleBackground();
+
+  nsDOMCSSValueList *valueList = GetROCSSValueList(PR_TRUE);
+  NS_ENSURE_TRUE(valueList, NS_ERROR_OUT_OF_MEMORY);
+
+  for (PRUint32 i = 0, i_end = bg->mSizeCount; i < i_end; ++i) {
+    const nsStyleBackground::Size &size = bg->mLayers[i].mSize;
+
+    switch (size.mWidthType) {
+      case nsStyleBackground::Size::eContain:
+      case nsStyleBackground::Size::eCover: {
+        NS_ABORT_IF_FALSE(size.mWidthType == size.mHeightType,
+                          "unsynced types");
+        nsCSSKeyword keyword = size.mWidthType == nsStyleBackground::Size::eContain
+                             ? eCSSKeyword_contain
+                             : eCSSKeyword_cover;
+        nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
+        if (!val || !valueList->AppendCSSValue(val)) {
+          delete valueList;
+          delete val;
+          return NS_ERROR_OUT_OF_MEMORY;
+        }
+        val->SetIdent(keyword);
+        break;
+      }
+      default: {
+        nsDOMCSSValueList *itemList = GetROCSSValueList(PR_FALSE);
+        if (!itemList || !valueList->AppendCSSValue(itemList)) {
+          delete valueList;
+          delete itemList;
+          return NS_ERROR_OUT_OF_MEMORY;
+        }
+
+        nsROCSSPrimitiveValue* valX = GetROCSSPrimitiveValue();
+        nsROCSSPrimitiveValue* valY = GetROCSSPrimitiveValue();
+        if (!valX || !itemList->AppendCSSValue(valX)) {
+          delete valueList;
+          delete valX;
+          return NS_ERROR_OUT_OF_MEMORY;
+        }
+        if (!valY || !itemList->AppendCSSValue(valY)) {
+          delete valueList;
+          delete valY;
+          return NS_ERROR_OUT_OF_MEMORY;
+        }
+
+        if (size.mWidthType == nsStyleBackground::Size::eAuto) {
+          valX->SetIdent(eCSSKeyword_auto);
+        } else if (size.mWidthType == nsStyleBackground::Size::ePercentage) {
+          valX->SetPercent(size.mWidth.mFloat);
+        } else {
+          NS_ABORT_IF_FALSE(size.mWidthType == nsStyleBackground::Size::eLength,
+                            "bad mWidthType");
+          valX->SetAppUnits(size.mWidth.mCoord);
+        }
+
+        if (size.mHeightType == nsStyleBackground::Size::eAuto) {
+          valY->SetIdent(eCSSKeyword_auto);
+        } else if (size.mHeightType == nsStyleBackground::Size::ePercentage) {
+          valY->SetPercent(size.mHeight.mFloat);
+        } else {
+          NS_ABORT_IF_FALSE(size.mHeightType == nsStyleBackground::Size::eLength,
+                            "bad mHeightType");
+          valY->SetAppUnits(size.mHeight.mCoord);
+        }
+        break;
+      }
+    }
+  }
+
+  return CallQueryInterface(valueList, aValue);
+}
+
 nsresult
 nsComputedDOMStyle::GetPadding(nsIDOMCSSValue** aValue)
 {
@@ -4216,6 +4292,7 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
     COMPUTED_STYLE_MAP_ENTRY(_moz_background_clip,          BackgroundClip),
     COMPUTED_STYLE_MAP_ENTRY(_moz_background_inline_policy, BackgroundInlinePolicy),
     COMPUTED_STYLE_MAP_ENTRY(_moz_background_origin,        BackgroundOrigin),
+    COMPUTED_STYLE_MAP_ENTRY(_moz_background_size,          MozBackgroundSize),
     COMPUTED_STYLE_MAP_ENTRY(binding,                       Binding),
     COMPUTED_STYLE_MAP_ENTRY(border_bottom_colors,          BorderBottomColors),
     COMPUTED_STYLE_MAP_ENTRY(border_image,                  BorderImage),
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 178d7594ae4..7e8bf8fc710 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -175,6 +175,7 @@ private:
   nsresult GetBackgroundClip(nsIDOMCSSValue** aValue);
   nsresult GetBackgroundInlinePolicy(nsIDOMCSSValue** aValue);
   nsresult GetBackgroundOrigin(nsIDOMCSSValue** aValue);
+  nsresult GetMozBackgroundSize(nsIDOMCSSValue** aValue);
 
   /* Padding properties */
   nsresult GetPadding(nsIDOMCSSValue** aValue);
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index b02f42382a2..47625d13eab 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -1446,6 +1446,7 @@ nsRuleNode::GetBackgroundData(nsStyleContext* aContext)
   colorData.mBackRepeat = nsnull;
   colorData.mBackAttachment = nsnull;
   colorData.mBackPosition = nsnull;
+  colorData.mBackSize = nsnull;
   colorData.mBackClip = nsnull;
   colorData.mBackOrigin = nsnull;
 
@@ -3871,6 +3872,91 @@ struct BackgroundItemComputer<nsCSSValuePairList, nsStyleBackground::Position>
 };
 
 
+struct BackgroundSizeAxis {
+  nsCSSValue nsCSSValuePairList::* specified;
+  nsStyleBackground::Size::Dimension nsStyleBackground::Size::* result;
+  PRUint8 nsStyleBackground::Size::* type;
+};
+
+static const BackgroundSizeAxis gBGSizeAxes[] = {
+  { &nsCSSValuePairList::mXValue,
+    &nsStyleBackground::Size::mWidth,
+    &nsStyleBackground::Size::mWidthType },
+  { &nsCSSValuePairList::mYValue,
+    &nsStyleBackground::Size::mHeight,
+    &nsStyleBackground::Size::mHeightType }
+};
+
+NS_SPECIALIZE_TEMPLATE
+struct BackgroundItemComputer<nsCSSValuePairList, nsStyleBackground::Size>
+{
+  static void ComputeValue(nsStyleContext* aStyleContext,
+                           const nsCSSValuePairList* aSpecifiedValue,
+                           nsStyleBackground::Size& aComputedValue,
+                           PRBool& aCanStoreInRuleTree)
+  {
+    nsStyleBackground::Size &size = aComputedValue;
+    for (const BackgroundSizeAxis *axis = gBGSizeAxes,
+                        *axis_end = gBGSizeAxes + NS_ARRAY_LENGTH(gBGSizeAxes);
+         axis != axis_end; ++axis) {
+      const nsCSSValue &specified = aSpecifiedValue->*(axis->specified);
+      if (eCSSUnit_Auto == specified.GetUnit()) {
+        size.*(axis->type) = nsStyleBackground::Size::eAuto;
+      }
+      else if (eCSSUnit_Enumerated == specified.GetUnit()) {
+        PR_STATIC_ASSERT(nsStyleBackground::Size::eContain ==
+                         NS_STYLE_BG_SIZE_CONTAIN);
+        PR_STATIC_ASSERT(nsStyleBackground::Size::eCover ==
+                         NS_STYLE_BG_SIZE_COVER);
+        NS_ABORT_IF_FALSE(specified.GetIntValue() == NS_STYLE_BG_SIZE_CONTAIN ||
+                          specified.GetIntValue() == NS_STYLE_BG_SIZE_COVER,
+                          "invalid enumerated value for size coordinate");
+        size.*(axis->type) = specified.GetIntValue();
+      }
+      else if (eCSSUnit_Null == specified.GetUnit()) {
+        NS_ABORT_IF_FALSE(axis == gBGSizeAxes + 1,
+                          "null allowed only as height value, and only "
+                          "for contain/cover/initial/inherit");
+#ifdef DEBUG
+        {
+          const nsCSSValue &widthValue = aSpecifiedValue->mXValue;
+          NS_ABORT_IF_FALSE(widthValue.GetUnit() != eCSSUnit_Inherit &&
+                            widthValue.GetUnit() != eCSSUnit_Initial,
+                            "initial/inherit should already have been handled");
+          NS_ABORT_IF_FALSE(widthValue.GetUnit() == eCSSUnit_Enumerated &&
+                            (widthValue.GetIntValue() == NS_STYLE_BG_SIZE_CONTAIN ||
+                             widthValue.GetIntValue() == NS_STYLE_BG_SIZE_COVER),
+                            "null height value not corresponding to allowable "
+                            "non-null width value");
+        }
+#endif
+        size.*(axis->type) = size.mWidthType;
+      }
+      else if (eCSSUnit_Percent == specified.GetUnit()) {
+        (size.*(axis->result)).mFloat = specified.GetPercentValue();
+        size.*(axis->type) = nsStyleBackground::Size::ePercentage;
+      }
+      else {
+        NS_ABORT_IF_FALSE(specified.IsLengthUnit(), "unexpected unit");
+        (size.*(axis->result)).mCoord =
+          CalcLength(specified, aStyleContext, aStyleContext->PresContext(),
+                     aCanStoreInRuleTree);
+        size.*(axis->type) = nsStyleBackground::Size::eLength;
+      }
+    }
+
+    NS_ABORT_IF_FALSE(size.mWidthType < nsStyleBackground::Size::eDimensionType_COUNT,
+                      "bad width type");
+    NS_ABORT_IF_FALSE(size.mHeightType < nsStyleBackground::Size::eDimensionType_COUNT,
+                      "bad height type");
+    NS_ABORT_IF_FALSE((size.mWidthType != nsStyleBackground::Size::eContain &&
+                       size.mWidthType != nsStyleBackground::Size::eCover) ||
+                      size.mWidthType == size.mHeightType,
+                      "contain/cover apply to both dimensions or to neither");
+  }
+};
+
+
 template <class SpecifiedValueItem, class ComputedValueItem>
 static void
 SetBackgroundList(nsStyleContext* aStyleContext,
@@ -4018,6 +4104,15 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct,
                     bg->mPositionCount, maxItemCount, rebuild,
                     canStoreInRuleTree);
 
+  // background-size: enum, length, auto, inherit, initial [pair list]
+  nsStyleBackground::Size initialSize;
+  initialSize.SetInitialValues();
+  SetBackgroundList(aContext, colorData.mBackSize, bg->mLayers,
+                    parentBG->mLayers, &nsStyleBackground::Layer::mSize,
+                    initialSize, parentBG->mSizeCount,
+                    bg->mSizeCount, maxItemCount, rebuild,
+                    canStoreInRuleTree);
+
   if (rebuild) {
     // Delete any extra items.  We need to keep layers in which any
     // property was specified.
@@ -4036,6 +4131,8 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct,
                        bg->mOriginCount, fillCount);
     FillBackgroundList(bg->mLayers, &nsStyleBackground::Layer::mPosition,
                        bg->mPositionCount, fillCount);
+    FillBackgroundList(bg->mLayers, &nsStyleBackground::Layer::mSize,
+                       bg->mSizeCount, fillCount);
   }
 
   COMPUTE_END_RESET(Background, bg)
@@ -5750,6 +5847,7 @@ nsRuleNode::HasAuthorSpecifiedRules(nsStyleContext* aStyleContext,
         colorData.mBackPosition = nsnull;
         colorData.mBackClip = nsnull;
         colorData.mBackOrigin = nsnull;
+        colorData.mBackSize = nsnull;
 
         if (ruleData.mLevel == nsStyleSet::eAgentSheet ||
             ruleData.mLevel == nsStyleSet::eUserSheet) {
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 49eb59a0043..20ee637a521 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1217,6 +1217,7 @@ nsStyleBackground::nsStyleBackground()
   , mRepeatCount(1)
   , mPositionCount(1)
   , mImageCount(1)
+  , mSizeCount(1)
   , mBackgroundColor(NS_RGBA(0, 0, 0, 0))
   , mBackgroundInlinePolicy(NS_STYLE_BG_INLINE_POLICY_CONTINUOUS)
 {
@@ -1232,6 +1233,7 @@ nsStyleBackground::nsStyleBackground(const nsStyleBackground& aSource)
   , mRepeatCount(aSource.mRepeatCount)
   , mPositionCount(aSource.mPositionCount)
   , mImageCount(aSource.mImageCount)
+  , mSizeCount(aSource.mSizeCount)
   , mLayers(aSource.mLayers) // deep copy
   , mBackgroundColor(aSource.mBackgroundColor)
   , mBackgroundInlinePolicy(aSource.mBackgroundInlinePolicy)
@@ -1246,6 +1248,7 @@ nsStyleBackground::nsStyleBackground(const nsStyleBackground& aSource)
     mRepeatCount = PR_MAX(mRepeatCount, count);
     mPositionCount = PR_MAX(mPositionCount, count);
     mImageCount = PR_MAX(mImageCount, count);
+    mSizeCount = PR_MAX(mSizeCount, count);
   }
 }
 
@@ -1303,6 +1306,46 @@ nsStyleBackground::Position::SetInitialValues()
   mYIsPercent = PR_TRUE;
 }
 
+void
+nsStyleBackground::Size::SetInitialValues()
+{
+  mWidthType = mHeightType = eAuto;
+}
+
+PRBool
+nsStyleBackground::Size::operator==(const Size& aOther) const
+{
+  NS_ABORT_IF_FALSE(mWidthType < eDimensionType_COUNT,
+                    "bad mWidthType for this");
+  NS_ABORT_IF_FALSE(mHeightType < eDimensionType_COUNT,
+                    "bad mHeightType for this");
+  NS_ABORT_IF_FALSE(aOther.mWidthType < eDimensionType_COUNT,
+                    "bad mWidthType for aOther");
+  NS_ABORT_IF_FALSE(aOther.mHeightType < eDimensionType_COUNT,
+                    "bad mHeightType for aOther");
+
+  if (mWidthType != aOther.mWidthType || mHeightType != aOther.mHeightType)
+    return PR_FALSE;
+
+  if (mWidthType == ePercentage) {
+    if (mWidth.mFloat != aOther.mWidth.mFloat)
+      return PR_FALSE;
+  } else if (mWidthType == eLength) {
+    if (mWidth.mCoord != aOther.mWidth.mCoord)
+      return PR_FALSE;
+  }
+
+  if (mHeightType == ePercentage) {
+    if (mHeight.mFloat != aOther.mHeight.mFloat)
+      return PR_FALSE;
+  } else if (mHeightType == eLength) {
+    if (mHeight.mCoord != aOther.mHeight.mCoord)
+      return PR_FALSE;
+  }
+
+  return PR_TRUE;
+}
+
 nsStyleBackground::Layer::Layer()
 {
 }
@@ -1319,6 +1362,7 @@ nsStyleBackground::Layer::SetInitialValues()
   mOrigin = NS_STYLE_BG_ORIGIN_PADDING;
   mRepeat = NS_STYLE_BG_REPEAT_XY;
   mPosition.SetInitialValues();
+  mSize.SetInitialValues();
   mImage = nsnull;
 }
 
@@ -1329,6 +1373,7 @@ PRBool nsStyleBackground::Layer::operator==(const Layer& aOther) const
          mOrigin == aOther.mOrigin &&
          mRepeat == aOther.mRepeat &&
          mPosition == aOther.mPosition &&
+         mSize == aOther.mSize &&
          EqualImages(mImage, aOther.mImage);
 }
 
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index 13a1fd3179b..c8fff5e98ee 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -194,6 +194,40 @@ struct nsStyleBackground {
     }
   };
 
+  struct Size;
+  friend struct Size;
+  struct Size {
+    typedef union {
+      nscoord mCoord; // for lengths
+      float mFloat; // for percents
+    } Dimension;
+    Dimension mWidth, mHeight;
+
+    enum DimensionType {
+      // If one of mWidth and mHeight is eContain or eCover, then both are.
+      // Also, these two values must equal the corresponding values in
+      // kBackgroundSizeKTable.
+      eContain, eCover,
+
+      eAuto,
+      ePercentage,
+      eLength,
+      eDimensionType_COUNT
+    };
+    PRUint8 mWidthType, mHeightType;
+
+    // Initialize nothing
+    Size() {}
+
+    // Initialize to initial values
+    void SetInitialValues();
+
+    PRBool operator==(const Size& aOther) const;
+    PRBool operator!=(const Size& aOther) const {
+      return !(*this == aOther);
+    }
+  };
+
   struct Layer;
   friend struct Layer;
   struct Layer {
@@ -203,6 +237,7 @@ struct nsStyleBackground {
     PRUint8 mRepeat;                    // [reset] See nsStyleConsts.h
     Position mPosition;                 // [reset]
     nsCOMPtr<imgIRequest> mImage;       // [reset]
+    Size mSize;                         // [reset]
 
     // Initializes only mImage
     Layer();
@@ -225,7 +260,8 @@ struct nsStyleBackground {
            mOriginCount,
            mRepeatCount,
            mPositionCount,
-           mImageCount;
+           mImageCount,
+           mSizeCount;
   // Layers are stored in an array, matching the top-to-bottom order in
   // which they are specified in CSS.  The number of layers to be used
   // should come from the background-image property.  We create
@@ -234,7 +270,7 @@ struct nsStyleBackground {
   // callers in layout care about (which is also the one whose
   // background-clip applies to the background-color) may not be last
   // layer.  In layers below the bottom layer, properties will be
-  // unitialized unless their count, above, indicates that they are
+  // uninitialized unless their count, above, indicates that they are
   // present.
   nsAutoTArray<Layer, 1> mLayers;
 
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 684cf658c36..420b0955676 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -100,6 +100,14 @@ var gCSSProperties = {
 		other_values: [ "border", "content", "border, padding", "padding, padding, padding", "border, border" ],
 		invalid_values: [ "margin", "padding padding" ]
 	},
+	"-moz-background-size": {
+		domProp: "MozBackgroundSize",
+		inherited: false,
+		type: CSS_TYPE_LONGHAND,
+		initial_values: [ "auto", "auto auto" ],
+		other_values: [ "contain", "cover", "100px auto", "auto 100px", "100% auto", "auto 100%", "25% 50px", "3em 40%" ],
+		invalid_values: [ "contain contain", "cover cover", "cover auto", "auto cover", "contain cover", "cover contain", "-5px 3px", "3px -5px", "auto -5px", "-5px auto" ]
+	},
 	"-moz-binding": {
 		domProp: "MozBinding",
 		inherited: false,
@@ -613,8 +621,8 @@ var gCSSProperties = {
 		domProp: "background",
 		inherited: false,
 		type: CSS_TYPE_TRUE_SHORTHAND,
-		subproperties: [ "background-attachment", "background-color", "background-image", "background-position", "background-repeat", "-moz-background-clip", "-moz-background-origin" ],
-		initial_values: [ "transparent", "none", "repeat", "scroll", "0% 0%", "top left", "left top", "transparent none", "top left none", "left top none", "none left top", "none top left", "none 0% 0%", "transparent none repeat scroll top left", "left top repeat none scroll transparent"],
+		subproperties: [ "background-attachment", "background-color", "background-image", "background-position", "background-repeat", "-moz-background-clip", "-moz-background-origin", "-moz-background-size" ],
+		initial_values: [ "transparent", "none", "repeat", "scroll", "0% 0%", "top left", "left top", "transparent none", "top left none", "left top none", "none left top", "none top left", "none 0% 0%", "transparent none repeat scroll top left", "left top repeat none scroll transparent" ],
 		other_values: [
 		        /* without multiple backgrounds */
 		        "green", "none green repeat scroll left top", "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)", "repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') transparent left top scroll", "repeat-x", "repeat-y", "no-repeat", "none repeat-y transparent scroll 0% 0%", "fixed", "0% top transparent fixed repeat none", "top", "left", "50% 50%", "center", "bottom right scroll none transparent repeat", "50% transparent", "transparent 50%", "50%",

From 97300665e7329ac2d4390c98d683a67ce97d8926 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Mon, 13 Jul 2009 12:19:03 -0700
Subject: [PATCH 015/175] Bug 455555 - Use asynchronous queries for places
 AutoComplete. This changes the location bar's AutoComplete provider to use
 asynchronous queries instead of synchronous ones.  No more blocking the main
 thread FTW! r=mak r=Mardak r=dietrich

---
 browser/installer/unix/packages-static        |    1 +
 browser/installer/windows/packages-static     |    1 +
 storage/public/storage.h                      |    2 +
 toolkit/components/places/public/Makefile.in  |    1 +
 .../places/public/mozIPlacesAutoComplete.idl  |  110 ++
 toolkit/components/places/src/Makefile.in     |   23 +-
 .../components/places/src/SQLFunctions.cpp    |  292 ++++
 toolkit/components/places/src/SQLFunctions.h  |  208 +++
 .../components/places/src/nsNavHistory.cpp    |  298 ++--
 toolkit/components/places/src/nsNavHistory.h  |  132 +-
 .../places/src/nsNavHistoryAutoComplete.cpp   | 1276 -----------------
 .../places/src/nsPlacesAutoComplete.js        | 1056 ++++++++++++++
 .../components/places/src/nsPlacesModule.cpp  |    6 -
 .../tests/autocomplete/head_autocomplete.js   |    9 +-
 .../places/tests/unit/test_000_frecency.js    |    9 +-
 15 files changed, 1844 insertions(+), 1580 deletions(-)
 create mode 100644 toolkit/components/places/public/mozIPlacesAutoComplete.idl
 create mode 100644 toolkit/components/places/src/SQLFunctions.cpp
 create mode 100644 toolkit/components/places/src/SQLFunctions.h
 delete mode 100644 toolkit/components/places/src/nsNavHistoryAutoComplete.cpp
 create mode 100644 toolkit/components/places/src/nsPlacesAutoComplete.js

diff --git a/browser/installer/unix/packages-static b/browser/installer/unix/packages-static
index 703a17fc21c..53661b5c25b 100644
--- a/browser/installer/unix/packages-static
+++ b/browser/installer/unix/packages-static
@@ -238,6 +238,7 @@ bin/components/txEXSLTRegExFunctions.js
 bin/components/nsLivemarkService.js
 bin/components/nsTaggingService.js
 bin/components/nsPlacesDBFlush.js
+bin/components/nsPlacesAutoComplete.js
 bin/components/nsDefaultCLH.js
 bin/components/nsContentPrefService.js
 bin/components/nsContentDispatchChooser.js
diff --git a/browser/installer/windows/packages-static b/browser/installer/windows/packages-static
index fdde0d3037b..122c38956c6 100644
--- a/browser/installer/windows/packages-static
+++ b/browser/installer/windows/packages-static
@@ -245,6 +245,7 @@ bin\components\txEXSLTRegExFunctions.js
 bin\components\nsLivemarkService.js
 bin\components\nsTaggingService.js
 bin\components\nsPlacesDBFlush.js
+bin\components\nsPlacesAutoComplete.js
 bin\components\nsDefaultCLH.js
 bin\components\nsContentPrefService.js
 bin\components\nsContentDispatchChooser.js
diff --git a/storage/public/storage.h b/storage/public/storage.h
index cdf828a1202..ce3877b7d7d 100644
--- a/storage/public/storage.h
+++ b/storage/public/storage.h
@@ -61,4 +61,6 @@
 #include "mozStorageHelper.h"
 #include "mozStorageCID.h"
 
+#include "mozilla/storage/Variant.h"
+
 #endif // mozilla_storage_h_
diff --git a/toolkit/components/places/public/Makefile.in b/toolkit/components/places/public/Makefile.in
index 47d4e07dedb..2c2b53b6611 100644
--- a/toolkit/components/places/public/Makefile.in
+++ b/toolkit/components/places/public/Makefile.in
@@ -61,6 +61,7 @@ XPIDLSRCS += \
   nsITaggingService.idl  \
   nsPIPlacesDatabase.idl \
   nsPIPlacesHistoryListenersNotifier.idl \
+  mozIPlacesAutoComplete.idl \
   $(NULL)
 endif
 
diff --git a/toolkit/components/places/public/mozIPlacesAutoComplete.idl b/toolkit/components/places/public/mozIPlacesAutoComplete.idl
new file mode 100644
index 00000000000..ef18a1fe961
--- /dev/null
+++ b/toolkit/components/places/public/mozIPlacesAutoComplete.idl
@@ -0,0 +1,110 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Places code
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Shawn Wilsher <me@shawnwilsher.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+/**
+ * This interface provides some constants used by the Places AutoComplete
+ * search provider.
+ */
+[scriptable, uuid(a5ae8332-333c-412a-bb02-a35df8247714)]
+interface mozIPlacesAutoComplete : nsISupports
+{
+  //////////////////////////////////////////////////////////////////////////////
+  //// Matching Constants
+
+  /**
+   * Match anywhere in each searchable term.
+   */
+  const long MATCH_ANYWHERE = 0;
+
+  /**
+   * Match first on word boundaries, and if we do not get enough results, then
+   * match anywhere in each searchable term.
+   */
+  const long MATCH_BOUNDARY_ANYWHERE = 1;
+
+  /**
+   * Match on word boundaries in each searchable term.
+   */
+  const long MATCH_BOUNDARY = 2;
+
+  /**
+   * Match only the beginning of each search term.
+   */
+  const long MATCH_BEGINNING = 3;
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Search Behavior Constants
+
+  /**
+   * Search through history.
+   */
+  const long BEHAVIOR_HISTORY = 1 << 0;
+
+  /**
+   * Search though bookmarks.
+   */
+  const long BEHAVIOR_BOOKMARK = 1 << 1;
+
+  /**
+   * Search through tags.
+   */
+  const long BEHAVIOR_TAG = 1 << 2;
+
+  /**
+   * Search the title of pages.
+   */
+  const long BEHAVIOR_TITLE = 1 << 3;
+
+  /**
+   * Search the URL of pages.
+   */
+  const long BEHAVIOR_URL = 1 << 4;
+
+  /**
+   * Search for typed pages.
+   */
+  const long BEHAVIOR_TYPED = 1 << 5;
+
+  /**
+   * Search javascript: URLs.
+   */
+  const long BEHAVIOR_JAVASCRIPT = 1 << 6;
+};
diff --git a/toolkit/components/places/src/Makefile.in b/toolkit/components/places/src/Makefile.in
index 4bdc5208f7f..8607ef2c6cd 100644
--- a/toolkit/components/places/src/Makefile.in
+++ b/toolkit/components/places/src/Makefile.in
@@ -87,14 +87,9 @@ CPPSRCS = \
           nsMaybeWeakPtr.cpp \
           nsMorkHistoryImporter.cpp \
           nsPlacesModule.cpp \
+          SQLFunctions.cpp \
           $(NULL)
 
-ifdef MOZ_XUL
-CPPSRCS += \
-          nsNavHistoryAutoComplete.cpp \
-          $(NULL)
-endif
-
 EXTRA_DSO_LDOPTS += \
 	$(DEPTH)/db/morkreader/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX) \
 	$(MOZ_UNICHARUTIL_LIBS) \
@@ -103,10 +98,18 @@ EXTRA_DSO_LDOPTS += \
 
 LOCAL_INCLUDES += -I$(srcdir)/../../build
 
-EXTRA_PP_COMPONENTS = nsLivemarkService.js \
-                      nsTaggingService.js \
-                      nsPlacesDBFlush.js \
-                      $(NULL)
+EXTRA_PP_COMPONENTS = \
+  nsLivemarkService.js \
+  nsTaggingService.js \
+  $(NULL)
+
+EXTRA_COMPONENTS = \
+  nsPlacesDBFlush.js \
+  $(NULL)
+
+ifdef MOZ_XUL
+EXTRA_COMPONENTS += nsPlacesAutoComplete.js
+endif
 
 EXTRA_JS_MODULES = \
   utils.js \
diff --git a/toolkit/components/places/src/SQLFunctions.cpp b/toolkit/components/places/src/SQLFunctions.cpp
new file mode 100644
index 00000000000..8ca9b7a8d9c
--- /dev/null
+++ b/toolkit/components/places/src/SQLFunctions.cpp
@@ -0,0 +1,292 @@
+/* vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Places code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Shawn Wilsher <me@shawnwilsher.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "mozilla/storage.h"
+#include "nsString.h"
+#include "nsUnicharUtils.h"
+#include "nsWhitespaceTokenizer.h"
+#include "nsEscape.h"
+#include "mozIPlacesAutoComplete.h"
+#include "SQLFunctions.h"
+
+using namespace mozilla::storage;
+
+namespace mozilla {
+namespace places {
+
+////////////////////////////////////////////////////////////////////////////////
+//// AutoComplete Matching Function
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// MatchAutoCompleteFunction
+
+  /* static */
+  nsresult
+  MatchAutoCompleteFunction::create(mozIStorageConnection *aDBConn)
+  {
+    nsRefPtr<MatchAutoCompleteFunction> function(new MatchAutoCompleteFunction);
+    NS_ENSURE_TRUE(function, NS_ERROR_OUT_OF_MEMORY);
+
+    nsresult rv = aDBConn->CreateFunction(
+      NS_LITERAL_CSTRING("autocomplete_match"), kArgIndexLength, function
+    );
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+  /* static */
+  nsString
+  MatchAutoCompleteFunction::fixupURISpec(const nsDependentCString &aURISpec)
+  {
+    nsCAutoString unescapedSpec;
+    (void)NS_UnescapeURL(aURISpec, esc_SkipControl | esc_AlwaysCopy,
+                         unescapedSpec);
+
+    // If this unescaped string is valid UTF-8, we'll convert it.  Otherwise,
+    // we will simply convert our original string.
+    nsString fixedSpec;
+    if (IsUTF8(unescapedSpec))
+      CopyUTF8toUTF16(unescapedSpec, fixedSpec);
+    else
+      CopyUTF8toUTF16(aURISpec, fixedSpec);
+
+    if (StringBeginsWith(fixedSpec, NS_LITERAL_STRING("http://")))
+      fixedSpec.Cut(0, 7);
+    else if (StringBeginsWith(fixedSpec, NS_LITERAL_STRING("https://")))
+      fixedSpec.Cut(0, 8);
+    else if (StringBeginsWith(fixedSpec, NS_LITERAL_STRING("ftp://")))
+      fixedSpec.Cut(0, 6);
+
+    return fixedSpec;
+  }
+
+  /* static */
+  bool
+  MatchAutoCompleteFunction::findAnywhere(const nsDependentSubstring &aToken,
+                                          const nsAString &aSourceString)
+  {
+    return !!CaseInsensitiveFindInReadable(aToken, aSourceString);
+  }
+
+  /* static */
+  bool
+  MatchAutoCompleteFunction::findBeginning(const nsDependentSubstring &aToken,
+                                           const nsAString &aSourceString)
+  {
+    return !!StringBeginsWith(aSourceString, aToken,
+                              nsCaseInsensitiveStringComparator());
+  }
+
+  /* static */
+  bool
+  MatchAutoCompleteFunction::findOnBoundary(const nsDependentSubstring &aToken,
+                                            const nsAString &aSourceString)
+  {
+    // We cannot match anything if there is nothing to search.
+    if (aSourceString.IsEmpty())
+      return false;
+
+    // Define a const instance of this class so it is created once.
+    const nsCaseInsensitiveStringComparator caseInsensitiveCompare;
+
+    const_wchar_iterator tokenStart(aToken.BeginReading()),
+                         tokenEnd(aToken.EndReading()),
+                         sourceStart(aSourceString.BeginReading()),
+                         sourceEnd(aSourceString.EndReading());
+
+    // The start of aSourceString is considered a word boundary, so start there.
+    do {
+      // We are on a word boundary, so start by copying the iterators.
+      const_wchar_iterator testTokenItr(tokenStart),
+                           testSourceItr(sourceStart);
+
+      // Keep trying to match the token one by one until it doesn't match.
+      while (!caseInsensitiveCompare(*testTokenItr, *testSourceItr)) {
+        // We matched something, so move down one.
+        testTokenItr++;
+        testSourceItr++;
+
+        // Matched the full token, so we are done!
+        if (testTokenItr == tokenEnd)
+          return true;
+
+        // However, if we ran into the end of the source while matching the
+        // token, we will not find it.
+        if (testSourceItr == sourceEnd)
+          return false;
+      }
+
+      // Always advance our starting iterator, and if we are not currently on a
+      // word boundary, advance to the next word boundary.
+      if (!isWordBoundary(ToLowerCase(*sourceStart++)))
+        sourceStart = nextWordBoundary(sourceStart, sourceEnd);
+    } while (sourceStart != sourceEnd);
+
+    return false;
+  }
+
+  /* static */
+  MatchAutoCompleteFunction::const_wchar_iterator
+  MatchAutoCompleteFunction::nextWordBoundary(const_wchar_iterator aStart,
+                                              const_wchar_iterator aEnd)
+  {
+    while (aStart != aEnd && !isWordBoundary(*aStart))
+      aStart++;
+    return aStart;
+  }
+
+  /* static */
+  bool
+  MatchAutoCompleteFunction::isWordBoundary(const PRUnichar &aChar)
+  {
+    // Only check lowercase alphabetic characters so we can match CamelCase
+    // words.  This means that matches will happen after an upper-case
+    // character.
+    return !(PRUnichar('a') <= aChar && aChar <= PRUnichar('z'));
+  }
+
+  /* static */
+  MatchAutoCompleteFunction::searchFunctionPtr
+  MatchAutoCompleteFunction::getSearchFunction(PRInt32 aBehavior)
+  {
+    switch (aBehavior) {
+      case mozIPlacesAutoComplete::MATCH_ANYWHERE:
+        return findAnywhere;
+      case mozIPlacesAutoComplete::MATCH_BEGINNING:
+        return findBeginning;
+      case mozIPlacesAutoComplete::MATCH_BOUNDARY:
+      default:
+        return findOnBoundary;
+    };
+  }
+
+  NS_IMPL_THREADSAFE_ISUPPORTS1(
+    MatchAutoCompleteFunction,
+    mozIStorageFunction
+  )
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// mozIStorageFunction
+
+  NS_IMETHODIMP
+  MatchAutoCompleteFunction::OnFunctionCall(mozIStorageValueArray *aArguments,
+                                            nsIVariant **_result)
+  {
+    // Macro to make the code a bit cleaner and easier to read.  Operates on
+    // searchBehavior.
+    PRInt32 searchBehavior = aArguments->AsInt32(kArgIndexSearchBehavior);
+    #define HAS_BEHAVIOR(aBitName) \
+      (searchBehavior & mozIPlacesAutoComplete::BEHAVIOR_##aBitName)
+
+    nsDependentString searchString;
+    (void)aArguments->GetString(kArgSearchString, searchString);
+    nsDependentCString url;
+    (void)aArguments->GetUTF8String(kArgIndexURL, url);
+
+    // We only want to filter javascript: URLs if we are not supposed to search
+    // for them, and the search does not start with "javascript:".
+    if (!HAS_BEHAVIOR(JAVASCRIPT) &&
+        !StringBeginsWith(searchString, NS_LITERAL_STRING("javascript:")) &&
+        StringBeginsWith(url, NS_LITERAL_CSTRING("javascript:"))) {
+      NS_IF_ADDREF(*_result = new IntegerVariant(0));
+      NS_ENSURE_TRUE(*_result, NS_ERROR_OUT_OF_MEMORY);
+      return NS_OK;
+    }
+
+    PRInt32 visitCount = aArguments->AsInt32(kArgIndexVisitCount);
+    bool typed = aArguments->AsInt32(kArgIndexTyped) ? true : false;
+    bool bookmark = aArguments->AsInt32(kArgIndexBookmark) ? true : false;
+    nsDependentString tags;
+    (void)aArguments->GetString(kArgIndexTags, tags);
+
+    // Make sure we match all the filter requirements.  If a given restriction
+    // is active, make sure the corresponding condition is not true.
+    bool matches = !(
+      (HAS_BEHAVIOR(HISTORY) && visitCount == 0) ||
+      (HAS_BEHAVIOR(TYPED) && !typed) ||
+      (HAS_BEHAVIOR(BOOKMARK) && !bookmark) ||
+      (HAS_BEHAVIOR(TAG) && tags.IsVoid())
+    );
+    if (!matches) {
+      NS_IF_ADDREF(*_result = new IntegerVariant(0));
+      NS_ENSURE_TRUE(*_result, NS_ERROR_OUT_OF_MEMORY);
+      return NS_OK;
+    }
+
+    // Clean up our URI spec and prepare it for searching.
+    nsString fixedURI = fixupURISpec(url);
+
+    // Obtain our search function.
+    PRInt32 matchBehavior = aArguments->AsInt32(kArgIndexMatchBehavior);
+    searchFunctionPtr searchFunction = getSearchFunction(matchBehavior);
+
+    nsDependentString title;
+    (void)aArguments->GetString(kArgIndexTitle, title);
+
+    // Determine if every token matches either the bookmark title, tags, page
+    // title, or page URL.
+    nsWhitespaceTokenizer tokenizer(searchString);
+    while (matches && tokenizer.hasMoreTokens()) {
+      const nsDependentSubstring &token = tokenizer.nextToken();
+
+      bool matchTags = searchFunction(token, tags);
+      bool matchTitle = searchFunction(token, title);
+
+      // Make sure we match something in the title or tags if we have to.
+      matches = matchTags || matchTitle;
+      if (HAS_BEHAVIOR(TITLE) && !matches)
+        break;
+
+      bool matchURL = searchFunction(token, fixedURI);
+      // If we do not match the URL when we have to, reset matches to false.
+      // Otherwise, keep track that we did match the current search.
+      if (HAS_BEHAVIOR(URL) && !matchURL)
+        matches = false;
+      else
+        matches = matches || matchURL;
+    }
+
+    NS_IF_ADDREF(*_result = new IntegerVariant(matches ? 1 : 0));
+    NS_ENSURE_TRUE(*_result, NS_ERROR_OUT_OF_MEMORY);
+    return NS_OK;
+    #undef HAS_BEHAVIOR
+  }
+
+} // namespace places
+} // namespace mozilla
diff --git a/toolkit/components/places/src/SQLFunctions.h b/toolkit/components/places/src/SQLFunctions.h
new file mode 100644
index 00000000000..dc6e3f5d536
--- /dev/null
+++ b/toolkit/components/places/src/SQLFunctions.h
@@ -0,0 +1,208 @@
+/* vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Places code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Shawn Wilsher <me@shawnwilsher.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef mozilla_places_SQLFunctions_h_
+#define mozilla_places_SQLFunctions_h_
+
+/**
+ * This file contains functions that Places adds to the database handle that can
+ * be accessed by SQL queries.
+ */
+
+#include "mozIStorageFunction.h"
+
+class mozIStorageConnection;
+
+namespace mozilla {
+namespace places {
+
+////////////////////////////////////////////////////////////////////////////////
+//// AutoComplete Matching Function
+
+/**
+ * This function is used to determine if a given set of data should match an
+ * AutoComplete query.
+ *
+ * In SQL, you'd use it in the WHERE clause like so:
+ * WHERE AUTOCOMPLETE_MATCH(aSearchString, aURL, aTitle, aTags, aVisitCount,
+ *                          aTyped)
+ *
+ * @param aSearchString
+ *        The string to compare against.
+ * @param aURL
+ *        The URL to test for an AutoComplete match.
+ * @param aTitle
+ *        The title to test for an AutoComplete match.
+ * @param aTags
+ *        The tags to test for an AutoComplete match.
+ * @param aVisitCount
+ *        The number of visits aURL has.
+ * @param aTyped
+ *        Indicates if aURL is a typed URL or not.  Treated as a boolean.
+ * @param aBookmark
+ *        Indicates if aURL is a bookmark or not.  Treated as a boolean.
+ * @param aMatchBehavior
+ *        The match behavior to use for this search.
+ * @param aSearchBehavior
+ *        A bitfield dictating the search behavior.
+ */
+class MatchAutoCompleteFunction : public mozIStorageFunction
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_MOZISTORAGEFUNCTION
+
+  /**
+   * Registers the function with the specified database connection.
+   *
+   * @param aDBConn
+   *        The database connection to register with.
+   */
+  static nsresult create(mozIStorageConnection *aDBConn);
+
+private:
+  /**
+   * Argument Indexes
+   */
+  static const PRUint32 kArgSearchString = 0;
+  static const PRUint32 kArgIndexURL = 1;
+  static const PRUint32 kArgIndexTitle = 2;
+  static const PRUint32 kArgIndexTags = 3;
+  static const PRUint32 kArgIndexVisitCount = 4;
+  static const PRUint32 kArgIndexTyped = 5;
+  static const PRUint32 kArgIndexBookmark = 6;
+  static const PRUint32 kArgIndexMatchBehavior = 7;
+  static const PRUint32 kArgIndexSearchBehavior = 8;
+  static const PRUint32 kArgIndexLength = 9;
+
+  /**
+   * Typedefs
+   */
+  typedef bool (*searchFunctionPtr)(const nsDependentSubstring &aToken,
+                                    const nsAString &aSourceString);
+
+  typedef nsAString::const_char_iterator const_wchar_iterator;
+
+  /**
+   * Obtains the search function to match on.
+   *
+   * @param aBehavior
+   *        The matching behavior to use defined by one of the
+   *        mozIPlacesAutoComplete::MATCH_* values.
+   * @return a pointer to the function that will perform the proper search.
+   */
+  static searchFunctionPtr getSearchFunction(PRInt32 aBehavior);
+
+  /**
+   * Searches aSourceString for aToken anywhere in the string in a case-
+   * insensitive way.
+   *
+   * @param aToken
+   *        The string to search for.
+   * @param aSourceString
+   *        The string to search.
+   * @return true if found, false otherwise.
+   */
+  static bool findAnywhere(const nsDependentSubstring &aToken,
+                           const nsAString &aSourceString);
+
+  /**
+   * Tests if aSourceString starts with aToken.
+   *
+   * @param aToken
+   *        The string to search for.
+   * @param aSourceString
+   *        The string to search.
+   * @return true if found, false otherwise.
+   */
+  static bool findBeginning(const nsDependentSubstring &aToken,
+                            const nsAString &aSourceString);
+
+  /**
+   * Tests if aToken is found on a word boundary in aSourceString.
+   *
+   * @param aToken
+   *        The string to search for.
+   * @param aSourceString
+   *        The string to search.
+   * @return true if found, false otherwise.
+   */
+  static bool findOnBoundary(const nsDependentSubstring &aToken,
+                             const nsAString &aSourceString);
+
+  /**
+   * Obtains an iterator to the next word boundary as defined by isWordBoundary.
+   *
+   * @param aStart
+   *        An iterator pointing to the start of the string.
+   * @param aEnd
+   *        An iterator pointing to the end of the string.
+   * @return an iterator pointing to the next word boundary.
+   */
+  static const_wchar_iterator nextWordBoundary(const_wchar_iterator aStart,
+                                               const_wchar_iterator aEnd);
+  /**
+   * Determines if aChar is a word boundary.  A 'word boundary' is anything that
+   * is not used to build up a word from a string of characters.  We are very
+   * conservative here because anything that we do not list will be treated as a
+   * word boundary.  This means searching for that not-actually-a-word-boundary
+   * character can still be matched in the middle of a word.
+   *
+   * @param aChar
+   *        The Unicode character to check against.
+   * @return true if the character is considered a word boundary, false
+   *          otherwise.
+   */
+  static inline bool isWordBoundary(const PRUnichar &aChar);
+
+  /**
+   * Fixes a URI's spec such that it is ready to be searched.  This includes
+   * unescaping escaped characters and removing certain specs that we do not
+   * care to search for.
+   *
+   * @param aURISpec
+   *        The spec of the URI to prepare for searching.
+   * @return the new string to use for the URI spec.
+   */
+  static nsString fixupURISpec(const nsDependentCString &aURISpec);
+};
+
+} // namespace places
+} // namespace storage
+
+#endif // mozilla_places_SQLFunctions_h_
diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index 3720f11aa2f..349be7169a3 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -54,6 +54,7 @@
 #include "nsPlacesIndexes.h"
 #include "nsPlacesTriggers.h"
 #include "nsPlacesMacros.h"
+#include "SQLFunctions.h"
 
 #include "nsIArray.h"
 #include "nsTArray.h"
@@ -89,20 +90,18 @@
 #include "nsIIDNService.h"
 #include "nsIClassInfoImpl.h"
 #include "nsThreadUtils.h"
-
-#include "mozIStorageConnection.h"
-#include "mozIStorageFunction.h"
-#include "mozIStoragePendingStatement.h"
-#include "mozIStorageService.h"
-#include "mozIStorageStatement.h"
-#include "mozIStorageValueArray.h"
-#include "mozStorageCID.h"
-#include "mozStorageHelper.h"
-#include "mozIStorageError.h"
 #include "nsAppDirectoryServiceDefs.h"
+#include "mozilla/storage.h"
+
+#ifdef MOZ_XUL
+#include "nsIAutoCompleteInput.h"
+#include "nsIAutoCompletePopup.h"
+#endif
 
 #include "nsMathUtils.h" // for NS_ceilf()
 
+using namespace mozilla::places;
+
 // Microsecond timeout for "recent" events such as typed and bookmark following.
 // If you typed it more than this time ago, it's not recent.
 // This is 15 minutes           m    s/m  us/s
@@ -124,20 +123,6 @@
 #define PREF_BROWSER_HISTORY_EXPIRE_DAYS_MIN    "history_expire_days_min"
 #define PREF_BROWSER_HISTORY_EXPIRE_DAYS_MAX    "history_expire_days"
 #define PREF_BROWSER_HISTORY_EXPIRE_SITES       "history_expire_sites"
-#define PREF_AUTOCOMPLETE_ENABLED               "urlbar.autocomplete.enabled"
-#define PREF_AUTOCOMPLETE_MATCH_BEHAVIOR        "urlbar.matchBehavior"
-#define PREF_AUTOCOMPLETE_FILTER_JAVASCRIPT     "urlbar.filter.javascript"
-#define PREF_AUTOCOMPLETE_ENABLED               "urlbar.autocomplete.enabled"
-#define PREF_AUTOCOMPLETE_MAX_RICH_RESULTS      "urlbar.maxRichResults"
-#define PREF_AUTOCOMPLETE_DEFAULT_BEHAVIOR      "urlbar.default.behavior"
-#define PREF_AUTOCOMPLETE_RESTRICT_HISTORY      "urlbar.restrict.history"
-#define PREF_AUTOCOMPLETE_RESTRICT_BOOKMARK     "urlbar.restrict.bookmark"
-#define PREF_AUTOCOMPLETE_RESTRICT_TAG          "urlbar.restrict.tag"
-#define PREF_AUTOCOMPLETE_MATCH_TITLE           "urlbar.match.title"
-#define PREF_AUTOCOMPLETE_MATCH_URL             "urlbar.match.url"
-#define PREF_AUTOCOMPLETE_RESTRICT_TYPED        "urlbar.restrict.typed"
-#define PREF_AUTOCOMPLETE_SEARCH_CHUNK_SIZE     "urlbar.search.chunkSize"
-#define PREF_AUTOCOMPLETE_SEARCH_TIMEOUT        "urlbar.search.timeout"
 #define PREF_DB_CACHE_PERCENTAGE                "history_cache_percentage"
 #define PREF_FRECENCY_NUM_VISITS                "places.frecency.numVisits"
 #define PREF_FRECENCY_FIRST_BUCKET_CUTOFF       "places.frecency.firstBucketCutoff"
@@ -160,6 +145,8 @@
 #define PREF_FRECENCY_UNVISITED_BOOKMARK_BONUS  "places.frecency.unvisitedBookmarkBonus"
 #define PREF_FRECENCY_UNVISITED_TYPED_BONUS     "places.frecency.unvisitedTypedBonus"
 
+#define PLACES_AUTOCOMPLETE_FEEDBACK_UPDATED_TOPIC "places-autocomplete-feedback-updated"
+
 // Default (integer) value of PREF_DB_CACHE_PERCENTAGE from 0-100
 // This is 6% of machine memory, giving 15MB for a user with 256MB of memory.
 // The most that will be used is the size of the DB file. Normal history sizes
@@ -239,10 +226,6 @@ NS_INTERFACE_MAP_BEGIN(nsNavHistory)
   NS_INTERFACE_MAP_ENTRY(nsICharsetResolver)
   NS_INTERFACE_MAP_ENTRY(nsPIPlacesDatabase)
   NS_INTERFACE_MAP_ENTRY(nsPIPlacesHistoryListenersNotifier)
-#ifdef MOZ_XUL
-  NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteSearch)
-  NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteSimpleResultListener)
-#endif
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsINavHistoryService)
   NS_IMPL_QUERY_CLASSINFO(nsNavHistory)
 NS_INTERFACE_MAP_END
@@ -366,21 +349,6 @@ const PRInt32 nsNavHistory::kGetInfoIndex_ItemId = 8;
 const PRInt32 nsNavHistory::kGetInfoIndex_ItemDateAdded = 9;
 const PRInt32 nsNavHistory::kGetInfoIndex_ItemLastModified = 10;
 
-const PRInt32 nsNavHistory::kAutoCompleteIndex_URL = 0;
-const PRInt32 nsNavHistory::kAutoCompleteIndex_Title = 1;
-const PRInt32 nsNavHistory::kAutoCompleteIndex_FaviconURL = 2;
-const PRInt32 nsNavHistory::kAutoCompleteIndex_ParentId = 3;
-const PRInt32 nsNavHistory::kAutoCompleteIndex_BookmarkTitle = 4;
-const PRInt32 nsNavHistory::kAutoCompleteIndex_Tags = 5;
-const PRInt32 nsNavHistory::kAutoCompleteIndex_VisitCount = 6;
-const PRInt32 nsNavHistory::kAutoCompleteIndex_Typed = 7;
-
-const PRInt32 nsNavHistory::kAutoCompleteBehaviorHistory = 1 << 0;
-const PRInt32 nsNavHistory::kAutoCompleteBehaviorBookmark = 1 << 1;
-const PRInt32 nsNavHistory::kAutoCompleteBehaviorTag = 1 << 2;
-const PRInt32 nsNavHistory::kAutoCompleteBehaviorTitle = 1 << 3;
-const PRInt32 nsNavHistory::kAutoCompleteBehaviorUrl = 1 << 4;
-const PRInt32 nsNavHistory::kAutoCompleteBehaviorTyped = 1 << 5;
 
 static const char* gQuitApplicationGrantedMessage = "quit-application-granted";
 static const char* gXpcomShutdown = "xpcom-shutdown";
@@ -424,21 +392,6 @@ nsNavHistory::nsNavHistory() : mBatchLevel(0),
                                mNowValid(PR_FALSE),
                                mExpireNowTimer(nsnull),
                                mExpire(this),
-                               mAutoCompleteEnabled(PR_TRUE),
-                               mAutoCompleteMatchBehavior(MATCH_BOUNDARY_ANYWHERE),
-                               mAutoCompleteMaxResults(25),
-                               mAutoCompleteRestrictHistory(NS_LITERAL_STRING("^")),
-                               mAutoCompleteRestrictBookmark(NS_LITERAL_STRING("*")),
-                               mAutoCompleteRestrictTag(NS_LITERAL_STRING("+")),
-                               mAutoCompleteMatchTitle(NS_LITERAL_STRING("#")),
-                               mAutoCompleteMatchUrl(NS_LITERAL_STRING("@")),
-                               mAutoCompleteRestrictTyped(NS_LITERAL_STRING("~")),
-                               mAutoCompleteSearchChunkSize(100),
-                               mAutoCompleteSearchTimeout(100),
-                               mAutoCompleteDefaultBehavior(0),
-                               mAutoCompleteCurrentBehavior(0),
-                               mPreviousChunkOffset(-1),
-                               mAutoCompleteFinishedSearch(PR_FALSE),
                                mExpireDaysMin(0),
                                mExpireDaysMax(0),
                                mExpireSites(0),
@@ -519,11 +472,6 @@ nsNavHistory::Init()
   rv = NS_DispatchToMainThread(completeEvent);
   NS_ENSURE_SUCCESS(rv, rv);
 
-#ifdef MOZ_XUL
-  rv = InitAutoComplete();
-  NS_ENSURE_SUCCESS(rv, rv);
-#endif
-
   // extract the last session ID so we know where to pick up. There is no index
   // over sessions so the naive statement "SELECT MAX(session) FROM
   // moz_historyvisits" won't have good performance.
@@ -565,19 +513,6 @@ nsNavHistory::Init()
 
   nsCOMPtr<nsIPrefBranch2> pbi = do_QueryInterface(mPrefBranch);
   if (pbi) {
-    pbi->AddObserver(PREF_AUTOCOMPLETE_ENABLED, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_MATCH_BEHAVIOR, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_FILTER_JAVASCRIPT, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_MAX_RICH_RESULTS, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_DEFAULT_BEHAVIOR, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_RESTRICT_HISTORY, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_RESTRICT_BOOKMARK, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_RESTRICT_TAG, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_MATCH_TITLE, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_MATCH_URL, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_RESTRICT_TYPED, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_SEARCH_CHUNK_SIZE, this, PR_FALSE);
-    pbi->AddObserver(PREF_AUTOCOMPLETE_SEARCH_TIMEOUT, this, PR_FALSE);
     pbi->AddObserver(PREF_BROWSER_HISTORY_EXPIRE_DAYS_MAX, this, PR_FALSE);
     pbi->AddObserver(PREF_BROWSER_HISTORY_EXPIRE_DAYS_MIN, this, PR_FALSE);
     pbi->AddObserver(PREF_BROWSER_HISTORY_EXPIRE_SITES, this, PR_FALSE);
@@ -1151,11 +1086,15 @@ nsNavHistory::InitViews()
 nsresult
 nsNavHistory::InitFunctions()
 {
-  nsresult rv;
+  nsCOMPtr<mozIStorageFunction> func =
+    new mozStorageFunctionGetUnreversedHost;
+  NS_ENSURE_TRUE(func, NS_ERROR_OUT_OF_MEMORY);
+  nsresult rv = mDBConn->CreateFunction(
+    NS_LITERAL_CSTRING("get_unreversed_host"), 1, func
+  );
+  NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = mDBConn->CreateFunction(
-      NS_LITERAL_CSTRING("get_unreversed_host"), 1, 
-      new mozStorageFunctionGetUnreversedHost);
+  rv = MatchAutoCompleteFunction::create(mDBConn);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
@@ -2146,62 +2085,6 @@ nsNavHistory::LoadPrefs(PRBool aInitializing)
   if (NS_FAILED(mPrefBranch->GetIntPref(PREF_BROWSER_HISTORY_EXPIRE_SITES,
                                         &mExpireSites)))
     mExpireSites = EXPIRATION_CAP_SITES;
-  
-#ifdef MOZ_XUL
-  mPrefBranch->GetBoolPref(PREF_AUTOCOMPLETE_ENABLED, &mAutoCompleteEnabled);
-
-  PRInt32 matchBehavior = 1;
-  mPrefBranch->GetIntPref(PREF_AUTOCOMPLETE_MATCH_BEHAVIOR,
-                          &matchBehavior);
-  switch (matchBehavior) {
-    case 0:
-      mAutoCompleteMatchBehavior = MATCH_ANYWHERE;
-      break;
-    case 2:
-      mAutoCompleteMatchBehavior = MATCH_BOUNDARY;
-      break;
-    case 3:
-      mAutoCompleteMatchBehavior = MATCH_BEGINNING;
-      break;
-    case 1:
-    default:
-      mAutoCompleteMatchBehavior = MATCH_BOUNDARY_ANYWHERE;
-      break;
-  }
-
-  mPrefBranch->GetBoolPref(PREF_AUTOCOMPLETE_FILTER_JAVASCRIPT,
-                           &mAutoCompleteFilterJavascript);
-  mPrefBranch->GetIntPref(PREF_AUTOCOMPLETE_MAX_RICH_RESULTS,
-                          &mAutoCompleteMaxResults);
-  mPrefBranch->GetIntPref(PREF_AUTOCOMPLETE_SEARCH_CHUNK_SIZE,
-                          &mAutoCompleteSearchChunkSize);
-  mPrefBranch->GetIntPref(PREF_AUTOCOMPLETE_SEARCH_TIMEOUT,
-                          &mAutoCompleteSearchTimeout);
-  mPrefBranch->GetIntPref(PREF_AUTOCOMPLETE_DEFAULT_BEHAVIOR,
-                          &mAutoCompleteDefaultBehavior);
-  nsXPIDLCString prefStr;
-  mPrefBranch->GetCharPref(PREF_AUTOCOMPLETE_RESTRICT_HISTORY,
-                           getter_Copies(prefStr));
-  CopyUTF8toUTF16(prefStr, mAutoCompleteRestrictHistory);
-  mPrefBranch->GetCharPref(PREF_AUTOCOMPLETE_RESTRICT_BOOKMARK,
-                           getter_Copies(prefStr));
-  CopyUTF8toUTF16(prefStr, mAutoCompleteRestrictBookmark);
-  mPrefBranch->GetCharPref(PREF_AUTOCOMPLETE_RESTRICT_TAG,
-                           getter_Copies(prefStr));
-  CopyUTF8toUTF16(prefStr, mAutoCompleteRestrictTag);
-  mPrefBranch->GetCharPref(PREF_AUTOCOMPLETE_MATCH_TITLE,
-                           getter_Copies(prefStr));
-  CopyUTF8toUTF16(prefStr, mAutoCompleteMatchTitle);
-  mPrefBranch->GetCharPref(PREF_AUTOCOMPLETE_MATCH_URL,
-                           getter_Copies(prefStr));
-  CopyUTF8toUTF16(prefStr, mAutoCompleteMatchUrl);
-  mPrefBranch->GetCharPref(PREF_AUTOCOMPLETE_RESTRICT_TYPED,
-                           getter_Copies(prefStr));
-  CopyUTF8toUTF16(prefStr, mAutoCompleteRestrictTyped);
-
-  // Clear out the search on any pref change to invalidate cached search
-  mCurrentSearchString = EmptyString();
-#endif
 
   // get the frecency prefs
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService("@mozilla.org/preferences-service;1"));
@@ -5657,10 +5540,6 @@ nsNavHistory::Observe(nsISupports *aSubject, const char *aTopic,
       mIdleTimer->Cancel();
       mIdleTimer = nsnull;
     }
-    if (mAutoCompleteTimer) {
-      mAutoCompleteTimer->Cancel();
-      mAutoCompleteTimer = nsnull;
-    }
     nsresult rv;
     nsCOMPtr<nsIPrefService> prefService =
       do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
@@ -5682,7 +5561,6 @@ nsNavHistory::Observe(nsISupports *aSubject, const char *aTopic,
     NS_ENSURE_SUCCESS(rv, rv);
     observerService->RemoveObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC);
     observerService->RemoveObserver(this, gIdleDaily);
-    observerService->RemoveObserver(this, gAutoCompleteFeedback);
     observerService->RemoveObserver(this, gXpcomShutdown);
     observerService->RemoveObserver(this, gQuitApplicationGrantedMessage);
   }
@@ -7746,6 +7624,131 @@ nsNavHistory::FixInvalidFrecencies()
 }
 
 
+#ifdef MOZ_XUL
+
+namespace {
+
+// Used to notify a topic to system observers on async execute completion.
+class AutoCompleteStatementCallbackNotifier : public mozIStorageStatementCallback
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_MOZISTORAGESTATEMENTCALLBACK
+};
+
+NS_IMPL_ISUPPORTS1(AutoCompleteStatementCallbackNotifier,
+                   mozIStorageStatementCallback)
+
+NS_IMETHODIMP
+AutoCompleteStatementCallbackNotifier::HandleCompletion(PRUint16 aReason)
+{
+  if (aReason != mozIStorageStatementCallback::REASON_FINISHED)
+    return NS_ERROR_UNEXPECTED;
+
+  nsresult rv;
+  nsCOMPtr<nsIObserverService> observerService =
+    do_GetService("@mozilla.org/observer-service;1", &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = observerService->NotifyObservers(nsnull,
+                                        PLACES_AUTOCOMPLETE_FEEDBACK_UPDATED_TOPIC,
+                                        nsnull);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+AutoCompleteStatementCallbackNotifier::HandleError(mozIStorageError *aError)
+{
+#ifdef DEBUG
+  PRInt32 result;
+  nsresult rv = aError->GetResult(&result);
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCAutoString message;
+  rv = aError->GetMessage(message);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCAutoString warnMsg;
+  warnMsg.Append("An error occured while executing an async statement: ");
+  warnMsg.Append(result);
+  warnMsg.Append(" ");
+  warnMsg.Append(message);
+  NS_WARNING(warnMsg.get());
+#endif
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+AutoCompleteStatementCallbackNotifier::HandleResult(mozIStorageResultSet *aResultSet)
+{
+  NS_ASSERTION(PR_FALSE, "You cannot use AutoCompleteStatementCallbackNotifier to get async statements resultset");
+  return NS_OK;
+}
+
+} // anonymous namespace
+
+nsresult
+nsNavHistory::AutoCompleteFeedback(PRInt32 aIndex,
+                                   nsIAutoCompleteController *aController)
+{
+  // We do not track user choices in the location bar in private browsing mode.
+  if (InPrivateBrowsingMode())
+    return NS_OK;
+
+  mozIStorageStatement *stmt = GetDBFeedbackIncrease();
+  mozStorageStatementScoper scope(stmt);
+
+  nsAutoString input;
+  nsresult rv = aController->GetSearchString(input);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = stmt->BindStringParameter(0, input);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoString url;
+  rv = aController->GetValueAt(aIndex, url);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = stmt->BindStringParameter(1, url);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // We do the update asynchronously and we do not care about failures.
+  nsCOMPtr<AutoCompleteStatementCallbackNotifier> callback =
+    new AutoCompleteStatementCallbackNotifier();
+  nsCOMPtr<mozIStoragePendingStatement> canceler;
+  rv = stmt->ExecuteAsync(callback, getter_AddRefs(canceler));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+mozIStorageStatement*
+nsNavHistory::GetDBFeedbackIncrease()
+{
+  if (mDBFeedbackIncrease)
+    return mDBFeedbackIncrease;
+
+  nsresult rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
+    // Leverage the PRIMARY KEY (place_id, input) to insert/update entries.
+    "INSERT OR REPLACE INTO moz_inputhistory "
+      // use_count will asymptotically approach the max of 10.
+      "SELECT h.id, IFNULL(i.input, ?1), IFNULL(i.use_count, 0) * .9 + 1 "
+      "FROM moz_places_temp h "
+      "LEFT JOIN moz_inputhistory i ON i.place_id = h.id AND i.input = ?1 "
+      "WHERE url = ?2 "
+      "UNION ALL "
+      "SELECT h.id, IFNULL(i.input, ?1), IFNULL(i.use_count, 0) * .9 + 1 "
+      "FROM moz_places h "
+      "LEFT JOIN moz_inputhistory i ON i.place_id = h.id AND i.input = ?1 "
+      "WHERE url = ?2 "
+        "AND h.id NOT IN (SELECT id FROM moz_places_temp)"),
+    getter_AddRefs(mDBFeedbackIncrease));
+  NS_ENSURE_SUCCESS(rv, nsnull);
+
+  return mDBFeedbackIncrease;
+}
+#endif
+
+
 nsICollation *
 nsNavHistory::GetCollation()
 {
@@ -7901,6 +7904,9 @@ nsNavHistory::GetDBBookmarkToUrlResult()
 nsresult
 nsNavHistory::FinalizeStatements() {
   mozIStorageStatement* stmts[] = {
+#ifdef MOZ_XUL
+    mDBFeedbackIncrease,
+#endif
     mDBGetURLPageInfo,
     mDBGetIdPageInfo,
     mDBRecentVisitOfURL,
@@ -7920,16 +7926,6 @@ nsNavHistory::FinalizeStatements() {
     mDBUpdateFrecencyAndHidden,
     mDBGetPlaceVisitStats,
     mDBFullVisitCount,
-    mDBCurrentQuery,
-    mDBAutoCompleteQuery,
-    mDBAutoCompleteTypedQuery,
-    mDBAutoCompleteHistoryQuery,
-    mDBAutoCompleteStarQuery,
-    mDBAutoCompleteTagsQuery,
-    mDBPreviousQuery,
-    mDBAdaptiveQuery,
-    mDBKeywordQuery,
-    mDBFeedbackIncrease
   };
 
   for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(stmts); i++) {
diff --git a/toolkit/components/places/src/nsNavHistory.h b/toolkit/components/places/src/nsNavHistory.h
index 74458d0b0d6..cdec11f0048 100644
--- a/toolkit/components/places/src/nsNavHistory.h
+++ b/toolkit/components/places/src/nsNavHistory.h
@@ -52,14 +52,6 @@
 #include "nsINavHistoryService.h"
 #include "nsPIPlacesDatabase.h"
 #include "nsPIPlacesHistoryListenersNotifier.h"
-#ifdef MOZ_XUL
-#include "nsIAutoCompleteController.h"
-#include "nsIAutoCompleteInput.h"
-#include "nsIAutoCompletePopup.h"
-#include "nsIAutoCompleteSearch.h"
-#include "nsIAutoCompleteResult.h"
-#include "nsIAutoCompleteSimpleResult.h"
-#endif
 #include "nsIBrowserHistory.h"
 #include "nsICollation.h"
 #include "nsIGlobalHistory.h"
@@ -109,8 +101,6 @@
 #define PLACES_INIT_COMPLETE_EVENT_TOPIC "places-init-complete"
 #define PLACES_DB_LOCKED_EVENT_TOPIC "places-database-locked"
 
-struct AutoCompleteIntermediateResult;
-class AutoCompleteResultComparator;
 class mozIAnnotationService;
 class nsNavHistory;
 class nsNavBookmarks;
@@ -118,6 +108,7 @@ class QueryKeyValuePair;
 class nsIEffectiveTLDService;
 class nsIIDNService;
 class PlacesSQLQueryBuilder;
+class nsIAutoCompleteController;
 
 // nsNavHistory
 
@@ -130,13 +121,7 @@ class nsNavHistory : public nsSupportsWeakReference
                    , public nsICharsetResolver
                    , public nsPIPlacesDatabase
                    , public nsPIPlacesHistoryListenersNotifier
-#ifdef MOZ_XUL
-                   , public nsIAutoCompleteSearch
-                   , public nsIAutoCompleteSimpleResultListener
-#endif
 {
-  friend class AutoCompleteIntermediateResultSet;
-  friend class AutoCompleteResultComparator;
   friend class PlacesSQLQueryBuilder;
 
 public:
@@ -152,10 +137,6 @@ public:
   NS_DECL_NSIOBSERVER
   NS_DECL_NSPIPLACESDATABASE
   NS_DECL_NSPIPLACESHISTORYLISTENERSNOTIFIER
-#ifdef MOZ_XUL
-  NS_DECL_NSIAUTOCOMPLETESEARCH
-  NS_DECL_NSIAUTOCOMPLETESIMPLERESULTLISTENER
-#endif
 
 
   /**
@@ -658,124 +639,15 @@ protected:
   PRInt64 mLastSessionID;
   PRInt64 GetNewSessionID() { mLastSessionID ++; return mLastSessionID; }
 
-  //
+#ifdef MOZ_XUL
   // AutoComplete stuff
-  //
-  static const PRInt32 kAutoCompleteIndex_URL;
-  static const PRInt32 kAutoCompleteIndex_Title;
-  static const PRInt32 kAutoCompleteIndex_FaviconURL;
-  static const PRInt32 kAutoCompleteIndex_ParentId;
-  static const PRInt32 kAutoCompleteIndex_BookmarkTitle;
-  static const PRInt32 kAutoCompleteIndex_Tags;
-  static const PRInt32 kAutoCompleteIndex_VisitCount;
-  static const PRInt32 kAutoCompleteIndex_Typed;
-  nsCOMPtr<mozIStorageStatement> mDBCurrentQuery; //  kAutoCompleteIndex_* results
-  nsCOMPtr<mozIStorageStatement> mDBAutoCompleteQuery; //  kAutoCompleteIndex_* results
-  nsCOMPtr<mozIStorageStatement> mDBAutoCompleteTypedQuery; //  kAutoCompleteIndex_* results
-  mozIStorageStatement* GetDBAutoCompleteHistoryQuery();
-  nsCOMPtr<mozIStorageStatement> mDBAutoCompleteHistoryQuery; //  kAutoCompleteIndex_* results
-  mozIStorageStatement* GetDBAutoCompleteStarQuery();
-  nsCOMPtr<mozIStorageStatement> mDBAutoCompleteStarQuery; //  kAutoCompleteIndex_* results
-  mozIStorageStatement* GetDBAutoCompleteTagsQuery();
-  nsCOMPtr<mozIStorageStatement> mDBAutoCompleteTagsQuery; //  kAutoCompleteIndex_* results
-  nsCOMPtr<mozIStorageStatement> mDBPreviousQuery; //  kAutoCompleteIndex_* results
-  nsCOMPtr<mozIStorageStatement> mDBAdaptiveQuery; //  kAutoCompleteIndex_* results
-  nsCOMPtr<mozIStorageStatement> mDBKeywordQuery; //  kAutoCompleteIndex_* results
   mozIStorageStatement* GetDBFeedbackIncrease();
   nsCOMPtr<mozIStorageStatement> mDBFeedbackIncrease;
 
-  /**
-   * AutoComplete word matching behavior to determine if words should match on
-   * word boundaries or not or both.
-   */
-  enum MatchType {
-    MATCH_ANYWHERE,
-    MATCH_BOUNDARY_ANYWHERE,
-    MATCH_BOUNDARY,
-    MATCH_BEGINNING
-  };
-
-  nsresult InitAutoComplete();
-  nsresult CreateAutoCompleteQueries();
-  PRBool mAutoCompleteEnabled;
-  MatchType mAutoCompleteMatchBehavior;
-  PRBool mAutoCompleteFilterJavascript;
-  PRInt32 mAutoCompleteMaxResults;
-  nsString mAutoCompleteRestrictHistory;
-  nsString mAutoCompleteRestrictBookmark;
-  nsString mAutoCompleteRestrictTag;
-  nsString mAutoCompleteMatchTitle;
-  nsString mAutoCompleteMatchUrl;
-  nsString mAutoCompleteRestrictTyped;
-  PRInt32 mAutoCompleteSearchChunkSize;
-  PRInt32 mAutoCompleteSearchTimeout;
-  nsCOMPtr<nsITimer> mAutoCompleteTimer;
-
-  static const PRInt32 kAutoCompleteBehaviorHistory;
-  static const PRInt32 kAutoCompleteBehaviorBookmark;
-  static const PRInt32 kAutoCompleteBehaviorTag;
-  static const PRInt32 kAutoCompleteBehaviorTitle;
-  static const PRInt32 kAutoCompleteBehaviorUrl;
-  static const PRInt32 kAutoCompleteBehaviorTyped;
-
-  PRInt32 mAutoCompleteDefaultBehavior; // kAutoCompleteBehavior* bitmap
-  PRInt32 mAutoCompleteCurrentBehavior; // kAutoCompleteBehavior* bitmap
-
-  // Original search string for case-sensitive usage
-  nsString mOrigSearchString;
-  // Search string and tokens for case-insensitive matching
-  nsString mCurrentSearchString;
-  nsTArray<nsString> mCurrentSearchTokens;
-  void GenerateSearchTokens();
-  void AddSearchToken(nsAutoString &aToken);
-  void ProcessTokensForSpecialSearch();
-
-#ifdef MOZ_XUL
   nsresult AutoCompleteFeedback(PRInt32 aIndex,
                                 nsIAutoCompleteController *aController);
-
-  nsCOMPtr<nsIAutoCompleteObserver> mCurrentListener;
-  nsCOMPtr<nsIAutoCompleteSimpleResult> mCurrentResult;
 #endif
 
-  MatchType mCurrentMatchType;
-  MatchType mPreviousMatchType;
-  nsDataHashtable<nsStringHashKey, PRBool> mCurrentResultURLs;
-  PRInt32 mCurrentChunkOffset;
-  PRInt32 mPreviousChunkOffset;
-
-  nsDataHashtable<nsTrimInt64HashKey, PRBool> mLivemarkFeedItemIds;
-  nsDataHashtable<nsStringHashKey, PRBool> mLivemarkFeedURIs;
-
-  nsresult AutoCompleteFullHistorySearch(PRBool* aHasMoreResults);
-  nsresult AutoCompletePreviousSearch();
-  nsresult AutoCompleteAdaptiveSearch();
-  nsresult AutoCompleteKeywordSearch();
-
-  /**
-   * Query type passed to AutoCompleteProcessSearch to determine what style to
-   * use and if results should be filtered
-   */
-  enum QueryType {
-    QUERY_KEYWORD,
-    QUERY_FILTERED
-  };
-  nsresult AutoCompleteProcessSearch(mozIStorageStatement* aQuery,
-                                     const QueryType aType,
-                                     PRBool *aHasMoreResults = nsnull);
-  PRBool AutoCompleteHasEnoughResults();
-
-  nsresult PerformAutoComplete();
-  nsresult StartAutoCompleteTimer(PRUint32 aMilliseconds);
-  static void AutoCompleteTimerCallback(nsITimer* aTimer, void* aClosure);
-
-  PRBool mAutoCompleteFinishedSearch;
-  void DoneSearching(PRBool aFinished);
-
-  // Used to unescape encoded URI strings for searching
-  nsCOMPtr<nsITextToSubURI> mTextURIService;
-  nsString FixupURIText(const nsAString &aURIText);
-
   PRInt32 mExpireDaysMin;
   PRInt32 mExpireDaysMax;
   PRInt32 mExpireSites;
diff --git a/toolkit/components/places/src/nsNavHistoryAutoComplete.cpp b/toolkit/components/places/src/nsNavHistoryAutoComplete.cpp
deleted file mode 100644
index ea8f6240c22..00000000000
--- a/toolkit/components/places/src/nsNavHistoryAutoComplete.cpp
+++ /dev/null
@@ -1,1276 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Places code.
- *
- * The Initial Developer of the Original Code is
- * Google Inc.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Brett Wilson <brettw@gmail.com>
- *   Joe Hewitt <hewitt@netscape.com>
- *   Blake Ross <blaker@netscape.com>
- *   Seth Spitzer <sspitzer@mozilla.org>
- *   Dietrich Ayala <dietrich@mozilla.com>
- *   Edward Lee <edward.lee@engineering.uiuc.edu>
- *   Ehsan Akhgari <ehsan.akhgari@gmail.com>
- *   Marco Bonardo <mak77@bonardo.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/**
- * Autocomplete algorithm:
- *
- * Searches moz_places by frecency (in descending order)
- * in chunks (mAutoCompleteSearchChunkSize).  We currently
- * do SQL LIKE searches of the search term in the place title, place url
- * and bookmark titles (since a "place" can have multiple bookmarks)
- * within in each chunk. The results are ordered by frecency.
- * Note, we exclude places with no frecency (0) because 
- * frecency = 0 means "don't show this in autocomplete". place: queries should
- * have that, as should unvisited children of livemark feeds (that aren't
- * bookmarked elsewhere).
- *
- * But places with frecency < 0 are included, as that means that these items
- * have not had their frecency calculated yet (will happen on idle).
- */
-
-#include "nsNavHistory.h"
-#include "nsNetUtil.h"
-#include "nsEscape.h"
-#include "nsThreadUtils.h"
-
-#include "mozIStorageService.h"
-#include "mozIStorageConnection.h"
-#include "mozIStorageValueArray.h"
-#include "mozIStorageStatement.h"
-#include "mozIStorageFunction.h"
-#include "mozStorageCID.h"
-#include "mozStorageHelper.h"
-#include "nsFaviconService.h"
-#include "nsUnicharUtils.h"
-#include "nsNavBookmarks.h"
-#include "nsPrintfCString.h"
-#include "nsILivemarkService.h"
-#include "mozIStoragePendingStatement.h"
-#include "mozIStorageStatementCallback.h"
-#include "mozIStorageError.h"
-#include "nsPlacesTables.h"
-
-#define NS_AUTOCOMPLETESIMPLERESULT_CONTRACTID \
-  "@mozilla.org/autocomplete/simple-result;1"
-
-// Helpers to get and set fields in the mAutoCompleteCurrentBehavior bitmap
-#define GET_BEHAVIOR(aBitName) \
-  (mAutoCompleteCurrentBehavior & kAutoCompleteBehavior##aBitName)
-#define SET_BEHAVIOR(aBitName) \
-  mAutoCompleteCurrentBehavior |= kAutoCompleteBehavior##aBitName
-
-// Helper to get a particular column with a desired name from the bookmark and
-// tags table based on if we want to include tags or not. Make sure to provide
-// enough buffer space for printf.
-#define BOOK_TAG_FRAG(name, column, forTag) nsPrintfCString(200, ", (" \
-  "SELECT %s " \
-  "FROM moz_bookmarks b " \
-  "JOIN moz_bookmarks t ON t.id = b.parent AND t.parent %s= ?1 " \
-  "WHERE b.fk = h.id AND b.type = %d " \
-  "%s) AS %s", \
-  column, \
-  forTag ? "" : "!", \
-  nsINavBookmarksService::TYPE_BOOKMARK, \
-  forTag ? "AND LENGTH(t.title) > 0" : "ORDER BY b.lastModified DESC LIMIT 1", \
-  name)
-
-// Get three named columns from the bookmarks and tags table
-#define BOOK_TAG_SQL (\
-  BOOK_TAG_FRAG("parent", "b.parent", 0) + \
-  BOOK_TAG_FRAG("bookmark", "b.title", 0) + \
-  BOOK_TAG_FRAG("tags", "GROUP_CONCAT(t.title, ',')", 1))
-
-// This separator is used as an RTL-friendly way to split the title and tags.
-// It can also be used by an nsIAutoCompleteResult consumer to re-split the
-// "comment" back into the title and tag.
-// Use a Unichar array to avoid problems with 2-byte char strings: " \u2013 "
-const PRUnichar kTitleTagsSeparatorChars[] = { ' ', 0x2013, ' ', 0 };
-#define TITLE_TAGS_SEPARATOR nsAutoString(kTitleTagsSeparatorChars)
-
-// This fragment is used to get best favicon for a rev_host
-#define BEST_FAVICON_FOR_REVHOST( __table_name ) \
-  "(SELECT f.url FROM " __table_name " " \
-   "JOIN moz_favicons f ON f.id = favicon_id " \
-   "WHERE rev_host = IFNULL( " \
-     "(SELECT rev_host FROM moz_places_temp WHERE id = b.fk), " \
-     "(SELECT rev_host FROM moz_places WHERE id = b.fk)) " \
-   "ORDER BY frecency DESC LIMIT 1) "
-
-#define PLACES_AUTOCOMPLETE_FEEDBACK_UPDATED_TOPIC "places-autocomplete-feedback-updated"
-
-// Used to notify a topic to system observers on async execute completion.
-// Will throw on error.
-class AutoCompleteStatementCallbackNotifier : public mozIStorageStatementCallback
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_MOZISTORAGESTATEMENTCALLBACK
-};
-
-// AutocompleteStatementCallbackNotifier
-NS_IMPL_ISUPPORTS1(AutoCompleteStatementCallbackNotifier,
-                   mozIStorageStatementCallback)
-
-NS_IMETHODIMP
-AutoCompleteStatementCallbackNotifier::HandleCompletion(PRUint16 aReason)
-{
-  if (aReason != mozIStorageStatementCallback::REASON_FINISHED)
-    return NS_ERROR_UNEXPECTED;
-
-  nsresult rv;
-  nsCOMPtr<nsIObserverService> observerService =
-    do_GetService("@mozilla.org/observer-service;1", &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = observerService->NotifyObservers(nsnull,
-                                        PLACES_AUTOCOMPLETE_FEEDBACK_UPDATED_TOPIC,
-                                        nsnull);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AutoCompleteStatementCallbackNotifier::HandleError(mozIStorageError *aError)
-{
-  PRInt32 result;
-  nsresult rv = aError->GetResult(&result);
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCAutoString message;
-  rv = aError->GetMessage(message);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCAutoString warnMsg;
-  warnMsg.Append("An error occured while executing an async statement: ");
-  warnMsg.Append(result);
-  warnMsg.Append(" ");
-  warnMsg.Append(message);
-  NS_WARNING(warnMsg.get());
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-AutoCompleteStatementCallbackNotifier::HandleResult(mozIStorageResultSet *aResultSet)
-{
-  NS_ASSERTION(PR_FALSE, "You cannot use AutoCompleteStatementCallbackNotifier to get async statements resultset");
-  return NS_OK;
-}
-
-void GetAutoCompleteBaseQuery(nsACString& aQuery) {
-// Define common pieces of various queries
-// XXX bug 412736
-// in the case of a frecency tie, break it with h.typed and h.visit_count
-// which is better than nothing.  but this is slow, so not doing it yet.
-
-// Try to reduce size of compound table since with partitioning this became
-// slower. Limiting moz_places with OFFSET+LIMIT will mostly help speed
-// of first chunks, that are usually most wanted.
-// Can do this only if there aren't additional conditions on final resultset.
-
-// Note: h.frecency is selected because we need it for ordering, but will
-// not be read later and we don't have an associated kAutoCompleteIndex_
-  aQuery = NS_LITERAL_CSTRING(
-      "SELECT h.url, h.title, f.url") + BOOK_TAG_SQL + NS_LITERAL_CSTRING(", "
-        "h.visit_count, h.typed "
-      "FROM ("
-        "SELECT " MOZ_PLACES_COLUMNS " FROM moz_places_temp "
-        "UNION ALL "
-        "SELECT " MOZ_PLACES_COLUMNS " FROM moz_places "
-        "WHERE +id NOT IN (SELECT id FROM moz_places_temp) "
-        "ORDER BY frecency DESC LIMIT ?2 OFFSET ?3) h "
-      "LEFT OUTER JOIN moz_favicons f ON f.id = h.favicon_id "
-      "WHERE h.frecency <> 0 "
-      "{ADDITIONAL_CONDITIONS}");
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsNavHistoryAutoComplete Helper Functions
-
-/**
- * Returns true if the string starts with javascript:
- */
-inline PRBool
-StartsWithJS(const nsAString &aString)
-{
-  return StringBeginsWith(aString, NS_LITERAL_STRING("javascript:"));
-}
-
-/**
- * Callback function for putting URLs from a nsDataHashtable<nsStringHashKey,
- * PRBool> into a nsTArray<nsString>.
- *
- * @param aKey
- *        The hashtable entry's key (the url)
- * @param aData
- *        Unused data
- * @param aArg
- *        The nsTArray<nsString> pointer for collecting URLs
- */
-PLDHashOperator
-HashedURLsToArray(const nsAString &aKey, PRBool aData, void *aArg)
-{
-  // Append the current url to the array of urls
-  static_cast<nsTArray<nsString> *>(aArg)->AppendElement(aKey);
-  return PL_DHASH_NEXT;
-}
-
-/**
- * Returns true if the unicode character is a word boundary. I.e., anything
- * that *isn't* used to build up a word from a string of characters. We are
- * conservative here because anything that we don't list will be treated as
- * word boundary. This means searching for that not-actually-a-word-boundary
- * character can still be matched in the middle of a word.
- */
-inline PRBool
-IsWordBoundary(const PRUnichar &aChar)
-{
-  // Lower-case alphabetic, so upper-case matches CamelCase. Because
-  // upper-case is treated as a word boundary, matches will also happen
-  // _after_ an upper-case character.
-  return !(PRUnichar('a') <= aChar && aChar <= PRUnichar('z'));
-}
-
-/**
- * Returns true if the token matches the target on a word boundary
- *
- * @param aToken
- *        Token to search for that must match on a word boundary
- * @param aTarget
- *        Target string to search against
- */
-PRBool
-FindOnBoundary(const nsAString &aToken, const nsAString &aTarget)
-{
-  // Define a const instance of this class so it is created once
-  const nsCaseInsensitiveStringComparator caseInsensitiveCompare;
-
-  // Can't match anything if there's nothing to match
-  if (aTarget.IsEmpty())
-    return PR_FALSE;
-
-  nsAString::const_iterator tokenStart, tokenEnd;
-  aToken.BeginReading(tokenStart);
-  aToken.EndReading(tokenEnd);
-
-  nsAString::const_iterator targetStart, targetEnd;
-  aTarget.BeginReading(targetStart);
-  aTarget.EndReading(targetEnd);
-
-  // Go straight into checking the token at the beginning of the target because
-  // the beginning is considered a word boundary
-  do {
-    // We're on a word boundary, so prepare to match by copying the iterators
-    nsAString::const_iterator testToken(tokenStart);
-    nsAString::const_iterator testTarget(targetStart);
-
-    // Keep trying to match the token one by one until it doesn't match
-    while (!caseInsensitiveCompare(*testToken, *testTarget)) {
-      // We matched something, so move down one
-      testToken++;
-      testTarget++;
-
-      // Matched the token! We're done!
-      if (testToken == tokenEnd)
-        return PR_TRUE;
-
-      // If we ran into the end while matching the token, we won't find it
-      if (testTarget == targetEnd)
-        return PR_FALSE;
-    }
-
-    // Unconditionally move past the current position in the target, but if
-    // we're not currently on a word boundary, eat up as many non-word boundary
-    // characters as possible -- don't kill characters if we're currently on a
-    // word boundary so that we can match tokens that start on a word boundary.
-    if (!IsWordBoundary(ToLowerCase(*targetStart++)))
-      while (targetStart != targetEnd && !IsWordBoundary(*targetStart))
-        targetStart++;
-
-    // If we hit the end eating up non-boundaries then boundaries, we're done
-  } while (targetStart != targetEnd);
-
-  return PR_FALSE;
-}
-
-/**
- * A local wrapper to CaseInsensitiveFindInReadable that isn't overloaded
- */
-inline PRBool
-FindAnywhere(const nsAString &aToken, const nsAString &aTarget)
-{
-  return CaseInsensitiveFindInReadable(aToken, aTarget);
-}
-
-/**
- * A local wrapper to case insensitive StringBeginsWith
- */
-inline PRBool
-FindBeginning(const nsAString &aToken, const nsAString &aTarget)
-{
-  return StringBeginsWith(aTarget, aToken, nsCaseInsensitiveStringComparator());
-}
-
-// nsNavHistory::InitAutoComplete
-nsresult
-nsNavHistory::InitAutoComplete()
-{
-  nsresult rv = CreateAutoCompleteQueries();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!mCurrentResultURLs.Init(128))
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  if (!mLivemarkFeedItemIds.Init(128))
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  if (!mLivemarkFeedURIs.Init(128))
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  return NS_OK;
-}
-
-// nsNavHistory::GetDBAutoCompleteHistoryQuery()
-//
-//    Returns the auto complete statement used when autocomplete results are
-//    restricted to history entries.
-mozIStorageStatement*
-nsNavHistory::GetDBAutoCompleteHistoryQuery()
-{
-  if (mDBAutoCompleteHistoryQuery)
-    return mDBAutoCompleteHistoryQuery;
-
-  nsCString AutoCompleteHistoryQuery;
-  GetAutoCompleteBaseQuery(AutoCompleteHistoryQuery);
-  AutoCompleteHistoryQuery.ReplaceSubstring("{ADDITIONAL_CONDITIONS}",
-                                            "AND h.visit_count > 0");
-  nsresult rv = mDBConn->CreateStatement(AutoCompleteHistoryQuery,
-    getter_AddRefs(mDBAutoCompleteHistoryQuery));
-  NS_ENSURE_SUCCESS(rv, nsnull);
-
-  return mDBAutoCompleteHistoryQuery;
-}
-
-// nsNavHistory::GetDBAutoCompleteStarQuery()
-//
-//    Returns the auto complete statement used when autocomplete results are
-//    restricted to bookmarked entries.
-mozIStorageStatement*
-nsNavHistory::GetDBAutoCompleteStarQuery()
-{
-  if (mDBAutoCompleteStarQuery)
-    return mDBAutoCompleteStarQuery;
-
-  nsCString AutoCompleteStarQuery;
-  GetAutoCompleteBaseQuery(AutoCompleteStarQuery);
-  AutoCompleteStarQuery.ReplaceSubstring("{ADDITIONAL_CONDITIONS}",
-                                         "AND bookmark IS NOT NULL");
-  nsresult rv = mDBConn->CreateStatement(AutoCompleteStarQuery,
-    getter_AddRefs(mDBAutoCompleteStarQuery));
-  NS_ENSURE_SUCCESS(rv, nsnull);
-
-  return mDBAutoCompleteStarQuery;
-}
-
-// nsNavHistory::GetDBAutoCompleteTagsQuery()
-//
-//    Returns the auto complete statement used when autocomplete results are
-//    restricted to tagged entries.
-mozIStorageStatement*
-nsNavHistory::GetDBAutoCompleteTagsQuery()
-{
-  if (mDBAutoCompleteTagsQuery)
-    return mDBAutoCompleteTagsQuery;
-
-  nsCString AutoCompleteTagsQuery;
-  GetAutoCompleteBaseQuery(AutoCompleteTagsQuery);
-  AutoCompleteTagsQuery.ReplaceSubstring("{ADDITIONAL_CONDITIONS}",
-                                         "AND tags IS NOT NULL");
-  nsresult rv = mDBConn->CreateStatement(AutoCompleteTagsQuery,
-    getter_AddRefs(mDBAutoCompleteTagsQuery));
-  NS_ENSURE_SUCCESS(rv, nsnull);
-
-  return mDBAutoCompleteTagsQuery;
-}
-
-// nsNavHistory::GetDBFeedbackIncrease()
-//
-//    Returns the statement to update the input history that keeps track of
-//    selections in the locationbar.  Input history is used for adaptive query.
-mozIStorageStatement*
-nsNavHistory::GetDBFeedbackIncrease()
-{
-  if (mDBFeedbackIncrease)
-    return mDBFeedbackIncrease;
-
-  nsresult rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
-    // Leverage the PRIMARY KEY (place_id, input) to insert/update entries
-    "INSERT OR REPLACE INTO moz_inputhistory "
-      // use_count will asymptotically approach the max of 10
-      "SELECT h.id, IFNULL(i.input, ?1), IFNULL(i.use_count, 0) * .9 + 1 "
-      "FROM moz_places_temp h "
-      "LEFT JOIN moz_inputhistory i ON i.place_id = h.id AND i.input = ?1 "
-      "WHERE url = ?2 "
-      "UNION ALL "
-      "SELECT h.id, IFNULL(i.input, ?1), IFNULL(i.use_count, 0) * .9 + 1 "
-      "FROM moz_places h "
-      "LEFT JOIN moz_inputhistory i ON i.place_id = h.id AND i.input = ?1 "
-      "WHERE url = ?2 "
-        "AND h.id NOT IN (SELECT id FROM moz_places_temp)"),
-    getter_AddRefs(mDBFeedbackIncrease));
-  NS_ENSURE_SUCCESS(rv, nsnull);
-
-  return mDBFeedbackIncrease;
-}
-
-// nsNavHistory::CreateAutoCompleteQueries
-//
-//    The auto complete queries we use depend on options, so we have them in
-//    a separate function so it can be re-created when the option changes.
-//    We are not lazy creating these queries because they will be most likely
-//    used on first search, and we don't want to lag on first autocomplete use.
-nsresult
-nsNavHistory::CreateAutoCompleteQueries()
-{
-  nsCString AutoCompleteQuery;
-  GetAutoCompleteBaseQuery(AutoCompleteQuery);
-  AutoCompleteQuery.ReplaceSubstring("{ADDITIONAL_CONDITIONS}", "");
-  nsresult rv = mDBConn->CreateStatement(AutoCompleteQuery,
-    getter_AddRefs(mDBAutoCompleteQuery));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCString AutoCompleteTypedQuery;
-  GetAutoCompleteBaseQuery(AutoCompleteTypedQuery);
-  AutoCompleteTypedQuery.ReplaceSubstring("{ADDITIONAL_CONDITIONS}",
-                                          "AND h.typed = 1");
-  rv = mDBConn->CreateStatement(AutoCompleteTypedQuery,
-    getter_AddRefs(mDBAutoCompleteTypedQuery));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // In this query we are taking BOOK_TAG_SQL only for h.id because it
-  // uses data from moz_bookmarks table and we sync tables on bookmark insert.
-  // So, most likely, h.id will always be populated when we have any bookmark.
-  // We still need to join on moz_places_temp for other data (eg. title).
-  nsCString sql = NS_LITERAL_CSTRING(
-    "/* do not warn (bug 487789) */ "
-    "SELECT IFNULL(h_t.url, h.url), IFNULL(h_t.title, h.title), f.url ") +
-      BOOK_TAG_SQL + NS_LITERAL_CSTRING(", "
-      "IFNULL(h_t.visit_count, h.visit_count), IFNULL(h_t.typed, h.typed), rank "
-    "FROM ( "
-      "SELECT ROUND(MAX(((i.input = ?2) + (SUBSTR(i.input, 1, LENGTH(?2)) = ?2)) * "
-        "i.use_count), 1) AS rank, place_id "
-      "FROM moz_inputhistory i "
-      "GROUP BY i.place_id HAVING rank > 0 "
-      ") AS i "
-    "LEFT JOIN moz_places h ON h.id = i.place_id "
-    "LEFT JOIN moz_places_temp h_t ON h_t.id = i.place_id "
-    "LEFT JOIN moz_favicons f ON f.id = IFNULL(h_t.favicon_id, h.favicon_id) "
-    "WHERE IFNULL(h_t.url, h.url) NOTNULL "
-    "ORDER BY rank DESC, IFNULL(h_t.frecency, h.frecency) DESC");
-  rv = mDBConn->CreateStatement(sql, getter_AddRefs(mDBAdaptiveQuery));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  sql = NS_LITERAL_CSTRING(
-    "/* do not warn (bug 487787) */ "
-    "SELECT IFNULL( "
-        "(SELECT REPLACE(url, '%s', ?2) FROM moz_places_temp WHERE id = b.fk), "
-        "(SELECT REPLACE(url, '%s', ?2) FROM moz_places WHERE id = b.fk) "
-      ") AS search_url, IFNULL(h_t.title, h.title), "
-      "COALESCE(f.url, "
-        BEST_FAVICON_FOR_REVHOST("moz_places_temp") ", "
-        BEST_FAVICON_FOR_REVHOST("moz_places")
-      "), "
-      "b.parent, b.title, NULL, IFNULL(h_t.visit_count, h.visit_count), "
-      "IFNULL(h_t.typed, h.typed) "
-    "FROM moz_keywords k "
-    "JOIN moz_bookmarks b ON b.keyword_id = k.id "
-    "LEFT JOIN moz_places AS h ON h.url = search_url "
-    "LEFT JOIN moz_places_temp AS h_t ON h_t.url = search_url "
-    "LEFT JOIN moz_favicons f ON f.id = IFNULL(h_t.favicon_id, h.favicon_id) "
-    "WHERE LOWER(k.keyword) = LOWER(?1) "
-    "ORDER BY IFNULL(h_t.frecency, h.frecency) DESC");
-  rv = mDBConn->CreateStatement(sql, getter_AddRefs(mDBKeywordQuery));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-// nsNavHistory::StartAutoCompleteTimer
-
-nsresult
-nsNavHistory::StartAutoCompleteTimer(PRUint32 aMilliseconds)
-{
-  nsresult rv;
-
-  if (!mAutoCompleteTimer) {
-    mAutoCompleteTimer = do_CreateInstance("@mozilla.org/timer;1", &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  
-  rv = mAutoCompleteTimer->InitWithFuncCallback(AutoCompleteTimerCallback, this,
-                                                aMilliseconds,
-                                                nsITimer::TYPE_ONE_SHOT);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return NS_OK;
-}
-
-// nsNavHistory::AutoCompleteTimerCallback
-
-void // static
-nsNavHistory::AutoCompleteTimerCallback(nsITimer* aTimer, void* aClosure)
-{
-  nsNavHistory* history = static_cast<nsNavHistory*>(aClosure);
-  (void)history->PerformAutoComplete();
-}
-
-nsresult 
-nsNavHistory::PerformAutoComplete()
-{
-  // if there is no listener, our search has been stopped
-  if (!mCurrentListener)
-    return NS_OK;
-
-  nsresult rv;
-  // Only do some extra searches on the first chunk
-  if (!mCurrentChunkOffset) {
-    // Only show keywords if there's a search
-    if (mCurrentSearchTokens.Length()) {
-      rv = AutoCompleteKeywordSearch();
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-
-    // Get adaptive results first
-    rv = AutoCompleteAdaptiveSearch();
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  PRBool moreChunksToSearch = PR_FALSE;
-  // If we constructed a previous search query, use it instead of full
-  if (mDBPreviousQuery) {
-    rv = AutoCompletePreviousSearch();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // We want to continue searching if we didn't finish last time, so move to
-    // one before the previous chunk so that we move up to the previous chunk
-    if (moreChunksToSearch = mPreviousChunkOffset != -1)
-      mCurrentChunkOffset = mPreviousChunkOffset - mAutoCompleteSearchChunkSize;
-  } else {
-    rv = AutoCompleteFullHistorySearch(&moreChunksToSearch);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  // If we ran out of pages to search, set offset to -1, so we can tell the
-  // difference between completing and stopping because we have enough results
-  PRBool notEnoughResults = !AutoCompleteHasEnoughResults();
-  if (!moreChunksToSearch) {
-    // But check first to see if we don't have enough results, and we're
-    // matching word boundaries, so try again without the match restriction
-    if (notEnoughResults && mCurrentMatchType == MATCH_BOUNDARY_ANYWHERE) {
-      mCurrentMatchType = MATCH_ANYWHERE;
-      mCurrentChunkOffset = -mAutoCompleteSearchChunkSize;
-      moreChunksToSearch = PR_TRUE;
-    } else {
-      mCurrentChunkOffset = -1;
-    }
-  } else {
-    // We know that we do have more chunks, so make sure we want more results
-    moreChunksToSearch = notEnoughResults;
-  }
-
-  // Determine the result of the search
-  PRUint32 count;
-  mCurrentResult->GetMatchCount(&count); 
-
-  if (count > 0) {
-    mCurrentResult->SetSearchResult(moreChunksToSearch ?
-      nsIAutoCompleteResult::RESULT_SUCCESS_ONGOING :
-      nsIAutoCompleteResult::RESULT_SUCCESS);
-    mCurrentResult->SetDefaultIndex(0);
-  } else {
-    mCurrentResult->SetSearchResult(moreChunksToSearch ?
-      nsIAutoCompleteResult::RESULT_NOMATCH_ONGOING :
-      nsIAutoCompleteResult::RESULT_NOMATCH);
-    mCurrentResult->SetDefaultIndex(-1);
-  }
-
-  rv = mCurrentResult->SetListener(this);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mCurrentListener->OnSearchResult(this, mCurrentResult);
- 
-  // if we're not done searching, adjust our current offset
-  // and search the next chunk
-  if (moreChunksToSearch) {
-    mCurrentChunkOffset += mAutoCompleteSearchChunkSize;
-    rv = StartAutoCompleteTimer(mAutoCompleteSearchTimeout);
-    NS_ENSURE_SUCCESS(rv, rv);
-  } else {
-    DoneSearching(PR_TRUE);
-  }
-  return NS_OK;
-}
-
-void
-nsNavHistory::DoneSearching(PRBool aFinished)
-{
-  mPreviousMatchType = mCurrentMatchType;
-  mPreviousChunkOffset = mCurrentChunkOffset;
-  mAutoCompleteFinishedSearch = aFinished;
-  mCurrentResult = nsnull;
-  mCurrentListener = nsnull;
-}
-
-// nsNavHistory::StartSearch
-//
-
-NS_IMETHODIMP
-nsNavHistory::StartSearch(const nsAString & aSearchString,
-                          const nsAString & aSearchParam,
-                          nsIAutoCompleteResult *aPreviousResult,
-                          nsIAutoCompleteObserver *aListener)
-{
-  // We don't use aPreviousResult to get some matches from previous results in
-  // order to make sure ordering of results are consistent between reusing and
-  // not reusing results, see bug #412730 for details
-
-  NS_ENSURE_ARG_POINTER(aListener);
-  NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
-
-  // Lazily init nsITextToSubURI service
-  if (!mTextURIService)
-    mTextURIService = do_GetService(NS_ITEXTTOSUBURI_CONTRACTID);
-
-  // Keep track of the previous search results to try optimizing
-  PRUint32 prevMatchCount = mCurrentResultURLs.Count();
-  nsAutoString prevSearchString(mCurrentSearchString);
-
-  // Keep a copy of the original search for case-sensitive usage
-  mOrigSearchString = aSearchString;
-  // Remove whitespace, see bug #392141 for details
-  mOrigSearchString.Trim(" \r\n\t\b");
-  // Copy the input search string for case-insensitive search
-  ToLowerCase(mOrigSearchString, mCurrentSearchString);
-
-  // Fix up the search the same way we fix up the entry url
-  mCurrentSearchString = FixupURIText(mCurrentSearchString);
-
-  mCurrentListener = aListener;
-
-  nsresult rv;
-  mCurrentResult = do_CreateInstance(NS_AUTOCOMPLETESIMPLERESULT_CONTRACTID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  mCurrentResult->SetSearchString(aSearchString);
-
-  // Short circuit to give no results if we don't need to search for matches.
-  // Use the previous in-progress search by looking at which urls it found if
-  // the new search begins with the old one and both aren't empty. We don't run
-  // into bug 412730 because we only specify urls and not titles to look at.
-  // Also, only reuse the search if the previous and new search both start with
-  // javascript: or both don't. (bug 417798)
-  if (!mAutoCompleteEnabled ||
-      (!prevSearchString.IsEmpty() &&
-       StringBeginsWith(mCurrentSearchString, prevSearchString) &&
-       (StartsWithJS(prevSearchString) == StartsWithJS(mCurrentSearchString)))) {
-
-    // Got nothing before? We won't get anything new, so stop now
-    if (!mAutoCompleteEnabled ||
-        (mAutoCompleteFinishedSearch && prevMatchCount == 0)) {
-      // Set up the result to let the listener know that there's nothing
-      mCurrentResult->SetSearchResult(nsIAutoCompleteResult::RESULT_NOMATCH);
-      mCurrentResult->SetDefaultIndex(-1);
-
-      rv = mCurrentResult->SetListener(this);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      (void)mCurrentListener->OnSearchResult(this, mCurrentResult);
-      DoneSearching(PR_TRUE);
-
-      return NS_OK;
-    } else {
-      // We either have a previous in-progress search or a finished search that
-      // has more than 0 results. We can continue from where the previous
-      // search left off, but first we want to create an optimized query that
-      // only searches through the urls that were previously found
-
-      // We have to do the bindings for both tables, so we build a temporary
-      // string
-      nsCString bindings;
-      for (PRUint32 i = 0; i < prevMatchCount; i++) {
-        if (i)
-          bindings += NS_LITERAL_CSTRING(",");
-
-        // +2 to skip over the ?1 for the tag root parameter
-        bindings += nsPrintfCString("?%d", i + 2);
-      }
-
-      nsCString sql = NS_LITERAL_CSTRING(
-        "SELECT h.url, h.title, f.url") + BOOK_TAG_SQL + NS_LITERAL_CSTRING(", "
-          "h.visit_count, h.typed "
-        "FROM ( "
-          "SELECT " MOZ_PLACES_COLUMNS " FROM moz_places_temp "
-          "WHERE url IN (") + bindings + NS_LITERAL_CSTRING(") "
-          "UNION ALL "
-          "SELECT " MOZ_PLACES_COLUMNS " FROM moz_places "
-          "WHERE id NOT IN (SELECT id FROM moz_places_temp) "
-          "AND url IN (") + bindings + NS_LITERAL_CSTRING(") "
-        ") AS h "
-        "LEFT OUTER JOIN moz_favicons f ON f.id = h.favicon_id "
-        "ORDER BY h.frecency DESC");
-
-      rv = mDBConn->CreateStatement(sql, getter_AddRefs(mDBPreviousQuery));
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      // Collect the previous result's URLs that we want to process
-      nsTArray<nsString> urls;
-      (void)mCurrentResultURLs.EnumerateRead(HashedURLsToArray, &urls);
-
-      // Bind the parameters right away. We can only use the query once.
-      for (PRUint32 i = 0; i < prevMatchCount; i++) {
-        rv = mDBPreviousQuery->BindStringParameter(i + 1, urls[i]);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      // Use the same match behavior as the previous search
-      mCurrentMatchType = mPreviousMatchType;
-    }
-  } else {
-    // Clear out any previous result queries
-    mDBPreviousQuery = nsnull;
-    // Default to matching based on the user's preference
-    mCurrentMatchType = mAutoCompleteMatchBehavior;
-  }
-
-  mAutoCompleteFinishedSearch = PR_FALSE;
-  mCurrentChunkOffset = 0;
-  mCurrentResultURLs.Clear();
-  mCurrentSearchTokens.Clear();
-  mLivemarkFeedItemIds.Clear();
-  mLivemarkFeedURIs.Clear();
-
-  // Make the array of search tokens from the search string
-  GenerateSearchTokens();
-
-  // Figure out if we need to do special searches
-  ProcessTokensForSpecialSearch();
-
-  // find all the items that have the "livemark/feedURI" annotation
-  // and save off their item ids and URIs. when doing autocomplete, 
-  // if a result's parent item id matches a saved item id, the result
-  // it is not really a bookmark, but a rss feed item.
-  // if a results URI matches a saved URI, the result is a bookmark,
-  // so we should show the star.
-  mozStorageStatementScoper scope(mFoldersWithAnnotationQuery);
-
-  rv = mFoldersWithAnnotationQuery->BindUTF8StringParameter(0, NS_LITERAL_CSTRING(LMANNO_FEEDURI));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  PRBool hasMore = PR_FALSE;
-  while (NS_SUCCEEDED(mFoldersWithAnnotationQuery->ExecuteStep(&hasMore)) && hasMore) {
-    PRInt64 itemId = 0;
-    rv = mFoldersWithAnnotationQuery->GetInt64(0, &itemId);
-    NS_ENSURE_SUCCESS(rv, rv);
-    mLivemarkFeedItemIds.Put(itemId, PR_TRUE);
-    nsAutoString feedURI;
-    // no need to worry about duplicates.
-    rv = mFoldersWithAnnotationQuery->GetString(1, feedURI);
-    NS_ENSURE_SUCCESS(rv, rv);
-    mLivemarkFeedURIs.Put(feedURI, PR_TRUE);
-  }
-
-  // fire right away, we already waited to start searching
-  rv = StartAutoCompleteTimer(0);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return NS_OK;
-}
-
-// nsNavHistory::StopSearch
-
-NS_IMETHODIMP
-nsNavHistory::StopSearch()
-{
-  NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
-
-  if (mAutoCompleteTimer)
-    mAutoCompleteTimer->Cancel();
-
-  DoneSearching(PR_FALSE);
-
-  return NS_OK;
-}
-
-void
-nsNavHistory::GenerateSearchTokens()
-{
-  // Split the search string into multiple search tokens
-  nsString::const_iterator strStart, strEnd;
-  mCurrentSearchString.BeginReading(strStart);
-  mCurrentSearchString.EndReading(strEnd);
-  nsString::const_iterator start = strStart, end = strEnd;
-  while (FindInReadable(NS_LITERAL_STRING(" "), start, end)) {
-    // Add in the current match
-    nsAutoString currentMatch(Substring(strStart, start));
-    AddSearchToken(currentMatch);
-
-    // Reposition iterators
-    strStart = start = end;
-    end = strEnd;
-  }
-  
-  // Add in the last match
-  nsAutoString lastMatch(Substring(strStart, strEnd));
-  AddSearchToken(lastMatch);
-} 
-
-inline void
-nsNavHistory::AddSearchToken(nsAutoString &aToken)
-{
-  aToken.Trim("\r\n\t\b");
-  if (!aToken.IsEmpty())
-    mCurrentSearchTokens.AppendElement(aToken);
-}
-
-void
-nsNavHistory::ProcessTokensForSpecialSearch()
-{
-  // Start with the default behavior
-  mAutoCompleteCurrentBehavior = mAutoCompleteDefaultBehavior;
-
-  // Determine which special searches to apply
-  for (PRInt32 i = PRInt32(mCurrentSearchTokens.Length()); --i >= 0;) {
-    PRBool needToRemove = PR_TRUE;
-    const nsString& token = mCurrentSearchTokens[i];
-
-    if (token.Equals(mAutoCompleteRestrictHistory))
-      SET_BEHAVIOR(History);
-    else if (token.Equals(mAutoCompleteRestrictBookmark))
-      SET_BEHAVIOR(Bookmark);
-    else if (token.Equals(mAutoCompleteRestrictTag))
-      SET_BEHAVIOR(Tag);
-    else if (token.Equals(mAutoCompleteMatchTitle))
-      SET_BEHAVIOR(Title);
-    else if (token.Equals(mAutoCompleteMatchUrl))
-      SET_BEHAVIOR(Url);
-    else if (token.Equals(mAutoCompleteRestrictTyped))
-      SET_BEHAVIOR(Typed);
-    else
-      needToRemove = PR_FALSE;
-
-    // Remove the token if it's special search token
-    if (needToRemove)
-      mCurrentSearchTokens.RemoveElementAt(i);
-  }
-
-  // Search only typed pages in history for empty searches
-  if (mOrigSearchString.IsEmpty()) {
-    SET_BEHAVIOR(History);
-    SET_BEHAVIOR(Typed);
-  }
-
-  // We can use optimized queries for restricts, so check for the most
-  // restrictive query first
-  mDBCurrentQuery = GET_BEHAVIOR(Tag) ? GetDBAutoCompleteTagsQuery() :
-    GET_BEHAVIOR(Bookmark) ? GetDBAutoCompleteStarQuery() :
-    GET_BEHAVIOR(Typed) ? static_cast<mozIStorageStatement *>(mDBAutoCompleteTypedQuery) :
-    GET_BEHAVIOR(History) ? GetDBAutoCompleteHistoryQuery() :
-    static_cast<mozIStorageStatement *>(mDBAutoCompleteQuery);
-}
-
-nsresult
-nsNavHistory::AutoCompleteKeywordSearch()
-{
-  mozStorageStatementScoper scope(mDBKeywordQuery);
-
-  // Get the keyword parameters to replace the %s in the keyword search
-  nsCAutoString params;
-  PRInt32 paramPos = mOrigSearchString.FindChar(' ') + 1;
-  // Make sure to escape them as if they were the query in a url, so " " become
-  // "+"; "+" become "%2B"; non-ascii escaped
-  NS_Escape(NS_ConvertUTF16toUTF8(Substring(mOrigSearchString, paramPos)),
-    params, url_XPAlphas);
-
-  // The first search term might be a keyword
-  const nsAString &keyword = Substring(mOrigSearchString, 0,
-    paramPos ? paramPos - 1 : mOrigSearchString.Length());
-  nsresult rv = mDBKeywordQuery->BindStringParameter(0, keyword);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mDBKeywordQuery->BindUTF8StringParameter(1, params);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = AutoCompleteProcessSearch(mDBKeywordQuery, QUERY_KEYWORD);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-nsNavHistory::AutoCompleteAdaptiveSearch()
-{
-  mozStorageStatementScoper scope(mDBAdaptiveQuery);
-
-  nsresult rv = mDBAdaptiveQuery->BindInt64Parameter(0, GetTagsFolder());
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mDBAdaptiveQuery->BindStringParameter(1, mCurrentSearchString);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = AutoCompleteProcessSearch(mDBAdaptiveQuery, QUERY_FILTERED);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-nsNavHistory::AutoCompletePreviousSearch()
-{
-  nsresult rv = mDBPreviousQuery->BindInt64Parameter(0, GetTagsFolder());
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = AutoCompleteProcessSearch(mDBPreviousQuery, QUERY_FILTERED);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Don't use this query more than once
-  mDBPreviousQuery = nsnull;
-
-  return NS_OK;
-}
-
-// nsNavHistory::AutoCompleteFullHistorySearch
-//
-// Search for places that have a title, url, 
-// or bookmark title(s) that contains mCurrentSearchString
-// and are within our current chunk of "frecency".
-//
-// @param aHasMoreResults is false if the query found no matching items
-//
-
-nsresult
-nsNavHistory::AutoCompleteFullHistorySearch(PRBool* aHasMoreResults)
-{
-  mozStorageStatementScoper scope(mDBCurrentQuery);
-
-  nsresult rv = mDBCurrentQuery->BindInt64Parameter(0, GetTagsFolder());
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mDBCurrentQuery->BindInt32Parameter(1, mAutoCompleteSearchChunkSize);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mDBCurrentQuery->BindInt32Parameter(2, mCurrentChunkOffset);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = AutoCompleteProcessSearch(mDBCurrentQuery, QUERY_FILTERED, aHasMoreResults);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-nsNavHistory::AutoCompleteProcessSearch(mozIStorageStatement* aQuery,
-                                        const QueryType aType,
-                                        PRBool *aHasMoreResults)
-{
-  // Unless we're checking if there are any results for the query, don't bother
-  // processing results if we already have enough results
-  if (!aHasMoreResults && AutoCompleteHasEnoughResults())
-    return NS_OK;
-
-  nsFaviconService* faviconService = nsFaviconService::GetFaviconService();
-  NS_ENSURE_TRUE(faviconService, NS_ERROR_OUT_OF_MEMORY);
-
-  // We want to filter javascript: URIs if the search doesn't start with it
-  PRBool filterJavascript = mAutoCompleteFilterJavascript &&
-    !StartsWithJS(mCurrentSearchString);
-
-  // Determine what type of search to try matching tokens against targets
-  PRBool (*tokenMatchesTarget)(const nsAString &, const nsAString &);
-  switch (mCurrentMatchType) {
-    case MATCH_ANYWHERE:
-      tokenMatchesTarget = FindAnywhere;
-      break;
-    case MATCH_BEGINNING:
-      tokenMatchesTarget = FindBeginning;
-      break;
-    case MATCH_BOUNDARY_ANYWHERE:
-    case MATCH_BOUNDARY:
-    default:
-      tokenMatchesTarget = FindOnBoundary;
-      break;
-  }
-
-  PRBool hasMore = PR_FALSE;
-  // Determine the result of the search
-  while (NS_SUCCEEDED(aQuery->ExecuteStep(&hasMore)) && hasMore) {
-    nsAutoString escapedEntryURL;
-    nsresult rv = aQuery->GetString(kAutoCompleteIndex_URL, escapedEntryURL);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // If we need to filter and have a javascript URI.. skip!
-    if (filterJavascript && StartsWithJS(escapedEntryURL))
-      continue;
-
-    // Prevent duplicates that might appear from previous searches such as tag
-    // results and chunking. Because we use mCurrentResultURLs to remove
-    // duplicates, the first url wins, so we might not show it as a "star" if
-    // the parentId we get first is the one for the livemark and not the
-    // bookmark or no "star" at all.
-    // XXX bug 412734
-    PRBool dummy;
-    if (!mCurrentResultURLs.Get(escapedEntryURL, &dummy)) {
-      PRInt64 parentId = 0;
-      nsAutoString entryTitle, entryFavicon, entryBookmarkTitle;
-      rv = aQuery->GetString(kAutoCompleteIndex_Title, entryTitle);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = aQuery->GetString(kAutoCompleteIndex_FaviconURL, entryFavicon);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = aQuery->GetInt64(kAutoCompleteIndex_ParentId, &parentId);
-      NS_ENSURE_SUCCESS(rv, rv);
-      
-      // Only fetch the bookmark title if we have a bookmark
-      if (parentId) {
-        rv = aQuery->GetString(kAutoCompleteIndex_BookmarkTitle, entryBookmarkTitle);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      nsAutoString entryTags;
-      rv = aQuery->GetString(kAutoCompleteIndex_Tags, entryTags);
-      NS_ENSURE_SUCCESS(rv, rv);
-      PRInt32 visitCount = 0;
-      rv = aQuery->GetInt32(kAutoCompleteIndex_VisitCount, &visitCount);
-      NS_ENSURE_SUCCESS(rv, rv);
-      PRInt32 typed = 0;
-      rv = aQuery->GetInt32(kAutoCompleteIndex_Typed, &typed);
-
-      // Always prefer the bookmark title unless it's empty
-      nsAutoString title =
-        entryBookmarkTitle.IsEmpty() ? entryTitle : entryBookmarkTitle;
-
-      nsString style;
-      switch (aType) {
-        case QUERY_KEYWORD: {
-          // If we don't have a title, then we must have a keyword, so let the
-          // UI know it's a keyword; otherwise, we found an exact page match,
-          // so just show the page like a regular result
-          if (entryTitle.IsEmpty())
-            style = NS_LITERAL_STRING("keyword");
-          else
-            title = entryTitle;
-
-          break;
-        }
-        case QUERY_FILTERED: {
-          // If we get any results, there's potentially another chunk to proces
-          if (aHasMoreResults)
-            *aHasMoreResults = PR_TRUE;
-
-          // Keep track of if we've matched all the filter requirements such as
-          // only history items, only bookmarks, only tags. If a given restrict
-          // is active, make sure a corresponding condition is *not* true. If
-          // any are violated, matchAll will be false.
-          PRBool matchAll = !((GET_BEHAVIOR(History) && visitCount == 0) ||
-                              (GET_BEHAVIOR(Typed) && typed == 0) ||
-                              (GET_BEHAVIOR(Bookmark) && !parentId) ||
-                              (GET_BEHAVIOR(Tag) && entryTags.IsEmpty()));
-
-          // Unescape the url to search for unescaped terms
-          nsString entryURL = FixupURIText(escapedEntryURL);
-
-          // Determine if every token matches either the bookmark title, tags,
-          // page title, or page url
-          for (PRUint32 i = 0; i < mCurrentSearchTokens.Length() && matchAll; i++) {
-            const nsString& token = mCurrentSearchTokens[i];
-
-            // Check if the tags match the search term
-            PRBool matchTags = (*tokenMatchesTarget)(token, entryTags);
-            // Check if the title matches the search term
-            PRBool matchTitle = (*tokenMatchesTarget)(token, title);
-
-            // Make sure we match something in the title or tags if we have to
-            matchAll = matchTags || matchTitle;
-            if (GET_BEHAVIOR(Title) && !matchAll)
-              break;
-
-            // Check if the url matches the search term
-            PRBool matchUrl = (*tokenMatchesTarget)(token, entryURL);
-            // If we don't match the url when we have to, reset matchAll to
-            // false; otherwise keep track that we did match the current search
-            if (GET_BEHAVIOR(Url) && !matchUrl)
-              matchAll = PR_FALSE;
-            else
-              matchAll |= matchUrl;
-          }
-
-          // Skip if we don't match all terms in the bookmark, tag, title or url
-          if (!matchAll)
-            continue;
-
-          break;
-        }
-      }
-
-      // Always prefer to show tags if we have them
-      PRBool showTags = !entryTags.IsEmpty();
-
-      // Pretend a page isn't bookmarked/tagged if the user only wants history,
-      // but still show the star and tag if the user explicitly wants them
-      if (GET_BEHAVIOR(History) && !(GET_BEHAVIOR(Bookmark) || GET_BEHAVIOR(Tag))) {
-        showTags = PR_FALSE;
-        style = NS_LITERAL_STRING("favicon");
-      }
-
-      // Add the tags to the title if necessary
-      if (showTags)
-        title += TITLE_TAGS_SEPARATOR + entryTags;
-
-      // Tags have a special style to show a tag icon; otherwise, style the
-      // bookmarks that aren't feed items and feed URIs as bookmark
-      if (style.IsEmpty()) {
-        if (showTags)
-          style = NS_LITERAL_STRING("tag");
-        else if ((parentId && !mLivemarkFeedItemIds.Get(parentId, &dummy)) ||
-                 mLivemarkFeedURIs.Get(escapedEntryURL, &dummy))
-          style = NS_LITERAL_STRING("bookmark");
-        else
-          style = NS_LITERAL_STRING("favicon");
-      }
-
-      // Get the URI for the favicon
-      nsCAutoString faviconSpec;
-      faviconService->GetFaviconSpecForIconString(
-        NS_ConvertUTF16toUTF8(entryFavicon), faviconSpec);
-      NS_ConvertUTF8toUTF16 faviconURI(faviconSpec);
-
-      // New item: append to our results and put it in our hash table
-      rv = mCurrentResult->AppendMatch(escapedEntryURL, title, faviconURI, style);
-      NS_ENSURE_SUCCESS(rv, rv);
-      mCurrentResultURLs.Put(escapedEntryURL, PR_TRUE);
-
-      // Stop processing if we have enough results
-      if (AutoCompleteHasEnoughResults())
-        break;
-    }
-  }
-
-  return NS_OK;
-}
-
-inline PRBool
-nsNavHistory::AutoCompleteHasEnoughResults()
-{
-  return mCurrentResultURLs.Count() >= (PRUint32)mAutoCompleteMaxResults;
-}
-
-// nsNavHistory::OnValueRemoved (nsIAutoCompleteSimpleResultListener)
-
-NS_IMETHODIMP
-nsNavHistory::OnValueRemoved(nsIAutoCompleteSimpleResult* aResult,
-                             const nsAString& aValue, PRBool aRemoveFromDb)
-{
-  NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
-
-  if (!aRemoveFromDb)
-    return NS_OK;
-
-  nsresult rv;
-  nsCOMPtr<nsIURI> uri;
-  rv = NS_NewURI(getter_AddRefs(uri), aValue);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = RemovePage(uri);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult
-nsNavHistory::AutoCompleteFeedback(PRInt32 aIndex,
-                                   nsIAutoCompleteController *aController)
-{
-  // we don't track user choices in the awesomebar in private browsing mode
-  if (InPrivateBrowsingMode())
-    return NS_OK;
-
-  mozIStorageStatement *stmt = GetDBFeedbackIncrease();
-  mozStorageStatementScoper scope(stmt);
-
-  nsAutoString input;
-  nsresult rv = aController->GetSearchString(input);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = stmt->BindStringParameter(0, input);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoString url;
-  rv = aController->GetValueAt(aIndex, url);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = stmt->BindStringParameter(1, url);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // We do the update async and we don't care about failures
-  nsCOMPtr<AutoCompleteStatementCallbackNotifier> callback =
-    new AutoCompleteStatementCallbackNotifier();
-  nsCOMPtr<mozIStoragePendingStatement> canceler;
-  rv = stmt->ExecuteAsync(callback, getter_AddRefs(canceler));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsString
-nsNavHistory::FixupURIText(const nsAString &aURIText)
-{
-  // Unescaping utilities expect UTF8 strings
-  NS_ConvertUTF16toUTF8 escaped(aURIText);
-
-  // Strip off some prefixes so we don't have to match the exact protocol for
-  // sites. E.g., http://mozilla.org/ can match other mozilla.org pages.
-  if (StringBeginsWith(escaped, NS_LITERAL_CSTRING("https://")))
-    escaped.Cut(0, 8);
-  else if (StringBeginsWith(escaped, NS_LITERAL_CSTRING("http://")))
-    escaped.Cut(0, 7);
-  else if (StringBeginsWith(escaped, NS_LITERAL_CSTRING("ftp://")))
-    escaped.Cut(0, 6);
-
-  nsString fixedUp;
-  // Use the service if we have it to avoid invalid UTF8 strings
-  if (mTextURIService) {
-    mTextURIService->UnEscapeURIForUI(NS_LITERAL_CSTRING("UTF-8"),
-      escaped, fixedUp);
-    return fixedUp;
-  }
-
-  // Fallback on using this if the service is unavailable for some reason
-  NS_UnescapeURL(escaped);
-  CopyUTF8toUTF16(escaped, fixedUp);
-  return fixedUp;
-}
diff --git a/toolkit/components/places/src/nsPlacesAutoComplete.js b/toolkit/components/places/src/nsPlacesAutoComplete.js
new file mode 100644
index 00000000000..52c912cb6ba
--- /dev/null
+++ b/toolkit/components/places/src/nsPlacesAutoComplete.js
@@ -0,0 +1,1056 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Shawn Wilsher <me@shawnwilsher.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+////////////////////////////////////////////////////////////////////////////////
+//// Constants
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cr = Components.results;
+
+// This is just a helper for the next constant.
+function book_tag_sql_fragment(aName, aColumn, aForTag)
+{
+  return ["(",
+    "SELECT ", aColumn, " ",
+    "FROM moz_bookmarks b ",
+    "JOIN moz_bookmarks t ",
+      "ON t.id = b.parent ",
+      "AND t.parent ", (aForTag ? "" : "!"), "= :parent ",
+    "WHERE b.type = ", Ci.nsINavBookmarksService.TYPE_BOOKMARK, " ",
+      "AND b.fk = h.id ",
+    (aForTag ? "AND LENGTH(t.title) > 0" :
+               "ORDER BY b.lastModified DESC LIMIT 1"),
+  ") AS ", aName].join("");
+}
+
+// This SQL query fragment provides the following:
+//   - the parent folder for bookmarked entries (kQueryIndexParent)
+//   - the bookmark title, if it is a bookmark (kQueryIndexBookmarkTitle)
+//   - the tags associated with a bookmarked entry (kQueryIndexTags)
+const kBookTagSQLFragment =
+  book_tag_sql_fragment("parent", "b.parent", false) + ", " +
+  book_tag_sql_fragment("bookmark", "b.title", false) + ", " +
+  book_tag_sql_fragment("tags", "GROUP_CONCAT(t.title, ',')", true);
+
+// observer topics
+const kQuitApplication = "quit-application";
+const kPrefChanged = "nsPref:changed";
+
+// Match type constants.  These indicate what type of search function we should
+// be using.
+const MATCH_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_ANYWHERE;
+const MATCH_BOUNDARY_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY_ANYWHERE;
+const MATCH_BOUNDARY = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY;
+const MATCH_BEGINNING = Ci.mozIPlacesAutoComplete.MATCH_BEGINNING;
+
+// AutoComplete index constants.  All AutoComplete queries will provide these
+// columns in this order.
+const kQueryIndexURL = 0;
+const kQueryIndexTitle = 1;
+const kQueryIndexFaviconURL = 2;
+const kQueryIndexParentId = 3;
+const kQueryIndexBookmarkTitle = 4;
+const kQueryIndexTags = 5;
+const kQueryIndexVisitCount = 6;
+const kQueryIndexTyped = 7;
+const kQueryIndexPlaceId = 8;
+const kQueryIndexQueryType = 9;
+
+// AutoComplete query type constants.  Describes the various types of queries
+// that we can process.
+const kQueryTypeKeyword = 0;
+const kQueryTypeFiltered = 1;
+
+// This separator is used as an RTL-friendly way to split the title and tags.
+// It can also be used by an nsIAutoCompleteResult consumer to re-split the
+// "comment" back into the title and the tag.
+const kTitleTagsSeparator = " \u2013 ";
+
+// The list of columns in the moz_places table that we use in our queries.
+const kMozPlacesColumns =
+  "id, url, title, rev_host, visit_count, hidden, typed, favicon_id, " +
+  "frecency, last_visit_date"
+
+const kBrowserUrlbarBranch = "browser.urlbar.";
+
+////////////////////////////////////////////////////////////////////////////////
+//// Global Functions
+
+/**
+ * Generates the SQL subquery to get the best favicon for a given revhost.  This
+ * is the favicon for the most recent visit.
+ *
+ * @param aTableName
+ *        The table to join to the moz_favicons table with.  This must have a
+ *        column called favicon_id.
+ * @return the SQL subquery (in string form) to get the best favicon.
+ */
+function best_favicon_for_revhost(aTableName)
+{
+  return "(" +
+    "SELECT f.url " +
+    "FROM " + aTableName + " " +
+    "JOIN moz_favicons f ON f.id = favicon_id " +
+    "WHERE rev_host = IFNULL( " +
+      "(SELECT rev_host FROM moz_places_temp WHERE id = b.fk), " +
+      "(SELECT rev_host FROM moz_places WHERE id = b.fk) " +
+    ") " +
+    "ORDER BY frecency DESC " +
+    "LIMIT 1 " +
+  ")";
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// AutoCompleteStatementCallbackWrapper class
+
+/**
+ * Wraps a callback and ensures that handleCompletion is not dispatched if the
+ * query is no longer tracked.
+ *
+ * @param aCallback
+ *        A reference to a nsPlacesAutoComplete.
+ */
+function AutoCompleteStatementCallbackWrapper(aCallback)
+{
+  this._callback = aCallback;
+}
+
+AutoCompleteStatementCallbackWrapper.prototype = {
+  //////////////////////////////////////////////////////////////////////////////
+  //// mozIStorageStatementCallback
+
+  handleResult: function ACSCW_handleResult(aResultSet)
+  {
+    this._callback.handleResult.apply(this._callback, arguments);
+  },
+
+  handleError: function ACSCW_handleError(aError)
+  {
+    this._callback.handleError.apply(this._callback, arguments);
+  },
+
+  handleCompletion: function ACSCW_handleCompletion(aReason)
+  {
+    // Only dispatch handleCompletion if we are not done searching and are a
+    // pending search.
+    let callback = this._callback;
+    if (!callback.isSearchComplete() && callback.isPendingSearch(this._handle))
+      callback.handleCompletion.apply(callback, arguments);
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// AutoCompleteStatementCallbackWrapper
+
+  /**
+   * Executes the specified query asynchronously.  This object will notify
+   * this._callback if we should notify (logic explained in handleCompletion).
+   *
+   * @param aQuery
+   *        The query to execute asynchronously.
+   * @return a mozIStoragePendingStatement that can be used to cancel the query.
+   */
+  executeAsync: function ACSCW_executeAsync(aQuery)
+  {
+    return this._handle = aQuery.executeAsync(this);
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsISupports
+
+  QueryInterface: XPCOMUtils.generateQI([
+    Ci.mozIStorageStatementCallback,
+  ])
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsPlacesAutoComplete class
+
+function nsPlacesAutoComplete()
+{
+  //////////////////////////////////////////////////////////////////////////////
+  //// Shared Constants for Smart Getters
+
+  // Define common pieces of various queries.
+  // TODO bug 412736 in case of a frecency tie, break it with h.typed and
+  // h.visit_count which is better than nothing.  This is slow, so not doing it
+  // yet...
+  // Note: h.frecency is only selected because we need it for ordering.
+  const SQL_BASE =
+    "SELECT h.url, h.title, f.url, " + kBookTagSQLFragment + ", h.visit_count, " +
+           "h.typed, h.id, :query_type " +
+    "FROM ( " +
+      "SELECT " + kMozPlacesColumns + " FROM moz_places_temp " +
+      "UNION ALL " +
+      "SELECT " + kMozPlacesColumns + " FROM moz_places " +
+      "WHERE +id NOT IN (SELECT id FROM moz_places_temp) " +
+      "ORDER BY frecency DESC " +
+    ") AS h " +
+    "LEFT OUTER JOIN moz_favicons f " +
+    "ON f.id = h.favicon_id " +
+    "WHERE h.frecency <> 0 " +
+    "AND AUTOCOMPLETE_MATCH(:searchString, h.url, IFNULL(bookmark, h.title), " +
+                           "tags, h.visit_count, h.typed, parent, " +
+                           ":matchBehavior, :searchBehavior) " +
+    "{ADDITIONAL_CONDITIONS}";
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Smart Getters
+
+  this.__defineGetter__("_db", function() {
+    delete this._db;
+    return this._db = Cc["@mozilla.org/browser/nav-history-service;1"].
+                      getService(Ci.nsPIPlacesDatabase).
+                      DBConnection;
+  });
+
+  this.__defineGetter__("_bh", function() {
+    delete this._bh;
+    return this._bh = Cc["@mozilla.org/browser/global-history;2"].
+                      getService(Ci.nsIBrowserHistory);
+  });
+
+  this.__defineGetter__("_textURIService", function() {
+    delete this._textURIService;
+    return this._textURIService = Cc["@mozilla.org/intl/texttosuburi;1"].
+                                  getService(Ci.nsITextToSubURI);
+  });
+
+  this.__defineGetter__("_bs", function() {
+    delete this._bs;
+    return this._bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
+                      getService(Ci.nsINavBookmarksService);
+  });
+
+  this.__defineGetter__("_ioService", function() {
+    delete this._ioService;
+    return this._ioService = Cc["@mozilla.org/network/io-service;1"].
+                             getService(Ci.nsIIOService);
+  });
+
+  this.__defineGetter__("_faviconService", function() {
+    delete this._faviconService;
+    return this._faviconService = Cc["@mozilla.org/browser/favicon-service;1"].
+                                  getService(Ci.nsIFaviconService);
+  });
+
+  this.__defineGetter__("_defaultQuery", function() {
+    delete this._defaultQuery;
+    let replacementText = "";
+    return this._defaultQuery = this._db.createStatement(
+      SQL_BASE.replace("{ADDITIONAL_CONDITIONS}", replacementText, "g")
+    );
+  });
+
+  this.__defineGetter__("_historyQuery", function() {
+    delete this._historyQuery;
+    let replacementText = "AND h.visit_count > 0";
+    return this._historyQuery = this._db.createStatement(
+      SQL_BASE.replace("{ADDITIONAL_CONDITIONS}", replacementText, "g")
+    );
+  });
+
+  this.__defineGetter__("_bookmarkQuery", function() {
+    delete this._bookmarkQuery;
+    let replacementText = "AND bookmark IS NOT NULL";
+    return this._bookmarkQuery = this._db.createStatement(
+      SQL_BASE.replace("{ADDITIONAL_CONDITIONS}", replacementText, "g")
+    );
+  });
+
+  this.__defineGetter__("_tagsQuery", function() {
+    delete this._tagsQuery;
+    let replacementText = "AND tags IS NOT NULL";
+    return this._tagsQuery = this._db.createStatement(
+      SQL_BASE.replace("{ADDITIONAL_CONDITIONS}", replacementText, "g")
+    );
+  });
+
+  this.__defineGetter__("_typedQuery", function() {
+    delete this._typedQuery;
+    let replacementText = "AND h.typed = 1";
+    return this._typedQuery = this._db.createStatement(
+      SQL_BASE.replace("{ADDITIONAL_CONDITIONS}", replacementText, "g")
+    );
+  });
+
+  this.__defineGetter__("_adaptiveQuery", function() {
+    delete this._adaptiveQuery;
+    // In this query, we are taking kBookTagSQLFragment only for h.id because it
+    // uses data from the moz_bookmarks table and we sync tables on bookmark
+    // insert.  So, most likely, h.id will always be populated when we have any
+    // bookmark.  We still need to join on moz_places_temp for other data (eg.
+    // title).
+    return this._adaptiveQuery = this._db.createStatement(
+      "/* do not warn (bug 487789) */ " +
+      "SELECT IFNULL(h_t.url, h.url), IFNULL(h_t.title, h.title), f.url, " +
+              kBookTagSQLFragment + ", IFNULL(h_t.visit_count, h.visit_count), " +
+              "IFNULL(h_t.typed, h.typed), IFNULL(h_t.id, h.id), " +
+              ":query_type, rank " +
+      "FROM ( " +
+        "SELECT ROUND(MAX(((i.input = :search_string) + " +
+                          "(SUBSTR(i.input, 1, LENGTH(:search_string)) = :search_string)) * " +
+                          "i.use_count), 1) AS rank, place_id " +
+        "FROM moz_inputhistory i " +
+        "GROUP BY i.place_id " +
+        "HAVING rank > 0 " +
+      ") AS i " +
+      "LEFT JOIN moz_places h ON h.id = i.place_id " +
+      "LEFT JOIN moz_places_temp h_t ON h_t.id = i.place_id " +
+      "LEFT JOIN moz_favicons f ON f.id = IFNULL(h_t.favicon_id, h.favicon_id) "+
+      "WHERE IFNULL(h_t.url, h.url) NOTNULL " +
+      "ORDER BY rank DESC, IFNULL(h_t.frecency, h.frecency) DESC"
+    );
+  });
+
+  this.__defineGetter__("_keywordQuery", function() {
+    delete this._keywordQuery;
+    return this._keywordQuery = this._db.createStatement(
+      "/* do not warn (bug 487787) */ " +
+      "SELECT IFNULL( " +
+          "(SELECT REPLACE(url, '%s', :query_string) FROM moz_places_temp WHERE id = b.fk), " +
+          "(SELECT REPLACE(url, '%s', :query_string) FROM moz_places WHERE id = b.fk) " +
+        ") AS search_url, IFNULL(h_t.title, h.title), " +
+        "COALESCE(f.url, " + best_favicon_for_revhost("moz_places_temp") + "," +
+                  best_favicon_for_revhost("moz_places") + "), b.parent, " +
+        "b.title, NULL, IFNULL(h_t.visit_count, h.visit_count), " +
+        "IFNULL(h_t.typed, h.typed), COALESCE(h_t.id, h.id, b.fk), " +
+        ":query_type " +
+      "FROM moz_keywords k " +
+      "JOIN moz_bookmarks b ON b.keyword_id = k.id " +
+      "LEFT JOIN moz_places AS h ON h.url = search_url " +
+      "LEFT JOIN moz_places_temp AS h_t ON h_t.url = search_url " +
+      "LEFT JOIN moz_favicons f ON f.id = IFNULL(h_t.favicon_id, h.favicon_id) " +
+      "WHERE LOWER(k.keyword) = LOWER(:keyword) " +
+      "ORDER BY IFNULL(h_t.frecency, h.frecency) DESC"
+    );
+  });
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Initialization
+
+  // load preferences
+  this._loadPrefs(true);
+
+  // register observers
+  this._os = Cc["@mozilla.org/observer-service;1"].
+              getService(Ci.nsIObserverService);
+  this._os.addObserver(this, kQuitApplication, false);
+
+}
+
+nsPlacesAutoComplete.prototype = {
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsIAutoCompleteSearch
+
+  startSearch: function PAC_startSearch(aSearchString, aSearchParam,
+                                        aPreviousResult, aListener)
+  {
+    // Note: We don't use aPreviousResult to make sure ordering of results are
+    //       consistent.  See bug 412730 for more details.
+
+    // We want to store the original string with no leading or trailing
+    // whitespace for case sensitive searches.
+    this._originalSearchString = aSearchString.trim();
+
+    this._currentSearchString =
+      this._fixupSearchText(this._originalSearchString.toLowerCase());
+
+    this._listener = aListener;
+    let result = Cc["@mozilla.org/autocomplete/simple-result;1"].
+                 createInstance(Ci.nsIAutoCompleteSimpleResult);
+    result.setSearchString(aSearchString);
+    result.setListener(this);
+    this._result = result;
+    this._notifyResults(true);
+
+    // If we are not enabled, we need to return now.
+    if (!this._enabled) {
+      this._finishSearch(true);
+      return;
+    }
+
+    // Reset our search behavior to the default.
+    this._behavior = this._defaultBehavior;
+
+    // If we have no search terms, this is a special search that should only
+    // look for BEHAVIOR_HISTORY and BEHAVIOR_TYPED.
+    if (!this._currentSearchString) {
+      this._setBehavior("history");
+      this._setBehavior("typed");
+    }
+
+    // For any given search, we run up to three queries:
+    // 1) keywords (this._keywordQuery)
+    // 2) adaptive learning (this._adaptiveQuery)
+    // 3) query from this._getSearch
+    // We always run (2) and (3), but (1) only gets ran if we get any filtered
+    // tokens from this._getSearch (if there are no tokens, there is nothing to
+    // match, so there is no reason to run the query).
+    let {query, tokens} =
+      this._getSearch(this._getUnfilteredSearchTokens(this._currentSearchString));
+    let queries = tokens.length ?
+      [this._getBoundKeywordQuery(tokens), this._getBoundAdaptiveQuery(), query] :
+      [this._getBoundAdaptiveQuery(), query];
+
+    // Start executing our queries.
+    this._executeQueries(queries);
+
+    // Set up our persistent state for the duration of the search.
+    this._searchTokens = tokens;
+    this._usedPlaceIds = {};
+  },
+
+  stopSearch: function PAC_stopSearch()
+  {
+    // We need to cancel our searches so we do not get any [more] results.
+    this._stopActiveQueries();
+
+    this._finishSearch(false);
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsIAutoCompleteSimpleResultListener
+
+  onValueRemoved: function PAC_onValueRemoved(aResult, aURISpec, aRemoveFromDB)
+  {
+    if (aRemoveFromDB)
+      this._bh.removePage(this._ioService.newURI(aURISpec, null, null));
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// mozIStorageStatementCallback
+
+  handleResult: function PAC_handleResult(aResultSet)
+  {
+    let row, haveMatches = false;
+    while (row = aResultSet.getNextRow()) {
+      let match = this._processRow(row);
+      haveMatches = haveMatches || match;
+
+      if (this._result.matchCount == this._maxRichResults) {
+        // We have enough results, so stop running our queries.
+        this._stopActiveQueries();
+
+        // And finish our search.
+        this._finishSearch(true);
+        return;
+      }
+
+    }
+
+    // Notify about results if we've gotten them.
+    if (haveMatches)
+      this._notifyResults(true);
+  },
+
+  handleError: function PAC_handleError(aError)
+  {
+    Components.utils.reportError("Places AutoComplete: " + aError);
+  },
+
+  handleCompletion: function PAC_handleCompletion(aReason)
+  {
+    // If we have already finished our search, we should bail out early.
+    if (this.isSearchComplete())
+      return;
+
+    // Remove the first query in our array of pending queries since it is the
+    // one we are getting notified about.
+    this._pendingQueries.shift();
+
+    // If we still have pending queries, we bail out because we aren't done
+    // getting results.
+    if (this._pendingQueries.length)
+      return;
+
+    // If we do not have enough results, and our match type is
+    // MATCH_BOUNDARY_ANYWHERE, search again with MATCH_ANYWHERE to get more
+    // results.
+    if (this._matchBehavior == MATCH_BOUNDARY_ANYWHERE &&
+        this._result.matchCount < this._maxRichResults && !this._secondPass) {
+      this._secondPass = true;
+      let query = this._getBoundSearchQuery(MATCH_ANYWHERE, this._searchTokens);
+      this._executeQueries([query]);
+      return;
+    }
+
+    this._finishSearch(true);
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsIObserver
+
+  observe: function PAC_observe(aSubject, aTopic, aData)
+  {
+    if (aTopic == kQuitApplication) {
+      this._os.removeObserver(this, kQuitApplication);
+
+      // Remove our preference observer.
+      let prefs = Cc["@mozilla.org/preferences-service;1"].
+                  getService(Ci.nsIPrefService).
+                  getBranch(kBrowserUrlbarBranch).
+                  QueryInterface(Ci.nsIPrefBranch2);
+      prefs.removeObserver("", this);
+
+      // Finalize the statements that we have used.
+      let stmts = [
+        "_defaultQuery",
+        "_historyQuery",
+        "_bookmarkQuery",
+        "_tagsQuery",
+        "_typedQuery",
+        "_adaptiveQuery",
+        "_keywordQuery",
+      ];
+      for (let i = 0; i < stmts.length; i++) {
+        // We do not want to create any query we haven't already created, so
+        // see if it is a getter first.  __lookupGetter__ returns null if it is
+        // actually a statement.
+        if (!this.__lookupGetter__(stmts[i]))
+          this[stmts[i]].finalize();
+      }
+    }
+    else if (aTopic == kPrefChanged) {
+      this._loadPrefs();
+    }
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsPlacesAutoComplete
+
+  /**
+   * Used to unescape encoded URI strings, and drop information that we do not
+   * care about for searching.
+   *
+   * @param aURIString
+   *        The text to unescape and modify.
+   * @return the modified uri.
+   */
+  _fixupSearchText: function PAC_fixupSearchText(aURIString)
+  {
+    let uri = aURIString;
+
+    if (uri.indexOf("http://") == 0)
+      uri = uri.slice(7);
+    else if (uri.indexOf("https://") == 0)
+      uri = uri.slice(8);
+    else if (uri.indexOf("ftp://") == 0)
+      uri = uri.slice(6);
+
+    return this._textURIService.unEscapeURIForUI("UTF-8", uri);
+  },
+
+  /**
+   * Generates the tokens used in searching from a given string.
+   *
+   * @param aSearchString
+   *        The string to generate tokens from.
+   * @return an array of tokens.
+   */
+  _getUnfilteredSearchTokens: function PAC_unfilteredSearchTokens(aSearchString)
+  {
+    // Calling split on an empty string will return an array containing one
+    // empty string.  We don't want that, as it'll break our logic, so return an
+    // empty array then.
+    return aSearchString.length ? aSearchString.split(" ") : [];
+  },
+
+  /**
+   * Properly cleans up when searching is completed.
+   *
+   * @param aNotify
+   *        Indicates if we should notify the AutoComplete listener about our
+   *        results or not.
+   */
+  _finishSearch: function PAC_finishSearch(aNotify)
+  {
+    // Notify about results if we are supposed to.
+    if (aNotify)
+      this._notifyResults(false);
+
+    // Clear our state
+    delete this._originalSearchString;
+    delete this._currentSearchString;
+    delete this._searchTokens;
+    delete this._listener;
+    delete this._result;
+    delete this._usedPlaceIds;
+    this._secondPass = false;
+  },
+
+  /**
+   * Executes the given queries asynchronously.
+   *
+   * @param aQueries
+   *        The queries to execute.
+   */
+  _executeQueries: function PAC_executeQueries(aQueries)
+  {
+    // Because we might get a handleCompletion for canceled queries, we want to
+    // filter out queries we no longer care about (described in the
+    // handleCompletion implementation of AutoCompleteStatementCallbackWrapper).
+    let PAC = this;
+    this._pendingQueries = aQueries.map(function(aQuery) {
+      // Create our wrapper object and execute the query.
+      let callbackWrapper = new AutoCompleteStatementCallbackWrapper(PAC);
+      return callbackWrapper.executeAsync(aQuery);
+    });
+  },
+
+  /**
+   * Stops executing all active queries.
+   */
+  _stopActiveQueries: function PAC_stopActiveQueries()
+  {
+    this._pendingQueries.forEach(function(aQuery) aQuery.cancel());
+    delete this._pendingQueries;
+  },
+
+  /**
+   * Notifies the listener about results.
+   *
+   * @param aSearchOngoing
+   *        Indicates if the search is ongoing or not.
+   */
+  _notifyResults: function PAC_notifyResults(aSearchOngoing)
+  {
+    let result = this._result;
+    let resultCode = result.matchCount ? "RESULT_SUCCESS" : "RESULT_NOMATCH";
+    if (aSearchOngoing)
+      resultCode += "_ONGOING";
+    result.setSearchResult(Ci.nsIAutoCompleteResult[resultCode]);
+    result.setDefaultIndex(result.matchCount ? 0 : -1);
+    this._listener.onSearchResult(this, result);
+  },
+
+  /**
+   * Loads the preferences that we care about.
+   *
+   * @param [optional] aRegisterObserver
+   *        Indicates if the preference observer should be added or not.  The
+   *        default value is false.
+   */
+  _loadPrefs: function PAC_loadPrefs(aRegisterObserver)
+  {
+    let prefs = Cc["@mozilla.org/preferences-service;1"].
+                getService(Ci.nsIPrefService).
+                getBranch(kBrowserUrlbarBranch);
+    function safeGetter(aName, aDefault) {
+      let types = {
+        boolean: "Bool",
+        number: "Int",
+        string: "Char"
+      };
+      let type = types[typeof(aDefault)];
+      if (!type)
+        throw "Unknown type!";
+
+      // If the pref isn't set, we want to use the default.
+      try {
+        return prefs["get" + type + "Pref"](aName);
+      }
+      catch (e) {
+        return aDefault;
+      }
+    }
+
+    this._enabled = safeGetter("autocomplete.enabled", true);
+    this._matchBehavior = safeGetter("matchBehavior", MATCH_BOUNDARY_ANYWHERE);
+    this._filterJavaScript = safeGetter("filter.javascript", true);
+    this._maxRichResults = safeGetter("maxRichResults", 25);
+    this._restrictHistoryToken = safeGetter("restrict.history", "^");
+    this._restrictBookmarkToken = safeGetter("restrict.bookmark", "*");
+    this._restrictTypedToken = safeGetter("restrict.typed", "~");
+    this._restrictTagToken = safeGetter("restrct.tag", "+");
+    this._matchTitleToken = safeGetter("match.title", "#");
+    this._matchURLToken = safeGetter("match.url", "@");
+    this._defaultBehavior = safeGetter("default.behavior", 0);
+
+    // Validate matchBehavior; default to MATCH_BOUNDARY_ANYWHERE.
+    if (this._matchBehavior != MATCH_ANYWHERE &&
+        this._matchBehavior != MATCH_BOUNDARY &&
+        this._matchBehavior != MATCH_BEGINNING)
+      this._matchBehavior = MATCH_BOUNDARY_ANYWHERE;
+
+    // register observer
+    if (aRegisterObserver) {
+      let pb = prefs.QueryInterface(Ci.nsIPrefBranch2);
+      pb.addObserver("", this, false);
+    }
+  },
+
+  /**
+   * Given an array of tokens, this function determines which query should be
+   * ran.  It also removes any special search tokens.
+   *
+   * @param aTokens
+   *        An array of search tokens.
+   * @return an object with two properties:
+   *         query: the correctly optimized, bound query to search the database
+   *                with.
+   *         tokens: the filtered list of tokens to search with.
+   */
+  _getSearch: function PAC_getSearch(aTokens)
+  {
+    // Set the proper behavior so our call to _getBoundSearchQuery gives us the
+    // correct query.
+    for (let i = aTokens.length - 1; i >= 0; i--) {
+      switch (aTokens[i]) {
+        case this._restrictHistoryToken:
+          this._setBehavior("history");
+          break;
+        case this._restrictBookmarkToken:
+          this._setBehavior("bookmark");
+          break;
+        case this._restrictTagToken:
+          this._setBehavior("tag");
+          break;
+        case this._matchTitleToken:
+          this._setBehavior("title");
+          break;
+        case this._matchURLToken:
+          this._setBehavior("url");
+          break;
+        case this._restrictTypedToken:
+          this._setBehavior("typed");
+          break;
+        default:
+          // We do not want to remove the token if we did not match.
+          continue;
+      };
+
+      aTokens.splice(i, 1);
+    }
+
+    // Set the right JavaScript behavior based on our preference.  Note that the
+    // preference is whether or not we should filter JavaScript, and the
+    // behavior is if we should search it or not.
+    if (!this._filterJavaScript)
+      this._setBehavior("javascript");
+
+    return {
+      query: this._getBoundSearchQuery(this._matchBehavior, aTokens),
+      tokens: aTokens
+    };
+  },
+
+  /**
+   * Obtains the search query to be used based on the previously set search
+   * behaviors (accessed by this._hasBehavior).  The query is bound and ready to
+   * execute.
+   *
+   * @param aMatchBehavior
+   *        How this query should match its tokens to the search string.
+   * @param aTokens
+   *        An array of search tokens.
+   * @return the correctly optimized query to search the database with and the
+   *         new list of tokens to search with.  The query has all the needed
+   *         parameters bound, so consumers can execute it without doing any
+   *         additional work.
+   */
+  _getBoundSearchQuery: function PAC_getBoundSearchQuery(aMatchBehavior,
+                                                         aTokens)
+  {
+    // We use more optimized queries for restricted searches, so we will always
+    // return the most restrictive one to the least restrictive one if more than
+    // one token is found.
+    let query = this._hasBehavior("tag") ? this._tagsQuery :
+                this._hasBehavior("bookmark") ? this._bookmarkQuery :
+                this._hasBehavior("typed") ? this._typedQuery :
+                this._hasBehavior("history") ? this._historyQuery :
+                this._defaultQuery;
+
+    // Bind the needed parameters to the query so consumers can use it.
+    let (params = query.params) {
+      params.parent = this._bs.tagsFolder;
+      params.query_type = kQueryTypeFiltered;
+      params.matchBehavior = aMatchBehavior;
+      params.searchBehavior = this._behavior;
+
+      // We only want to search the tokens that we are left with - not the
+      // original search string.
+      params.searchString = aTokens.join(" ");
+    }
+
+    return query;
+  },
+
+  /**
+   * Obtains the keyword query with the properly bound parameters.
+   *
+   * @param aTokens
+   *        The array of search tokens to check against.
+   * @return the bound keyword query.
+   */
+  _getBoundKeywordQuery: function PAC_getBoundKeywordQuery(aTokens)
+  {
+    // The keyword is the first word in the search string, with the parameters
+    // following it.
+    let searchString = this._originalSearchString;
+    let queryString = searchString.substring(searchString.indexOf(" ") + 1);
+
+    // We need to escape the parameters as if they were the query in a URL
+    queryString = encodeURIComponent(queryString).replace("%20", "+", "g");
+
+    // The first word could be a keyword, so that's what we'll search.
+    let keyword = aTokens[0];
+
+    let query = this._keywordQuery;
+    let (params = query.params) {
+      params.keyword = keyword;
+      params.query_string = queryString;
+      params.query_type = kQueryTypeKeyword;
+    }
+
+    return query;
+  },
+
+  /**
+   * Obtains the adaptive query with the properly bound parameters.
+   *
+   * @return the bound adaptive query.
+   */
+  _getBoundAdaptiveQuery: function PAC_getBoundAdaptiveQuery()
+  {
+    let query = this._adaptiveQuery;
+    let (params = query.params) {
+      params.parent = this._bs.tagsFolder;
+      params.search_string = this._currentSearchString;
+      params.query_type = kQueryTypeFiltered;
+    }
+
+    return query;
+  },
+
+  /**
+   * Processes a mozIStorageRow to generate the proper data for the AutoComplete
+   * result.  This will add an entry to the current result if it matches the
+   * criteria.
+   *
+   * @param aRow
+   *        The row to process.
+   * @return true if the row is accepted, and false if not.
+   */
+  _processRow: function PAC_processRow(aRow)
+  {
+    // Before we do any work, make sure this entry isn't already in our results.
+    let entryId = aRow.getResultByIndex(kQueryIndexPlaceId);
+    if (this._inResults(entryId))
+      return false;
+
+    let escapedEntryURL = aRow.getResultByIndex(kQueryIndexURL);
+    let entryTitle = aRow.getResultByIndex(kQueryIndexTitle) || "";
+    let entryFavicon = aRow.getResultByIndex(kQueryIndexFaviconURL) || "";
+    let entryParentId = aRow.getResultByIndex(kQueryIndexParentId);
+    let entryBookmarkTitle = entryParentId ?
+      aRow.getResultByIndex(kQueryIndexBookmarkTitle) : null;
+    let entryTags = aRow.getResultByIndex(kQueryIndexTags) || "";
+
+    // Always prefer the bookmark title unless it is empty
+    let title = entryBookmarkTitle || entryTitle;
+
+    let style;
+    if (aRow.getResultByIndex(kQueryIndexQueryType) == kQueryTypeKeyword) {
+      // If we do not have a title, then we must have a keyword, so let the UI
+      // know it is a keyword.  Otherwise, we found an exact page match, so just
+      // show the page like a regular result.  Because the page title is likely
+      // going to be more specific than the bookmark title (keyword title).
+      if (!entryTitle)
+        style = "keyword";
+      else
+        title = entryTitle;
+    }
+
+    // We will always prefer to show tags if we have them.
+    let showTags = !!entryTags;
+
+    // However, we'll act as if a page is not bookmarked or tagged if the user
+    // only wants only history and not bookmarks or tags.
+    if (this._hasBehavior("history") &&
+        !(this._hasBehavior("bookmark") || this._hasBehavior("tag"))) {
+      showTags = false;
+      style = "favicon";
+    }
+
+    // If we have tags and should show them, we need to add them to the title.
+    if (showTags)
+      title += kTitleTagsSeparator + entryTags;
+
+    // We have to determine the right style to display.  Tags show the tag icon,
+    // bookmarks get the bookmark icon, and keywords get the keyword icon.  If
+    // the result does not fall into any of those, it just gets the favicon.
+    if (!style) {
+      // It is possible that we already have a style set (from a keyword
+      // search), so only set it if we haven't already done so.
+      if (showTags)
+        style = "tag";
+      else if (entryParentId)
+        style = "bookmark";
+      else
+        style = "favicon";
+    }
+
+    // And finally add this to our results.
+    this._addToResults(entryId, escapedEntryURL, title, entryFavicon, style);
+    return true;
+  },
+
+  /**
+   * Checks to see if the given place has already been added to the results.
+   *
+   * @param aPlaceId
+   *        The place_id to check for.
+   * @return true if the place has been added, false otherwise.
+   */
+  _inResults: function PAC_inResults(aPlaceId)
+  {
+    return (aPlaceId in this._usedPlaceIds);
+  },
+
+  /**
+   * Adds a result to the AutoComplete results.  Also tracks that we've added
+   * this place_id into the result set.
+   *
+   * @param aPlaceId
+   *        The place_id of the item to be added to the result set.  This is
+   *        used by _inResults.
+   * @param aURISpec
+   *        The URI spec for the entry.
+   * @param aTitle
+   *        The title to give the entry.
+   * @param aFaviconSpec
+   *        The favicon to give to the entry.
+   * @param aStyle
+   *        Indicates how the entry should be styled when displayed.
+   */
+  _addToResults: function PAC_addToResults(aPlaceId, aURISpec, aTitle,
+                                           aFaviconSpec, aStyle)
+  {
+    // Add this to our internal tracker to ensure duplicates do not end up in
+    // the result.  _usedPlaceIds is an Object that is being used as a set.
+    this._usedPlaceIds[aPlaceId] = true;
+
+    // Obtain the favicon for this URI.
+    let favicon;
+    if (aFaviconSpec) {
+      let uri = this._ioService.newURI(aFaviconSpec, null, null);
+      favicon = this._faviconService.getFaviconLinkForIcon(uri).spec;
+    }
+    favicon = favicon || this._faviconService.defaultFavicon.spec;
+
+    this._result.appendMatch(aURISpec, aTitle, favicon, aStyle);
+  },
+
+  /**
+   * Determines if the specified AutoComplete behavior is set.
+   *
+   * @param aType
+   *        The behavior type to test for.
+   * @return true if the behavior is set, false otherwise.
+   */
+  _hasBehavior: function PAC_hasBehavior(aType)
+  {
+    let behavior = Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()];
+    return (this._behavior & behavior);
+  },
+
+  /**
+   * Enables the desired AutoComplete behavior.
+   *
+   * @param aType
+   *        The behavior type to set.
+   */
+  _setBehavior: function PAC_setBehavior(aType)
+  {
+    let behavior = Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()];
+    this._behavior |= behavior;
+  },
+
+  /**
+   * Determines if we are done searching or not.
+   *
+   * @return true if we have completed searching, false otherwise.
+   */
+  isSearchComplete: function PAC_isSearchComplete()
+  {
+    // If _pendingQueries is null, we should no longer do any work since we have
+    // already called _finishSearch.  This means we completed our search.
+    return this._pendingQueries == null;
+  },
+
+  /**
+   * Determines if the given handle of a pending statement is a pending search
+   * or not.
+   *
+   * @param aHandle
+   *        A mozIStoragePendingStatement to check and see if we are waiting for
+   *        results from it still.
+   * @return true if it is a pending query, false otherwise.
+   */
+  isPendingSearch: function PAC_isPendingSearch(aHandle)
+  {
+    return this._pendingQueries.indexOf(aHandle) != -1;
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsISupports
+
+  classDescription: "AutoComplete result generator for Places.",
+  classID: Components.ID("d0272978-beab-4adc-a3d4-04b76acfa4e7"),
+  contractID: "@mozilla.org/autocomplete/search;1?name=history",
+
+  QueryInterface: XPCOMUtils.generateQI([
+    Ci.nsIAutoCompleteSearch,
+    Ci.nsIAutoCompleteSimpleResultListener,
+    Ci.mozIStorageStatementCallback,
+    Ci.nsIObserver,
+  ])
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// Module Registration
+
+let components = [nsPlacesAutoComplete];
+function NSGetModule(compMgr, fileSpec)
+{
+  return XPCOMUtils.generateModule(components);
+}
diff --git a/toolkit/components/places/src/nsPlacesModule.cpp b/toolkit/components/places/src/nsPlacesModule.cpp
index b7d4bda1332..0a8b6fe3a7d 100644
--- a/toolkit/components/places/src/nsPlacesModule.cpp
+++ b/toolkit/components/places/src/nsPlacesModule.cpp
@@ -37,12 +37,6 @@ static const nsModuleComponentInfo components[] =
     nsNavHistoryConstructor,
     NS_NAVHISTORY_CLASSINFO },
 
-  { "Browser Navigation History",
-    NS_NAVHISTORYSERVICE_CID,
-    "@mozilla.org/autocomplete/search;1?name=history",
-    nsNavHistoryConstructor,
-    NS_NAVHISTORY_CLASSINFO },
-
   { "Download Navigation History",
     NS_NAVHISTORYSERVICE_CID,
     NS_DOWNLOADHISTORY_CONTRACTID,
diff --git a/toolkit/components/places/tests/autocomplete/head_autocomplete.js b/toolkit/components/places/tests/autocomplete/head_autocomplete.js
index e3dd3a425cc..ec318cc40dd 100644
--- a/toolkit/components/places/tests/autocomplete/head_autocomplete.js
+++ b/toolkit/components/places/tests/autocomplete/head_autocomplete.js
@@ -113,7 +113,7 @@ function ensure_results(aSearch, aExpected)
       let value = controller.getValueAt(i);
       let comment = controller.getCommentAt(i);
 
-      print("Looking for " + value + ", " + comment + " in expected results...");
+      print("Looking for '" + value + "', '" + comment + "' in expected results...");
       let j;
       for (j = 0; j < aExpected.length; j++) {
         // Skip processed expected results
@@ -126,6 +126,7 @@ function ensure_results(aSearch, aExpected)
         title = kTitles[title];
         if (tags && appendTags)
           title += " \u2013 " + tags.map(function(aTag) kTitles[aTag]);
+        print("Checking against expected '" + uri + "', '" + title + "'...");
 
         // Got a match on both uri and title?
         if (uri == value && title == comment) {
@@ -138,10 +139,12 @@ function ensure_results(aSearch, aExpected)
 
       // We didn't hit the break, so we must have not found it
       if (j == aExpected.length)
-        do_throw("Didn't find the current result (" + value + ", " + comment + ") in expected: " + aExpected);
+        do_throw("Didn't find the current result ('" + value + "', '" + comment + "') in expected: " + aExpected);
     }
 
     // Make sure we have the right number of results
+    print("Expecting " + aExpected.length + " results; got " +
+          controller.matchCount + " results");
     do_check_eq(controller.matchCount, aExpected.length);
 
     // If we expect results, make sure we got matches
@@ -156,7 +159,7 @@ function ensure_results(aSearch, aExpected)
     do_test_finished();
   };
 
-  print("Searching for.. " + aSearch);
+  print("Searching for.. '" + aSearch + "'");
   controller.startSearch(aSearch);
 }
 
diff --git a/toolkit/components/places/tests/unit/test_000_frecency.js b/toolkit/components/places/tests/unit/test_000_frecency.js
index 984dcf4fd27..743532a45eb 100644
--- a/toolkit/components/places/tests/unit/test_000_frecency.js
+++ b/toolkit/components/places/tests/unit/test_000_frecency.js
@@ -241,8 +241,8 @@ AutoCompleteInput.prototype = {
 
 function run_test() {
   var controller = Components.classes["@mozilla.org/autocomplete/controller;1"].
-                   getService(Components.interfaces.nsIAutoCompleteController);  
-  
+                   getService(Components.interfaces.nsIAutoCompleteController);
+
   // Make an AutoCompleteInput that uses our searches
   // and confirms results on search complete
   var input = new AutoCompleteInput(["history"]);
@@ -264,7 +264,7 @@ function run_test() {
 
   input.onSearchComplete = function() {
     do_check_eq(numSearchesStarted, 1);
-    do_check_eq(controller.searchStatus, 
+    do_check_eq(controller.searchStatus,
                 Ci.nsIAutoCompleteController.STATUS_COMPLETE_MATCH);
 
     // test that all records with non-zero frecency were matched
@@ -283,7 +283,8 @@ function run_test() {
         // undefined), so check if frecency matches. This is okay because we
         // can still ensure the correct number of expected frecencies.
         let getFrecency = function(aURL) aURL.match(/frecency:(-?\d+)$/)[1];
-        print("### searchURL: '"+searchURL+"', expectedURL: '"+expectedURL+"'");
+        print("### checking for same frecency between '" + searchURL +
+              "' and '" + expectURL + "'");
         do_check_eq(getFrecency(searchURL), getFrecency(expectURL));
       }
     }

From 357681acb4f6edbc5833d2ccb56bc8d4a34bb124 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mak77@bonardo.net>
Date: Mon, 13 Jul 2009 12:19:16 -0700
Subject: [PATCH 016/175] Bug 503360 - Better queries for asynchronous location
 bar This creates a better query based on what the asynchronous implementation
 of AutoComplete does.  It also limits the amount of work to be done so we
 don't filter more results than we have to (even if it is happening on a
 background thread). r=sdwilsh

---
 .../places/src/nsPlacesAutoComplete.js        | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/toolkit/components/places/src/nsPlacesAutoComplete.js b/toolkit/components/places/src/nsPlacesAutoComplete.js
index 52c912cb6ba..f0ffebc86bf 100644
--- a/toolkit/components/places/src/nsPlacesAutoComplete.js
+++ b/toolkit/components/places/src/nsPlacesAutoComplete.js
@@ -105,11 +105,6 @@ const kQueryTypeFiltered = 1;
 // "comment" back into the title and the tag.
 const kTitleTagsSeparator = " \u2013 ";
 
-// The list of columns in the moz_places table that we use in our queries.
-const kMozPlacesColumns =
-  "id, url, title, rev_host, visit_count, hidden, typed, favicon_id, " +
-  "frecency, last_visit_date"
-
 const kBrowserUrlbarBranch = "browser.urlbar.";
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -214,23 +209,24 @@ function nsPlacesAutoComplete()
   // h.visit_count which is better than nothing.  This is slow, so not doing it
   // yet...
   // Note: h.frecency is only selected because we need it for ordering.
-  const SQL_BASE =
-    "SELECT h.url, h.title, f.url, " + kBookTagSQLFragment + ", h.visit_count, " +
-           "h.typed, h.id, :query_type " +
-    "FROM ( " +
-      "SELECT " + kMozPlacesColumns + " FROM moz_places_temp " +
-      "UNION ALL " +
-      "SELECT " + kMozPlacesColumns + " FROM moz_places " +
-      "WHERE +id NOT IN (SELECT id FROM moz_places_temp) " +
-      "ORDER BY frecency DESC " +
-    ") AS h " +
-    "LEFT OUTER JOIN moz_favicons f " +
-    "ON f.id = h.favicon_id " +
-    "WHERE h.frecency <> 0 " +
-    "AND AUTOCOMPLETE_MATCH(:searchString, h.url, IFNULL(bookmark, h.title), " +
-                           "tags, h.visit_count, h.typed, parent, " +
-                           ":matchBehavior, :searchBehavior) " +
-    "{ADDITIONAL_CONDITIONS}";
+  function sql_base_fragment(aTableName) {
+    return "SELECT h.url, h.title, f.url, " + kBookTagSQLFragment + ", " +
+                  "h.visit_count, h.typed, h.id, :query_type, h.frecency " +
+           "FROM " + aTableName + " h " +
+           "LEFT OUTER JOIN moz_favicons f ON f.id = h.favicon_id " +
+           "WHERE h.frecency <> 0 " +
+           "AND AUTOCOMPLETE_MATCH(:searchString, h.url, " +
+                                  "IFNULL(bookmark, h.title), tags, " +
+                                  "h.visit_count, h.typed, parent, " +
+                                  ":matchBehavior, :searchBehavior) " +
+          "{ADDITIONAL_CONDITIONS} ";
+  }
+  const SQL_BASE = sql_base_fragment("moz_places_temp") +
+                   "UNION ALL " +
+                   sql_base_fragment("moz_places") +
+                   "AND +h.id NOT IN (SELECT id FROM moz_places_temp) " +
+                   "ORDER BY h.frecency DESC " +
+                   "LIMIT :maxResults";
 
   //////////////////////////////////////////////////////////////////////////////
   //// Smart Getters
@@ -809,6 +805,10 @@ nsPlacesAutoComplete.prototype = {
       // We only want to search the tokens that we are left with - not the
       // original search string.
       params.searchString = aTokens.join(" ");
+
+      // Limit the query to the the maximum number of desired results.
+      // This way we can avoid doing more work than needed.
+      params.maxResults = this._maxRichResults;
     }
 
     return query;

From 970f437ddc81a1c3d0705f1367b2514abc4d85c8 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Tue, 14 Jul 2009 09:31:37 -0700
Subject: [PATCH 017/175] Addressing review comment for bug 455555.

---
 toolkit/components/places/src/nsPlacesAutoComplete.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/places/src/nsPlacesAutoComplete.js b/toolkit/components/places/src/nsPlacesAutoComplete.js
index f0ffebc86bf..568d31afe6a 100644
--- a/toolkit/components/places/src/nsPlacesAutoComplete.js
+++ b/toolkit/components/places/src/nsPlacesAutoComplete.js
@@ -989,8 +989,8 @@ nsPlacesAutoComplete.prototype = {
    */
   _hasBehavior: function PAC_hasBehavior(aType)
   {
-    let behavior = Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()];
-    return (this._behavior & behavior);
+    return (this._behavior &
+            Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()]);
   },
 
   /**
@@ -1001,8 +1001,8 @@ nsPlacesAutoComplete.prototype = {
    */
   _setBehavior: function PAC_setBehavior(aType)
   {
-    let behavior = Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()];
-    this._behavior |= behavior;
+    this._behavior |=
+      Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()];
   },
 
   /**

From bb7313647795559249fa025f81bf21b7fe2074f8 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 22 Jul 2009 11:47:29 -0700
Subject: [PATCH 018/175] Bug 504422 - Be smarter with our strings for
 AUTOCOMPLETE_MATCH SQL function. Avoid copying are argument strings.  String
 copying was showing up as 1% of the time spent in our function, when we
 should almost never need to copy. r=dwitte r=dietrich

---
 build/automationutils.py                      | 46 ----------------
 .../components/places/src/SQLFunctions.cpp    | 52 +++++++++++--------
 toolkit/components/places/src/SQLFunctions.h  |  6 ++-
 3 files changed, 33 insertions(+), 71 deletions(-)
 delete mode 100644 build/automationutils.py

diff --git a/build/automationutils.py b/build/automationutils.py
deleted file mode 100644
index a76a992f641..00000000000
--- a/build/automationutils.py
+++ /dev/null
@@ -1,46 +0,0 @@
-import sys, glob, os, subprocess, logging
-
-__all__ = [
-    "addCommonOptions",
-    "checkForCrashes",
-    ]
-
-log = logging.getLogger()
-
-def addCommonOptions(parser, defaults={}):
-    parser.add_option("--xre-path",
-                      action = "store", type = "string", dest = "xrePath",
-                      # individual scripts will set a sane default
-                      default = None,
-                      help = "absolute path to directory containing XRE (probably xulrunner)")
-    if 'SYMBOLS_PATH' not in defaults:
-        defaults['SYMBOLS_PATH'] = None
-    parser.add_option("--symbols-path",
-                      action = "store", type = "string", dest = "symbolsPath",
-                      default = defaults['SYMBOLS_PATH'],
-                      help = "absolute path to directory containing breakpad symbols")
-
-def checkForCrashes(dumpDir, symbolsPath, testName=None):
-  stackwalkPath = os.environ.get('MINIDUMP_STACKWALK', None)
-  # try to get the caller's filename if no test name is given
-  if testName is None:
-      try:
-          testName = os.path.basename(sys._getframe(1).f_code.co_filename)
-      except:
-          testName = "unknown"
-
-  foundCrash = False
-  dumps = glob.glob(os.path.join(dumpDir, '*.dmp'))
-  for d in dumps:
-    log.info("TEST-UNEXPECTED-FAIL | %s | application crashed (minidump found)", testName)
-    if symbolsPath and stackwalkPath:
-      nullfd = open(os.devnull, 'w')
-      # eat minidump_stackwalk errors
-      subprocess.call([stackwalkPath, d, symbolsPath], stderr=nullfd)
-      nullfd.close()
-    os.remove(d)
-    extra = os.path.splitext(d)[0] + ".extra"
-    if os.path.exists(extra):
-        os.remove(extra)
-    foundCrash = True
-  return foundCrash
diff --git a/toolkit/components/places/src/SQLFunctions.cpp b/toolkit/components/places/src/SQLFunctions.cpp
index 8ca9b7a8d9c..5aad78ef03b 100644
--- a/toolkit/components/places/src/SQLFunctions.cpp
+++ b/toolkit/components/places/src/SQLFunctions.cpp
@@ -71,29 +71,29 @@ namespace places {
   }
 
   /* static */
-  nsString
-  MatchAutoCompleteFunction::fixupURISpec(const nsDependentCString &aURISpec)
+  void
+  MatchAutoCompleteFunction::fixupURISpec(const nsDependentCString &aURISpec,
+                                          nsString &_fixedSpec)
   {
-    nsCAutoString unescapedSpec;
+    nsCString unescapedSpec;
     (void)NS_UnescapeURL(aURISpec, esc_SkipControl | esc_AlwaysCopy,
                          unescapedSpec);
 
     // If this unescaped string is valid UTF-8, we'll convert it.  Otherwise,
     // we will simply convert our original string.
-    nsString fixedSpec;
+    NS_ASSERTION(_fixedSpec.IsEmpty(),
+                 "Passing a non-empty string as an out parameter!");
     if (IsUTF8(unescapedSpec))
-      CopyUTF8toUTF16(unescapedSpec, fixedSpec);
+      CopyUTF8toUTF16(unescapedSpec, _fixedSpec);
     else
-      CopyUTF8toUTF16(aURISpec, fixedSpec);
+      CopyUTF8toUTF16(aURISpec, _fixedSpec);
 
-    if (StringBeginsWith(fixedSpec, NS_LITERAL_STRING("http://")))
-      fixedSpec.Cut(0, 7);
-    else if (StringBeginsWith(fixedSpec, NS_LITERAL_STRING("https://")))
-      fixedSpec.Cut(0, 8);
-    else if (StringBeginsWith(fixedSpec, NS_LITERAL_STRING("ftp://")))
-      fixedSpec.Cut(0, 6);
-
-    return fixedSpec;
+    if (StringBeginsWith(_fixedSpec, NS_LITERAL_STRING("http://")))
+      _fixedSpec.Cut(0, 7);
+    else if (StringBeginsWith(_fixedSpec, NS_LITERAL_STRING("https://")))
+      _fixedSpec.Cut(0, 8);
+    else if (StringBeginsWith(_fixedSpec, NS_LITERAL_STRING("ftp://")))
+      _fixedSpec.Cut(0, 6);
   }
 
   /* static */
@@ -214,10 +214,15 @@ namespace places {
     #define HAS_BEHAVIOR(aBitName) \
       (searchBehavior & mozIPlacesAutoComplete::BEHAVIOR_##aBitName)
 
-    nsDependentString searchString;
-    (void)aArguments->GetString(kArgSearchString, searchString);
-    nsDependentCString url;
-    (void)aArguments->GetUTF8String(kArgIndexURL, url);
+    // Temporaries used to get the strings.
+    const PRUnichar *wStr;
+    const char *str;
+    PRUint32 len;
+
+    (void)aArguments->GetSharedString(kArgSearchString, &len, &wStr);
+    nsDependentString searchString(wStr, len / sizeof(PRUnichar));
+    (void)aArguments->GetSharedUTF8String(kArgIndexURL, &len, &str);
+    nsDependentCString url(str, len);
 
     // We only want to filter javascript: URLs if we are not supposed to search
     // for them, and the search does not start with "javascript:".
@@ -232,8 +237,8 @@ namespace places {
     PRInt32 visitCount = aArguments->AsInt32(kArgIndexVisitCount);
     bool typed = aArguments->AsInt32(kArgIndexTyped) ? true : false;
     bool bookmark = aArguments->AsInt32(kArgIndexBookmark) ? true : false;
-    nsDependentString tags;
-    (void)aArguments->GetString(kArgIndexTags, tags);
+    (void)aArguments->GetSharedString(kArgIndexTags, &len, &wStr);
+    nsDependentString tags(wStr, len / sizeof(PRUnichar));
 
     // Make sure we match all the filter requirements.  If a given restriction
     // is active, make sure the corresponding condition is not true.
@@ -250,14 +255,15 @@ namespace places {
     }
 
     // Clean up our URI spec and prepare it for searching.
-    nsString fixedURI = fixupURISpec(url);
+    nsString fixedURI;
+    fixupURISpec(url, fixedURI);
 
     // Obtain our search function.
     PRInt32 matchBehavior = aArguments->AsInt32(kArgIndexMatchBehavior);
     searchFunctionPtr searchFunction = getSearchFunction(matchBehavior);
 
-    nsDependentString title;
-    (void)aArguments->GetString(kArgIndexTitle, title);
+    (void)aArguments->GetSharedString(kArgIndexTitle, &len, &wStr);
+    nsDependentString title(wStr, len / sizeof(PRUnichar));
 
     // Determine if every token matches either the bookmark title, tags, page
     // title, or page URL.
diff --git a/toolkit/components/places/src/SQLFunctions.h b/toolkit/components/places/src/SQLFunctions.h
index dc6e3f5d536..89074db17cb 100644
--- a/toolkit/components/places/src/SQLFunctions.h
+++ b/toolkit/components/places/src/SQLFunctions.h
@@ -197,9 +197,11 @@ private:
    *
    * @param aURISpec
    *        The spec of the URI to prepare for searching.
-   * @return the new string to use for the URI spec.
+   * @param _fixedSpec
+   *        An out parameter that is the fixed up string.
    */
-  static nsString fixupURISpec(const nsDependentCString &aURISpec);
+  static void fixupURISpec(const nsDependentCString &aURISpec,
+                           nsString &_fixedSpec);
 };
 
 } // namespace places

From 735095f74170a076ada7040fd38375527fd060a0 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 22 Jul 2009 12:24:54 -0700
Subject: [PATCH 019/175] Reverting accidental changes to
 build/automationutils.py from changeset 06433d3dafd9.

---
 build/automationutils.py | 46 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 build/automationutils.py

diff --git a/build/automationutils.py b/build/automationutils.py
new file mode 100644
index 00000000000..a76a992f641
--- /dev/null
+++ b/build/automationutils.py
@@ -0,0 +1,46 @@
+import sys, glob, os, subprocess, logging
+
+__all__ = [
+    "addCommonOptions",
+    "checkForCrashes",
+    ]
+
+log = logging.getLogger()
+
+def addCommonOptions(parser, defaults={}):
+    parser.add_option("--xre-path",
+                      action = "store", type = "string", dest = "xrePath",
+                      # individual scripts will set a sane default
+                      default = None,
+                      help = "absolute path to directory containing XRE (probably xulrunner)")
+    if 'SYMBOLS_PATH' not in defaults:
+        defaults['SYMBOLS_PATH'] = None
+    parser.add_option("--symbols-path",
+                      action = "store", type = "string", dest = "symbolsPath",
+                      default = defaults['SYMBOLS_PATH'],
+                      help = "absolute path to directory containing breakpad symbols")
+
+def checkForCrashes(dumpDir, symbolsPath, testName=None):
+  stackwalkPath = os.environ.get('MINIDUMP_STACKWALK', None)
+  # try to get the caller's filename if no test name is given
+  if testName is None:
+      try:
+          testName = os.path.basename(sys._getframe(1).f_code.co_filename)
+      except:
+          testName = "unknown"
+
+  foundCrash = False
+  dumps = glob.glob(os.path.join(dumpDir, '*.dmp'))
+  for d in dumps:
+    log.info("TEST-UNEXPECTED-FAIL | %s | application crashed (minidump found)", testName)
+    if symbolsPath and stackwalkPath:
+      nullfd = open(os.devnull, 'w')
+      # eat minidump_stackwalk errors
+      subprocess.call([stackwalkPath, d, symbolsPath], stderr=nullfd)
+      nullfd.close()
+    os.remove(d)
+    extra = os.path.splitext(d)[0] + ".extra"
+    if os.path.exists(extra):
+        os.remove(extra)
+    foundCrash = True
+  return foundCrash

From 51947037798372fb5630657376e767ab409d0647 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 22 Jul 2009 14:04:12 -0700
Subject: [PATCH 020/175] Backed out changeset 06433d3dafd9 (bug 504422)
 because the patch is wrong.

---
 build/automationutils.py                      | 46 ++++++++++++++++
 .../components/places/src/SQLFunctions.cpp    | 52 ++++++++-----------
 toolkit/components/places/src/SQLFunctions.h  |  6 +--
 3 files changed, 71 insertions(+), 33 deletions(-)
 create mode 100644 build/automationutils.py

diff --git a/build/automationutils.py b/build/automationutils.py
new file mode 100644
index 00000000000..a76a992f641
--- /dev/null
+++ b/build/automationutils.py
@@ -0,0 +1,46 @@
+import sys, glob, os, subprocess, logging
+
+__all__ = [
+    "addCommonOptions",
+    "checkForCrashes",
+    ]
+
+log = logging.getLogger()
+
+def addCommonOptions(parser, defaults={}):
+    parser.add_option("--xre-path",
+                      action = "store", type = "string", dest = "xrePath",
+                      # individual scripts will set a sane default
+                      default = None,
+                      help = "absolute path to directory containing XRE (probably xulrunner)")
+    if 'SYMBOLS_PATH' not in defaults:
+        defaults['SYMBOLS_PATH'] = None
+    parser.add_option("--symbols-path",
+                      action = "store", type = "string", dest = "symbolsPath",
+                      default = defaults['SYMBOLS_PATH'],
+                      help = "absolute path to directory containing breakpad symbols")
+
+def checkForCrashes(dumpDir, symbolsPath, testName=None):
+  stackwalkPath = os.environ.get('MINIDUMP_STACKWALK', None)
+  # try to get the caller's filename if no test name is given
+  if testName is None:
+      try:
+          testName = os.path.basename(sys._getframe(1).f_code.co_filename)
+      except:
+          testName = "unknown"
+
+  foundCrash = False
+  dumps = glob.glob(os.path.join(dumpDir, '*.dmp'))
+  for d in dumps:
+    log.info("TEST-UNEXPECTED-FAIL | %s | application crashed (minidump found)", testName)
+    if symbolsPath and stackwalkPath:
+      nullfd = open(os.devnull, 'w')
+      # eat minidump_stackwalk errors
+      subprocess.call([stackwalkPath, d, symbolsPath], stderr=nullfd)
+      nullfd.close()
+    os.remove(d)
+    extra = os.path.splitext(d)[0] + ".extra"
+    if os.path.exists(extra):
+        os.remove(extra)
+    foundCrash = True
+  return foundCrash
diff --git a/toolkit/components/places/src/SQLFunctions.cpp b/toolkit/components/places/src/SQLFunctions.cpp
index 5aad78ef03b..8ca9b7a8d9c 100644
--- a/toolkit/components/places/src/SQLFunctions.cpp
+++ b/toolkit/components/places/src/SQLFunctions.cpp
@@ -71,29 +71,29 @@ namespace places {
   }
 
   /* static */
-  void
-  MatchAutoCompleteFunction::fixupURISpec(const nsDependentCString &aURISpec,
-                                          nsString &_fixedSpec)
+  nsString
+  MatchAutoCompleteFunction::fixupURISpec(const nsDependentCString &aURISpec)
   {
-    nsCString unescapedSpec;
+    nsCAutoString unescapedSpec;
     (void)NS_UnescapeURL(aURISpec, esc_SkipControl | esc_AlwaysCopy,
                          unescapedSpec);
 
     // If this unescaped string is valid UTF-8, we'll convert it.  Otherwise,
     // we will simply convert our original string.
-    NS_ASSERTION(_fixedSpec.IsEmpty(),
-                 "Passing a non-empty string as an out parameter!");
+    nsString fixedSpec;
     if (IsUTF8(unescapedSpec))
-      CopyUTF8toUTF16(unescapedSpec, _fixedSpec);
+      CopyUTF8toUTF16(unescapedSpec, fixedSpec);
     else
-      CopyUTF8toUTF16(aURISpec, _fixedSpec);
+      CopyUTF8toUTF16(aURISpec, fixedSpec);
 
-    if (StringBeginsWith(_fixedSpec, NS_LITERAL_STRING("http://")))
-      _fixedSpec.Cut(0, 7);
-    else if (StringBeginsWith(_fixedSpec, NS_LITERAL_STRING("https://")))
-      _fixedSpec.Cut(0, 8);
-    else if (StringBeginsWith(_fixedSpec, NS_LITERAL_STRING("ftp://")))
-      _fixedSpec.Cut(0, 6);
+    if (StringBeginsWith(fixedSpec, NS_LITERAL_STRING("http://")))
+      fixedSpec.Cut(0, 7);
+    else if (StringBeginsWith(fixedSpec, NS_LITERAL_STRING("https://")))
+      fixedSpec.Cut(0, 8);
+    else if (StringBeginsWith(fixedSpec, NS_LITERAL_STRING("ftp://")))
+      fixedSpec.Cut(0, 6);
+
+    return fixedSpec;
   }
 
   /* static */
@@ -214,15 +214,10 @@ namespace places {
     #define HAS_BEHAVIOR(aBitName) \
       (searchBehavior & mozIPlacesAutoComplete::BEHAVIOR_##aBitName)
 
-    // Temporaries used to get the strings.
-    const PRUnichar *wStr;
-    const char *str;
-    PRUint32 len;
-
-    (void)aArguments->GetSharedString(kArgSearchString, &len, &wStr);
-    nsDependentString searchString(wStr, len / sizeof(PRUnichar));
-    (void)aArguments->GetSharedUTF8String(kArgIndexURL, &len, &str);
-    nsDependentCString url(str, len);
+    nsDependentString searchString;
+    (void)aArguments->GetString(kArgSearchString, searchString);
+    nsDependentCString url;
+    (void)aArguments->GetUTF8String(kArgIndexURL, url);
 
     // We only want to filter javascript: URLs if we are not supposed to search
     // for them, and the search does not start with "javascript:".
@@ -237,8 +232,8 @@ namespace places {
     PRInt32 visitCount = aArguments->AsInt32(kArgIndexVisitCount);
     bool typed = aArguments->AsInt32(kArgIndexTyped) ? true : false;
     bool bookmark = aArguments->AsInt32(kArgIndexBookmark) ? true : false;
-    (void)aArguments->GetSharedString(kArgIndexTags, &len, &wStr);
-    nsDependentString tags(wStr, len / sizeof(PRUnichar));
+    nsDependentString tags;
+    (void)aArguments->GetString(kArgIndexTags, tags);
 
     // Make sure we match all the filter requirements.  If a given restriction
     // is active, make sure the corresponding condition is not true.
@@ -255,15 +250,14 @@ namespace places {
     }
 
     // Clean up our URI spec and prepare it for searching.
-    nsString fixedURI;
-    fixupURISpec(url, fixedURI);
+    nsString fixedURI = fixupURISpec(url);
 
     // Obtain our search function.
     PRInt32 matchBehavior = aArguments->AsInt32(kArgIndexMatchBehavior);
     searchFunctionPtr searchFunction = getSearchFunction(matchBehavior);
 
-    (void)aArguments->GetSharedString(kArgIndexTitle, &len, &wStr);
-    nsDependentString title(wStr, len / sizeof(PRUnichar));
+    nsDependentString title;
+    (void)aArguments->GetString(kArgIndexTitle, title);
 
     // Determine if every token matches either the bookmark title, tags, page
     // title, or page URL.
diff --git a/toolkit/components/places/src/SQLFunctions.h b/toolkit/components/places/src/SQLFunctions.h
index 89074db17cb..dc6e3f5d536 100644
--- a/toolkit/components/places/src/SQLFunctions.h
+++ b/toolkit/components/places/src/SQLFunctions.h
@@ -197,11 +197,9 @@ private:
    *
    * @param aURISpec
    *        The spec of the URI to prepare for searching.
-   * @param _fixedSpec
-   *        An out parameter that is the fixed up string.
+   * @return the new string to use for the URI spec.
    */
-  static void fixupURISpec(const nsDependentCString &aURISpec,
-                           nsString &_fixedSpec);
+  static nsString fixupURISpec(const nsDependentCString &aURISpec);
 };
 
 } // namespace places

From c2684cc40dc95438b601c4f7a9d11ac897663760 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 22 Jul 2009 14:43:24 -0700
Subject: [PATCH 021/175] Bug 494826 - Compile SQLite with SQLITE_DEBUG defined
 Compile SQLite in debug mode in our debug builds.  We don't hit any
 assertions in tests currently, and if we ever do, we've just found a bug in
 SQLite. r=ted

---
 config/rules.mk            |  2 +-
 db/sqlite3/src/Makefile.in | 29 +++++++++++++++++++++++------
 db/sqlite3/src/sqlite.def  |  4 ++++
 js/src/config/rules.mk     |  2 +-
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index 62e61cca3a0..7c1bcfcf64f 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -337,7 +337,7 @@ endif # SHARED_LIBRARY_NAME
 endif # MOZ_MAPINFO
 
 ifdef DEFFILE
-OS_LDFLAGS += -DEF:$(DEFFILE)
+OS_LDFLAGS += -DEF:$(call normalizepath,$(DEFFILE))
 EXTRA_DEPS += $(DEFFILE)
 endif
 
diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in
index b40f74bc4ed..6ef8b3d82e6 100644
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -53,14 +53,25 @@ LIB_IS_C_ONLY    = 1
 
 ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
 ifndef GNU_CC
-DEFFILE = $(win_srcdir)/sqlite.def
+DEFFILE = $(CURDIR)/sqlite-processed.def
 RCFILE  = sqlite.rc
 RESFILE = sqlite.res
 
-GARBAGE += sqlite-version.h
+GARBAGE += \
+  sqlite-version.h \
+  $(DEFFILE) \
+  $(NULL)
 
+# We generate the appropriate version header file with our python script.
 sqlite-version.h: sqlite-version.py sqlite3.h
 	$(PYTHON) $^ > $@
+
+# We have to preprocess our def file because we need different symbols in debug
+# builds exposed that are not built in non-debug builds.
+$(DEFFILE): sqlite.def
+	@$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) \
+	  $(srcdir)/sqlite.def > $(DEFFILE)
+
 export:: sqlite-version.h
 endif
 endif
@@ -84,8 +95,8 @@ EXPORTS = \
   $(NULL)
 
 CSRCS = \
-	sqlite3.c \
-	$(NULL)
+  sqlite3.c \
+  $(NULL)
 
 # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
 # don't have to vacuum to make sure the data is not visible in the file.
@@ -103,6 +114,11 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 DEFINES += -DSQLITE_ENABLE_LOCKING_STYLE=1
 endif
 
+# Turn on SQLite's assertions in debug builds.
+ifdef MOZ_DEBUG
+DEFINES += -DSQLITE_DEBUG=1
+endif
+
 ifeq ($(OS_ARCH),OS2)
 ifdef MOZ_OS2_HIGH_MEMORY
 DEFINES += -DOS2_HIGH_MEMORY
@@ -115,6 +131,7 @@ include $(topsrcdir)/config/rules.mk
 LOCAL_INCLUDES += -I$(srcdir)
 
 ifeq ($(OS_ARCH),OS2)
-ADD_TO_DEF_FILE = sed -e '1,/^EXPORTS$$/ d' -e 's,sqlite3,_\0,' -e 's,\ DATA.*$$,,' \
-		$(srcdir)/sqlite.def >> $(DEF_FILE)
+ADD_TO_DEF_FILE = $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) \
+       $(srcdir)/sqlite.def | sed -e '1,/^EXPORTS$$/ d' -e 's,sqlite3,_\0,' \
+       -e 's,\ DATA.*$$,,' >> $(DEF_FILE)
 endif
diff --git a/db/sqlite3/src/sqlite.def b/db/sqlite3/src/sqlite.def
index 2e981e91c08..3aa5775b90d 100644
--- a/db/sqlite3/src/sqlite.def
+++ b/db/sqlite3/src/sqlite.def
@@ -175,3 +175,7 @@ EXPORTS
         sqlite3_vfs_unregister
         sqlite3_vfs_register
         sqlite3_vmprintf
+#ifdef SQLITE_DEBUG
+        sqlite3_mutex_held
+        sqlite3_mutex_notheld
+#endif
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 62e61cca3a0..7c1bcfcf64f 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -337,7 +337,7 @@ endif # SHARED_LIBRARY_NAME
 endif # MOZ_MAPINFO
 
 ifdef DEFFILE
-OS_LDFLAGS += -DEF:$(DEFFILE)
+OS_LDFLAGS += -DEF:$(call normalizepath,$(DEFFILE))
 EXTRA_DEPS += $(DEFFILE)
 endif
 

From 84784904c4234e7891589c905ec80cc95cdb9408 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 22 Jul 2009 15:18:33 -0700
Subject: [PATCH 022/175] Bug 494828 - Stop using our own mutexes and use
 SQLite's where possible. Part 1: Create helper objects to make using
 sqlite3_mutex safer and easier. r=cjones

--HG--
rename : xpcom/tests/TestDeadlockDetector.cpp => storage/test/test_deadlock_detector.cpp
---
 storage/src/SQLiteMutex.h               | 207 ++++++++
 storage/test/Makefile.in                |  18 +
 storage/test/test_deadlock_detector.cpp | 633 ++++++++++++++++++++++++
 storage/test/test_mutex.cpp             | 117 +++++
 xpcom/tests/TestDeadlockDetector.cpp    |   4 +-
 5 files changed, 977 insertions(+), 2 deletions(-)
 create mode 100644 storage/src/SQLiteMutex.h
 create mode 100644 storage/test/test_deadlock_detector.cpp
 create mode 100644 storage/test/test_mutex.cpp

diff --git a/storage/src/SQLiteMutex.h b/storage/src/SQLiteMutex.h
new file mode 100644
index 00000000000..def841079d1
--- /dev/null
+++ b/storage/src/SQLiteMutex.h
@@ -0,0 +1,207 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Shawn Wilsher <me@shawnwilsher.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef mozilla_storage_SQLiteMutex_h_
+#define mozilla_storage_SQLiteMutex_h_
+
+#include "mozilla/BlockingResourceBase.h"
+#include "sqlite3.h"
+
+namespace mozilla {
+namespace storage {
+
+/**
+ * Wrapper class for sqlite3_mutexes.  To be used whenever we want to use a
+ * sqlite3_mutex.
+ *
+ * @warning Never EVER wrap the same sqlite3_mutex with a different SQLiteMutex.
+ *          If you do this, you void the deadlock detector's warranty!
+ */
+class SQLiteMutex : private BlockingResourceBase
+{
+public:
+  /**
+   * Constructs a wrapper for a sqlite3_mutex that has deadlock detecting.
+   *
+   * @param aName
+   *        A name which can be used to reference this mutex.
+   */
+  SQLiteMutex(const char *aName)
+  : BlockingResourceBase(aName, eMutex)
+  , mMutex(NULL)
+  {
+  }
+
+  /**
+   * Sets the mutex that we are wrapping.  We generally do not have access to
+   * our mutex at class construction, so we have to set it once we get access to
+   * it.
+   *
+   * @param aMutex
+   *        The sqlite3_mutex that we are going to wrap.
+   */
+  void initWithMutex(sqlite3_mutex *aMutex)
+  {
+    NS_ASSERTION(aMutex, "You must pass in a valid mutex!");
+    NS_ASSERTION(!mMutex, "A mutex has already been set for this!");
+    mMutex = aMutex;
+  }
+
+#ifndef DEBUG
+  /**
+   * Acquires the mutex.
+   */
+  void lock()
+  {
+    sqlite3_mutex_enter(mMutex);
+  }
+
+  /**
+   * Releases the mutex.
+   */
+  void unlock()
+  {
+    sqlite3_mutex_leave(mMutex);
+  }
+
+  /**
+   * Asserts that the current thread owns the mutex.
+   */
+  void assertCurrentThreadOwns()
+  {
+  }
+
+  /**
+   * Asserts that the current thread does not own the mutex.
+   */
+  void assertNotCurrentThreadOwns()
+  {
+  }
+
+#else
+  void lock()
+  {
+    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
+
+    // While SQLite Mutexes may be recursive, in our own code we do not want to
+    // treat them as such.
+    CallStack callContext = CallStack();
+
+    CheckAcquire(callContext);
+    sqlite3_mutex_enter(mMutex);
+    Acquire(callContext); // Call is protected by us holding the mutex.
+  }
+
+  void unlock()
+  {
+    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
+
+    // While SQLite Mutexes may be recursive, in our own code we do not want to
+    // treat them as such.
+    Release(); // Call is protected by us holding the mutex.
+    sqlite3_mutex_leave(mMutex);
+  }
+
+  void assertCurrentThreadOwns()
+  {
+    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
+    NS_ASSERTION(sqlite3_mutex_held(mMutex),
+                 "Mutex is not held, but we expect it to be!");
+  }
+
+  void assertNotCurrentThreadOwns()
+  {
+    NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
+    NS_ASSERTION(sqlite3_mutex_notheld(mMutex),
+                 "Mutex is held, but we expect it to not be!");
+  }
+#endif // ifndef DEBUG
+
+private:
+  sqlite3_mutex *mMutex;
+};
+
+/**
+ * Automatically acquires the mutex when it enters scope, and releases it when
+ * it leaves scope.
+ */
+class NS_STACK_CLASS SQLiteMutexAutoLock
+{
+public:
+  SQLiteMutexAutoLock(SQLiteMutex &aMutex)
+  : mMutex(aMutex)
+  {
+    mMutex.lock();
+  }
+
+  ~SQLiteMutexAutoLock()
+  {
+    mMutex.unlock();
+  }
+
+private:
+  SQLiteMutex &mMutex;
+};
+
+/**
+ * Automatically releases the mutex when it enters scope, and acquires it when
+ * it leaves scope.
+ */
+class NS_STACK_CLASS SQLiteMutexAutoUnlock
+{
+public:
+  SQLiteMutexAutoUnlock(SQLiteMutex &aMutex)
+  : mMutex(aMutex)
+  {
+    mMutex.unlock();
+  }
+
+  ~SQLiteMutexAutoUnlock()
+  {
+    mMutex.lock();
+  }
+
+private:
+  SQLiteMutex &mMutex;
+};
+
+} // namespace storage
+} // namespace mozilla
+
+#endif // mozilla_storage_SQLiteMutex_h_
diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in
index 2b57865ed66..8924532a3a9 100644
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@@ -51,18 +51,36 @@ XPCSHELL_TESTS = unit
 CPP_UNIT_TESTS = \
   test_transaction_helper.cpp \
   test_statement_scoper.cpp \
+  test_mutex.cpp \
   $(NULL)
 
+ifdef MOZ_DEBUG
+# Testing assertion failures is fragile, and test_deadlock_detector doesn't like
+# windows.
+ifneq ($(OS_ARCH), WINNT)
+ifneq ($(OS_ARCH), WINCE)
+CPP_UNIT_TESTS += \
+  test_deadlock_detector.cpp \
+  $(NULL)
+endif
+endif
+endif
+
 REQUIRES = \
 	xpcom \
 	string \
 	storage \
 	$(NULL)
 
+LOCAL_INCLUDES = \
+  -I$(srcdir)/../src \
+  $(NULL)
+
 LIBS = \
 	$(LIBS_DIR) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
+	$(SQLITE_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/storage/test/test_deadlock_detector.cpp b/storage/test/test_deadlock_detector.cpp
new file mode 100644
index 00000000000..c4bab718e76
--- /dev/null
+++ b/storage/test/test_deadlock_detector.cpp
@@ -0,0 +1,633 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: sw=4 ts=4 et :
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Chris Jones <jones.chris.g@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Note: This file is a copy of xpcom/tests/TestDeadlockDetector.cpp, but all
+ *       mutexes were turned into SQLiteMutexes.
+ */
+
+#include "prenv.h"
+#include "prerror.h"
+#include "prio.h"
+#include "prproces.h"
+
+#include "nsMemory.h"
+
+#include "mozilla/CondVar.h"
+#include "mozilla/Monitor.h"
+#include "SQLiteMutex.h"
+
+#include "TestHarness.h"
+
+using namespace mozilla;
+
+/**
+ * Helper class to allocate a sqlite3_mutex for our SQLiteMutex.  Also makes
+ * keeping the test files in sync easier.
+ */
+class TestMutex : public mozilla::storage::SQLiteMutex
+{
+public:
+    TestMutex(const char* aName)
+    : mozilla::storage::SQLiteMutex(aName)
+    , mInner(sqlite3_mutex_alloc(SQLITE_MUTEX_FAST))
+    {
+        NS_ASSERTION(mInner, "could not allocate a sqlite3_mutex");
+        initWithMutex(mInner);
+    }
+
+    ~TestMutex()
+    {
+        sqlite3_mutex_free(mInner);
+    }
+
+    void Lock()
+    {
+        lock();
+    }
+
+    void Unlock()
+    {
+        unlock();
+    }
+private:
+  sqlite3_mutex *mInner;
+};
+
+static PRThread*
+spawn(void (*run)(void*), void* arg)
+{
+    return PR_CreateThread(PR_SYSTEM_THREAD,
+                           run,
+                           arg,
+                           PR_PRIORITY_NORMAL,
+                           PR_GLOBAL_THREAD,
+                           PR_JOINABLE_THREAD,
+                           0);
+}
+
+#define PASS()                                  \
+    do {                                        \
+        passed(__FUNCTION__);                   \
+        return NS_OK;                           \
+    } while (0);
+
+
+#define FAIL(why)                               \
+    do {                                        \
+        fail(why);                              \
+        return NS_ERROR_FAILURE;                \
+    } while (0);
+
+//-----------------------------------------------------------------------------
+
+static const char* sPathToThisBinary;
+static const char* sAssertBehaviorEnv = "XPCOM_DEBUG_BREAK=abort";
+
+class Subprocess
+{
+public:
+    // not available until process finishes
+    PRInt32 mExitCode;
+    nsCString mStdout;
+    nsCString mStderr;
+
+    Subprocess(const char* aTestName) {
+        // set up stdio redirection
+        PRFileDesc* readStdin;  PRFileDesc* writeStdin;
+        PRFileDesc* readStdout; PRFileDesc* writeStdout;
+        PRFileDesc* readStderr; PRFileDesc* writeStderr;
+        PRProcessAttr* pattr = PR_NewProcessAttr();
+
+        NS_ASSERTION(pattr, "couldn't allocate process attrs");
+
+        NS_ASSERTION(PR_SUCCESS == PR_CreatePipe(&readStdin, &writeStdin),
+                     "couldn't create child stdin pipe");
+        NS_ASSERTION(PR_SUCCESS == PR_SetFDInheritable(readStdin, PR_TRUE),
+                     "couldn't set child stdin inheritable");
+        PR_ProcessAttrSetStdioRedirect(pattr, PR_StandardInput, readStdin);
+
+        NS_ASSERTION(PR_SUCCESS == PR_CreatePipe(&readStdout, &writeStdout),
+                     "couldn't create child stdout pipe");
+        NS_ASSERTION(PR_SUCCESS == PR_SetFDInheritable(writeStdout, PR_TRUE),
+                     "couldn't set child stdout inheritable");
+        PR_ProcessAttrSetStdioRedirect(pattr, PR_StandardOutput, writeStdout);
+
+        NS_ASSERTION(PR_SUCCESS == PR_CreatePipe(&readStderr, &writeStderr),
+                     "couldn't create child stderr pipe");
+        NS_ASSERTION(PR_SUCCESS == PR_SetFDInheritable(writeStderr, PR_TRUE),
+                     "couldn't set child stderr inheritable");
+        PR_ProcessAttrSetStdioRedirect(pattr, PR_StandardError, writeStderr);
+
+        // set up argv with test name to run
+        char* const newArgv[3] = {
+            strdup(sPathToThisBinary),
+            strdup(aTestName),
+            0
+        };
+
+        // make sure the child will abort if an assertion fails
+        NS_ASSERTION(PR_SUCCESS == PR_SetEnv(sAssertBehaviorEnv),
+                     "couldn't set XPCOM_DEBUG_BREAK env var");
+
+        PRProcess* proc;
+        NS_ASSERTION(proc = PR_CreateProcess(sPathToThisBinary,
+                                             newArgv,
+                                             0, // inherit environment
+                                             pattr),
+                     "couldn't create process");
+        PR_Close(readStdin);
+        PR_Close(writeStdout);
+        PR_Close(writeStderr);
+
+        mProc = proc;
+        mStdinfd = writeStdin;
+        mStdoutfd = readStdout;
+        mStderrfd = readStderr;
+
+        free(newArgv[0]);
+        free(newArgv[1]);
+        PR_DestroyProcessAttr(pattr);
+    }
+
+    void RunToCompletion(PRUint32 aWaitMs)
+    {
+        PR_Close(mStdinfd);
+
+        PRPollDesc pollfds[2];
+        PRInt32 nfds;
+        PRBool stdoutOpen = PR_TRUE, stderrOpen = PR_TRUE;
+        char buf[4096];
+        PRInt32 len;
+
+        PRIntervalTime now = PR_IntervalNow();
+        PRIntervalTime deadline = now + PR_MillisecondsToInterval(aWaitMs);
+
+        while ((stdoutOpen || stderrOpen) && now < deadline) {
+            nfds = 0;
+            if (stdoutOpen) {
+                pollfds[nfds].fd = mStdoutfd;
+                pollfds[nfds].in_flags = PR_POLL_READ;
+                pollfds[nfds].out_flags = 0;
+                ++nfds;
+            }
+            if (stderrOpen) {
+                pollfds[nfds].fd = mStderrfd;
+                pollfds[nfds].in_flags = PR_POLL_READ;
+                pollfds[nfds].out_flags = 0;
+                ++nfds;
+            }
+
+            PRInt32 rv = PR_Poll(pollfds, nfds, deadline - now);
+            NS_ASSERTION(0 <= rv, PR_ErrorToName(PR_GetError()));
+
+            if (0 == rv) {      // timeout
+                Finish(PR_FALSE); // abnormal
+                return;
+            }
+
+            for (PRInt32 i = 0; i < nfds; ++i) {
+                if (!pollfds[i].out_flags)
+                    continue;
+
+                PRBool isStdout = mStdoutfd == pollfds[i].fd;
+                
+                if (PR_POLL_READ & pollfds[i].out_flags) {
+                    len = PR_Read(pollfds[i].fd, buf, sizeof(buf) - 1);
+                    NS_ASSERTION(0 <= len, PR_ErrorToName(PR_GetError()));
+                }
+                else if (PR_POLL_HUP & pollfds[i].out_flags) {
+                    len = 0;
+                }
+                else {
+                    NS_ERROR(PR_ErrorToName(PR_GetError()));
+                }
+
+                if (0 < len) {
+                    buf[len] = '\0';
+                    if (isStdout)
+                        mStdout += buf;
+                    else
+                        mStderr += buf;
+                }
+                else {
+                    if (isStdout) {
+                        stdoutOpen = PR_FALSE;
+                        PR_Close(mStdoutfd);
+                    }
+                    else {
+                        stderrOpen = PR_FALSE;
+                        PR_Close(mStderrfd);
+                    }
+                }
+            }
+
+            now = PR_IntervalNow();
+        }
+
+        Finish(!stdoutOpen && !stderrOpen && now <= deadline);
+    }
+
+private:
+    void Finish(PRBool normalExit) {
+        if (!normalExit) {
+            PR_KillProcess(mProc);
+            PR_Close(mStdoutfd);
+            PR_Close(mStderrfd);
+            mExitCode = -1;
+            PRInt32 dummy;
+            PR_WaitProcess(mProc, &dummy);
+        }
+        else {
+            PR_WaitProcess(mProc, &mExitCode); // this had better not block ...
+        }
+    }
+
+    PRProcess* mProc;
+    PRFileDesc* mStdinfd;         // writeable
+    PRFileDesc* mStdoutfd;        // readable
+    PRFileDesc* mStderrfd;        // readable
+};
+
+//-----------------------------------------------------------------------------
+// Harness for checking detector errors
+bool
+CheckForDeadlock(const char* test, const char* const* findTokens)
+{
+    Subprocess proc(test);
+    proc.RunToCompletion(1000);
+
+    if (0 == proc.mExitCode)
+        return false;
+
+    PRInt32 idx = 0;
+    for (const char* const* tp = findTokens; *tp; ++tp) {
+        const char* const token = *tp;
+#ifdef MOZILLA_INTERNAL_API
+        idx = proc.mStderr.Find(token, PR_FALSE, idx);
+#else
+        nsCString tokenCString(token);
+        idx = proc.mStderr.Find(tokenCString, idx);
+#endif
+        if (-1 == idx) {
+            printf("(missed token '%s' in output)\n", token);
+            puts("----------------------------------\n");
+            puts(proc.mStderr.get());
+            puts("----------------------------------\n");
+            return false;
+        }
+        idx += strlen(token);
+    }
+
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+// Single-threaded sanity tests
+
+// Stupidest possible deadlock.
+nsresult
+Sanity_Child()
+{
+    TestMutex m1("dd.sanity.m1");
+    m1.Lock();
+    m1.Lock();
+    return 0;                  // not reached
+}
+
+nsresult
+Sanity()
+{
+    const char* const tokens[] = {
+        "###!!! ERROR: Potential deadlock detected",
+        "=== Cyclical dependency starts at\n--- Mutex : dd.sanity.m1",
+        "=== Cycle completed at\n--- Mutex : dd.sanity.m1",
+        "###!!! Deadlock may happen NOW!", // better catch these easy cases...
+        "###!!! ASSERTION: Potential deadlock detected",
+        0
+    };
+    if (CheckForDeadlock("Sanity", tokens)) {
+        PASS();
+    } else {
+        FAIL("deadlock not detected");
+    }
+}
+
+// Slightly less stupid deadlock.
+nsresult
+Sanity2_Child()
+{
+    TestMutex m1("dd.sanity2.m1");
+    TestMutex m2("dd.sanity2.m2");
+    m1.Lock();
+    m2.Lock();
+    m1.Lock();
+    return 0;                  // not reached
+}
+
+nsresult
+Sanity2()
+{
+    const char* const tokens[] = {
+        "###!!! ERROR: Potential deadlock detected",
+        "=== Cyclical dependency starts at\n--- Mutex : dd.sanity2.m1",
+        "--- Next dependency:\n--- Mutex : dd.sanity2.m2",
+        "=== Cycle completed at\n--- Mutex : dd.sanity2.m1",
+        "###!!! Deadlock may happen NOW!", // better catch these easy cases...
+        "###!!! ASSERTION: Potential deadlock detected",
+        0
+    };
+    if (CheckForDeadlock("Sanity2", tokens)) {
+        PASS();
+    } else {
+        FAIL("deadlock not detected");
+    }
+}
+
+
+nsresult
+Sanity3_Child()
+{
+    TestMutex m1("dd.sanity3.m1");
+    TestMutex m2("dd.sanity3.m2");
+    TestMutex m3("dd.sanity3.m3");
+    TestMutex m4("dd.sanity3.m4");
+
+    m1.Lock();
+    m2.Lock();
+    m3.Lock();
+    m4.Lock();
+    m4.Unlock();
+    m3.Unlock();
+    m2.Unlock();
+    m1.Unlock();
+
+    m4.Lock();
+    m1.Lock();
+    return 0;
+}
+
+nsresult
+Sanity3()
+{
+    const char* const tokens[] = {
+        "###!!! ERROR: Potential deadlock detected",
+        "=== Cyclical dependency starts at\n--- Mutex : dd.sanity3.m1",
+        "--- Next dependency:\n--- Mutex : dd.sanity3.m2",
+        "--- Next dependency:\n--- Mutex : dd.sanity3.m3",
+        "--- Next dependency:\n--- Mutex : dd.sanity3.m4",
+        "=== Cycle completed at\n--- Mutex : dd.sanity3.m1",
+        "###!!! ASSERTION: Potential deadlock detected",
+        0
+    };
+    if (CheckForDeadlock("Sanity3", tokens)) {
+        PASS();
+    } else {
+        FAIL("deadlock not detected");
+    }
+}
+
+
+nsresult
+Sanity4_Child()
+{
+    mozilla::Monitor m1("dd.sanity4.m1");
+    TestMutex m2("dd.sanity4.m2");
+    m1.Enter();
+    m2.Lock();
+    m1.Enter();
+    return 0;
+}
+
+nsresult
+Sanity4()
+{
+    const char* const tokens[] = {
+        "Re-entering Monitor after acquiring other resources",
+        "###!!! ERROR: Potential deadlock detected",
+        "=== Cyclical dependency starts at\n--- Monitor : dd.sanity4.m1",
+        "--- Next dependency:\n--- Mutex : dd.sanity4.m2",
+        "=== Cycle completed at\n--- Monitor : dd.sanity4.m1",
+        "###!!! ASSERTION: Potential deadlock detected",
+        0
+    };
+    if (CheckForDeadlock("Sanity4", tokens)) {
+        PASS();
+    } else {
+        FAIL("deadlock not detected");
+    }
+}
+
+//-----------------------------------------------------------------------------
+// Multithreaded tests
+
+TestMutex* ttM1;
+TestMutex* ttM2;
+
+static void
+TwoThreads_thread(void* arg)
+{
+    PRInt32 m1First = NS_PTR_TO_INT32(arg);
+    if (m1First) {
+        ttM1->Lock();
+        ttM2->Lock();
+        ttM2->Unlock();
+        ttM1->Unlock();
+    }
+    else {
+        ttM2->Lock();
+        ttM1->Lock();
+        ttM1->Unlock();
+        ttM2->Unlock();
+    }
+}
+
+nsresult
+TwoThreads_Child()
+{
+    ttM1 = new TestMutex("dd.twothreads.m1");
+    ttM2 = new TestMutex("dd.twothreads.m2");
+    if (!ttM1 || !ttM2)
+        NS_RUNTIMEABORT("couldn't allocate mutexes");
+
+    PRThread* t1 = spawn(TwoThreads_thread, (void*) 0);
+    PR_JoinThread(t1);
+
+    PRThread* t2 = spawn(TwoThreads_thread, (void*) 1);
+    PR_JoinThread(t2);
+
+    return 0;
+}
+
+nsresult
+TwoThreads()
+{
+    const char* const tokens[] = {
+        "###!!! ERROR: Potential deadlock detected",
+        "=== Cyclical dependency starts at\n--- Mutex : dd.twothreads.m2",
+        "--- Next dependency:\n--- Mutex : dd.twothreads.m1",
+        "=== Cycle completed at\n--- Mutex : dd.twothreads.m2",
+        "###!!! ASSERTION: Potential deadlock detected",
+        0
+    };
+
+    if (CheckForDeadlock("TwoThreads", tokens)) {
+        PASS();
+    } else {
+        FAIL("deadlock not detected");
+    }
+}
+
+
+TestMutex* cndMs[4];
+const PRUint32 K = 100000;
+
+static void
+ContentionNoDeadlock_thread(void* arg)
+{
+    PRInt32 starti = NS_PTR_TO_INT32(arg);
+
+    for (PRUint32 k = 0; k < K; ++k) {
+        for (PRInt32 i = starti; i < (PRInt32) NS_ARRAY_LENGTH(cndMs); ++i)
+            cndMs[i]->Lock();
+        // comment out the next two lines for deadlocking fun!
+        for (PRInt32 i = NS_ARRAY_LENGTH(cndMs) - 1; i >= starti; --i)
+            cndMs[i]->Unlock();
+
+        starti = (starti + 1) % 3;
+    }
+}
+
+nsresult
+ContentionNoDeadlock_Child()
+{
+    PRThread* threads[3];
+
+    for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(cndMs); ++i)
+        cndMs[i] = new TestMutex("dd.cnd.ms");
+
+    for (PRInt32 i = 0; i < (PRInt32) NS_ARRAY_LENGTH(threads); ++i)
+        threads[i] = spawn(ContentionNoDeadlock_thread, NS_INT32_TO_PTR(i));
+
+    for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(threads); ++i)
+        PR_JoinThread(threads[i]);
+
+    for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(cndMs); ++i)
+        delete cndMs[i];
+
+    return 0;
+}
+
+nsresult
+ContentionNoDeadlock()
+{
+    const char * func = __func__;
+    Subprocess proc(func);
+    proc.RunToCompletion(10000);
+    if (0 != proc.mExitCode) {
+        printf("(expected 0 == return code, got %d)\n", proc.mExitCode);
+        puts("(output)\n----------------------------------\n");
+        puts(proc.mStdout.get());
+        puts("----------------------------------\n");
+        puts("(error output)\n----------------------------------\n");
+        puts(proc.mStderr.get());
+        puts("----------------------------------\n");
+
+        FAIL("deadlock");
+    }
+    PASS();
+}
+
+
+
+//-----------------------------------------------------------------------------
+
+int
+main(int argc, char** argv)
+{
+    if (1 < argc) {
+        // XXX can we run w/o scoped XPCOM?
+        const char* test = argv[1];
+        ScopedXPCOM xpcom(test);
+        if (xpcom.failed())
+            return 1;
+
+        // running in a spawned process.  call the specificed child function.
+        if (!strcmp("Sanity", test))
+            return Sanity_Child();
+        if (!strcmp("Sanity2", test))
+            return Sanity2_Child();
+        if (!strcmp("Sanity3", test))
+            return Sanity3_Child();
+        if (!strcmp("Sanity4", test))
+            return Sanity4_Child();
+
+        if (!strcmp("TwoThreads", test))
+            return TwoThreads_Child();
+        if (!strcmp("ContentionNoDeadlock", test))
+            return ContentionNoDeadlock_Child();
+
+        FAIL("unknown child test");
+    }
+
+    ScopedXPCOM xpcom("Deadlock detector correctness");
+    if (xpcom.failed())
+        return 1;
+
+    // in the first invocation of this process.  we will be the "driver".
+    int rv = 0;
+
+    sPathToThisBinary = argv[0];
+
+    if (NS_FAILED(Sanity()))
+        rv = 1;
+    if (NS_FAILED(Sanity2()))
+        rv = 1;
+    if (NS_FAILED(Sanity3()))
+        rv = 1;
+    if (NS_FAILED(Sanity4()))
+        rv = 1;
+
+    if (NS_FAILED(TwoThreads()))
+        rv = 1;
+    if (NS_FAILED(ContentionNoDeadlock()))
+        rv = 1;
+
+    return rv;
+}
diff --git a/storage/test/test_mutex.cpp b/storage/test/test_mutex.cpp
new file mode 100644
index 00000000000..dfd20f1ea43
--- /dev/null
+++ b/storage/test/test_mutex.cpp
@@ -0,0 +1,117 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is storage test code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Shawn Wilsher <me@shawnwilsher.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "storage_test_harness.h"
+
+#include "SQLiteMutex.h"
+
+using namespace mozilla::storage;
+
+/**
+ * This file test our sqlite3_mutex wrapper in SQLiteMutex.h.
+ */
+
+void
+test_AutoLock()
+{
+  int lockTypes[] = {
+    SQLITE_MUTEX_FAST,
+    SQLITE_MUTEX_RECURSIVE,
+  };
+  for (size_t i = 0; i < NS_ARRAY_LENGTH(lockTypes); i++) {
+    // Get our test mutex (we have to allocate a SQLite mutex of the right type
+    // too!).
+    SQLiteMutex mutex("TestMutex");
+    sqlite3_mutex *inner = sqlite3_mutex_alloc(lockTypes[i]);
+    do_check_true(inner);
+    mutex.initWithMutex(inner);
+
+    // And test that our automatic locking wrapper works as expected.
+    mutex.assertNotCurrentThreadOwns();
+    {
+      SQLiteMutexAutoLock lockedScope(mutex);
+      mutex.assertCurrentThreadOwns();
+    }
+    mutex.assertNotCurrentThreadOwns();
+
+    // Free the wrapped mutex - we don't need it anymore.
+    sqlite3_mutex_free(inner);
+  }
+}
+
+void
+test_AutoUnlock()
+{
+  int lockTypes[] = {
+    SQLITE_MUTEX_FAST,
+    SQLITE_MUTEX_RECURSIVE,
+  };
+  for (size_t i = 0; i < NS_ARRAY_LENGTH(lockTypes); i++) {
+    // Get our test mutex (we have to allocate a SQLite mutex of the right type
+    // too!).
+    SQLiteMutex mutex("TestMutex");
+    sqlite3_mutex *inner = sqlite3_mutex_alloc(lockTypes[i]);
+    do_check_true(inner);
+    mutex.initWithMutex(inner);
+
+    // And test that our automatic unlocking wrapper works as expected.
+    {
+      SQLiteMutexAutoLock lockedScope(mutex);
+
+      {
+        SQLiteMutexAutoUnlock unlockedScope(mutex);
+        mutex.assertNotCurrentThreadOwns();
+      }
+      mutex.assertCurrentThreadOwns();
+    }
+
+    // Free the wrapped mutex - we don't need it anymore.
+    sqlite3_mutex_free(inner);
+  }
+}
+
+void (*gTests[])(void) = {
+  test_AutoLock,
+  test_AutoUnlock,
+};
+
+const char *file = __FILE__;
+#define TEST_NAME "SQLiteMutex"
+#define TEST_FILE file
+#include "storage_test_harness_tail.h"
diff --git a/xpcom/tests/TestDeadlockDetector.cpp b/xpcom/tests/TestDeadlockDetector.cpp
index 4d7f0b0d67a..5dca5a0ae82 100644
--- a/xpcom/tests/TestDeadlockDetector.cpp
+++ b/xpcom/tests/TestDeadlockDetector.cpp
@@ -16,8 +16,8 @@
  * The Original Code is mozilla.org code.
  *
  * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):

From bc4dacbd7547998ad2e98739645906993178b25b Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 22 Jul 2009 15:18:33 -0700
Subject: [PATCH 023/175] Bug 494828 - Stop using our own mutexes and use
 SQLite's where possible. Part 2: Use the helper object in a few places where
 we had our own mutexes. r=asuth

---
 db/sqlite3/src/sqlite.def            |  1 +
 storage/src/mozStorageConnection.cpp | 41 ++++++++++------------------
 storage/src/mozStorageConnection.h   | 21 ++++++++++++--
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/db/sqlite3/src/sqlite.def b/db/sqlite3/src/sqlite.def
index 3aa5775b90d..bcaf4ed374c 100644
--- a/db/sqlite3/src/sqlite.def
+++ b/db/sqlite3/src/sqlite.def
@@ -83,6 +83,7 @@ EXPORTS
         sqlite3_create_module
         sqlite3_data_count
         sqlite3_db_handle
+        sqlite3_db_mutex
         sqlite3_declare_vtab
         sqlite3_enable_load_extension
         sqlite3_enable_shared_cache
diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp
index 29c3e23d055..349bcc81085 100644
--- a/storage/src/mozStorageConnection.cpp
+++ b/storage/src/mozStorageConnection.cpp
@@ -249,10 +249,8 @@ Connection::Connection(Service *aService)
 , mDBConn(nsnull)
 , mAsyncExecutionMutex(nsAutoLock::NewLock("AsyncExecutionMutex"))
 , mAsyncExecutionThreadShuttingDown(PR_FALSE)
-, mTransactionMutex(nsAutoLock::NewLock("TransactionMutex"))
+, mDBMutex("Connection::mDBMutex")
 , mTransactionInProgress(PR_FALSE)
-, mFunctionsMutex(nsAutoLock::NewLock("FunctionsMutex"))
-, mProgressHandlerMutex(nsAutoLock::NewLock("ProgressHandlerMutex"))
 , mProgressHandler(nsnull)
 , mStorageService(aService)
 {
@@ -263,9 +261,6 @@ Connection::~Connection()
 {
   (void)Close();
   nsAutoLock::DestroyLock(mAsyncExecutionMutex);
-  nsAutoLock::DestroyLock(mTransactionMutex);
-  nsAutoLock::DestroyLock(mFunctionsMutex);
-  nsAutoLock::DestroyLock(mProgressHandlerMutex);
 }
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(
@@ -301,9 +296,6 @@ Connection::initialize(nsIFile *aDatabaseFile)
 {
   NS_ASSERTION (!mDBConn, "Initialize called on already opened database!");
   NS_ENSURE_TRUE(mAsyncExecutionMutex, NS_ERROR_OUT_OF_MEMORY);
-  NS_ENSURE_TRUE(mTransactionMutex, NS_ERROR_OUT_OF_MEMORY);
-  NS_ENSURE_TRUE(mFunctionsMutex, NS_ERROR_OUT_OF_MEMORY);
-  NS_ENSURE_TRUE(mProgressHandlerMutex, NS_ERROR_OUT_OF_MEMORY);
 
   int srv;
   nsresult rv;
@@ -326,6 +318,9 @@ Connection::initialize(nsIFile *aDatabaseFile)
     return convertResultCode(srv);
   }
 
+  // Properly wrap the database handle's mutex.
+  mDBMutex.initWithMutex(sqlite3_db_mutex(mDBConn));
+
 #ifdef PR_LOGGING
   if (!gStorageLog)
     gStorageLog = ::PR_NewLogModule("mozStorage");
@@ -444,7 +439,7 @@ Connection::databaseElementExists(enum DatabaseElementType aElementType,
 bool
 Connection::findFunctionByInstance(nsISupports *aInstance)
 {
-  PR_ASSERT_CURRENT_THREAD_OWNS_LOCK(mFunctionsMutex);
+  mDBMutex.assertCurrentThreadOwns();
   FFEArguments args = { aInstance, false };
   mFunctions.EnumerateRead(findFunctionEnumerator, &args);
   return args.found;
@@ -460,7 +455,7 @@ Connection::sProgressHelper(void *aArg)
 int
 Connection::progressHandler()
 {
-  nsAutoLock mutex(mProgressHandlerMutex);
+  mDBMutex.assertCurrentThreadOwns();
   if (mProgressHandler) {
     PRBool result;
     nsresult rv = mProgressHandler->OnProgress(this, &result);
@@ -512,12 +507,6 @@ Connection::Close()
   }
 #endif
 
-  {
-    nsAutoLock mutex(mProgressHandlerMutex);
-    if (mProgressHandler)
-      ::sqlite3_progress_handler(mDBConn, 0, NULL, NULL);
-  }
-
   int srv = ::sqlite3_close(mDBConn);
   NS_ASSERTION(srv == SQLITE_OK,
                "sqlite3_close failed. There are probably outstanding statements that are listed above!");
@@ -716,7 +705,7 @@ Connection::IndexExists(const nsACString &aIndexName,
 NS_IMETHODIMP
 Connection::GetTransactionInProgress(PRBool *_inProgress)
 {
-  nsAutoLock mutex(mTransactionMutex);
+  SQLiteMutexAutoLock lockedScope(mDBMutex);
   *_inProgress = mTransactionInProgress;
   return NS_OK;
 }
@@ -730,7 +719,7 @@ Connection::BeginTransaction()
 NS_IMETHODIMP
 Connection::BeginTransactionAs(PRInt32 aTransactionType)
 {
-  nsAutoLock mutex(mTransactionMutex);
+  SQLiteMutexAutoLock lockedScope(mDBMutex);
   if (mTransactionInProgress)
     return NS_ERROR_FAILURE;
   nsresult rv;
@@ -755,7 +744,7 @@ Connection::BeginTransactionAs(PRInt32 aTransactionType)
 NS_IMETHODIMP
 Connection::CommitTransaction()
 {
-  nsAutoLock mutex(mTransactionMutex);
+  SQLiteMutexAutoLock lockedScope(mDBMutex);
   if (!mTransactionInProgress)
     return NS_ERROR_FAILURE;
   nsresult rv = ExecuteSimpleSQL(NS_LITERAL_CSTRING("COMMIT TRANSACTION"));
@@ -767,7 +756,7 @@ Connection::CommitTransaction()
 NS_IMETHODIMP
 Connection::RollbackTransaction()
 {
-  nsAutoLock mutex(mTransactionMutex);
+  SQLiteMutexAutoLock lockedScope(mDBMutex);
   if (!mTransactionInProgress)
     return NS_ERROR_FAILURE;
   nsresult rv = ExecuteSimpleSQL(NS_LITERAL_CSTRING("ROLLBACK TRANSACTION"));
@@ -801,7 +790,7 @@ Connection::CreateFunction(const nsACString &aFunctionName,
 
   // Check to see if this function is already defined.  We only check the name
   // because a function can be defined with the same body but different names.
-  nsAutoLock mutex(mFunctionsMutex);
+  SQLiteMutexAutoLock lockedScope(mDBMutex);
   NS_ENSURE_FALSE(mFunctions.Get(aFunctionName, NULL), NS_ERROR_FAILURE);
 
   int srv = ::sqlite3_create_function(mDBConn,
@@ -829,7 +818,7 @@ Connection::CreateAggregateFunction(const nsACString &aFunctionName,
   if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
 
   // Check to see if this function name is already defined.
-  nsAutoLock mutex(mFunctionsMutex);
+  SQLiteMutexAutoLock lockedScope(mDBMutex);
   NS_ENSURE_FALSE(mFunctions.Get(aFunctionName, NULL), NS_ERROR_FAILURE);
 
   // Because aggregate functions depend on state across calls, you cannot have
@@ -859,7 +848,7 @@ Connection::RemoveFunction(const nsACString &aFunctionName)
 {
   if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
 
-  nsAutoLock mutex(mFunctionsMutex);
+  SQLiteMutexAutoLock lockedScope(mDBMutex);
   NS_ENSURE_TRUE(mFunctions.Get(aFunctionName, NULL), NS_ERROR_FAILURE);
 
   int srv = ::sqlite3_create_function(mDBConn,
@@ -886,7 +875,7 @@ Connection::SetProgressHandler(PRInt32 aGranularity,
   if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
 
   // Return previous one
-  nsAutoLock mutex(mProgressHandlerMutex);
+  SQLiteMutexAutoLock lockedScope(mDBMutex);
   NS_IF_ADDREF(*_oldHandler = mProgressHandler);
 
   if (!aHandler || aGranularity <= 0) {
@@ -905,7 +894,7 @@ Connection::RemoveProgressHandler(mozIStorageProgressHandler **_oldHandler)
   if (!mDBConn) return NS_ERROR_NOT_INITIALIZED;
 
   // Return previous one
-  nsAutoLock mutex(mProgressHandlerMutex);
+  SQLiteMutexAutoLock lockedScope(mDBMutex);
   NS_IF_ADDREF(*_oldHandler = mProgressHandler);
 
   mProgressHandler = nsnull;
diff --git a/storage/src/mozStorageConnection.h b/storage/src/mozStorageConnection.h
index c47bd90905b..54a6598d1b9 100644
--- a/storage/src/mozStorageConnection.h
+++ b/storage/src/mozStorageConnection.h
@@ -48,6 +48,7 @@
 #include "nsString.h"
 #include "nsInterfaceHashtable.h"
 #include "mozIStorageProgressHandler.h"
+#include "SQLiteMutex.h"
 #include "mozIStorageConnection.h"
 #include "mozStorageService.h"
 
@@ -158,13 +159,27 @@ private:
    */
   PRBool mAsyncExecutionThreadShuttingDown;
 
-  PRLock *mTransactionMutex;
+  /**
+   * Wraps the mutex that SQLite gives us from sqlite3_db_mutex.
+   */
+  SQLiteMutex mDBMutex;
+
+  /**
+   * Tracks if we have a transaction in progress or not.  Access protected by
+   * mDBMutex.
+   */
   PRBool mTransactionInProgress;
 
-  PRLock *mFunctionsMutex;
+  /**
+   * Stores the mapping of a given function by name to its instance.  Access is
+   * protected by mDBMutex.
+   */
   nsInterfaceHashtable<nsCStringHashKey, nsISupports> mFunctions;
 
-  PRLock *mProgressHandlerMutex;
+  /**
+   * Stores the registered progress handler for the database connection.  Access
+   * is protected by mDBMutex.
+   */
   nsCOMPtr<mozIStorageProgressHandler> mProgressHandler;
 
   // This is here for two reasons: 1) It's used to make sure that the

From 4d9568aa5e6381fee09f7662ddafa6fb9863998b Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 22 Jul 2009 15:18:33 -0700
Subject: [PATCH 024/175] Bug 505550 - Acquire the db's mutex when cloning
 statements in Connection::ExecuteAsync Hold the lock around all our API calls
 so we don't lose so much to the background thread. r=asuth

---
 storage/src/mozStorageConnection.cpp | 70 +++++++++++++++-------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp
index 349bcc81085..deecbc23011 100644
--- a/storage/src/mozStorageConnection.cpp
+++ b/storage/src/mozStorageConnection.cpp
@@ -630,42 +630,45 @@ Connection::ExecuteAsync(mozIStorageStatement **aStatements,
 {
   int rc = SQLITE_OK;
   nsTArray<StatementData> stmts(aNumStatements);
-  for (PRUint32 i = 0; i < aNumStatements && rc == SQLITE_OK; i++) {
-    sqlite3_stmt *old_stmt =
-        static_cast<Statement *>(aStatements[i])->nativeStatement();
-    if (!old_stmt) {
-      rc = SQLITE_MISUSE;
-      break;
-    }
-    NS_ASSERTION(::sqlite3_db_handle(old_stmt) == mDBConn,
-                 "Statement must be from this database connection!");
+  {
+    SQLiteMutexAutoLock lockedScope(mDBMutex);
+    for (PRUint32 i = 0; i < aNumStatements && rc == SQLITE_OK; i++) {
+      sqlite3_stmt *old_stmt =
+          static_cast<Statement *>(aStatements[i])->nativeStatement();
+      if (!old_stmt) {
+        rc = SQLITE_MISUSE;
+        break;
+      }
+      NS_ASSERTION(::sqlite3_db_handle(old_stmt) == mDBConn,
+                   "Statement must be from this database connection!");
 
-    // Clone this statement.  We only need a sqlite3_stmt object, so we can
-    // avoid all the extra work that making a new Statement would normally
-    // involve and use the SQLite API.
-    sqlite3_stmt *new_stmt;
-    rc = ::sqlite3_prepare_v2(mDBConn, ::sqlite3_sql(old_stmt), -1, &new_stmt,
-                              NULL);
-    if (rc != SQLITE_OK)
-      break;
+      // Clone this statement.  We only need a sqlite3_stmt object, so we can
+      // avoid all the extra work that making a new Statement would normally
+      // involve and use the SQLite API.
+      sqlite3_stmt *new_stmt;
+      rc = ::sqlite3_prepare_v2(mDBConn, ::sqlite3_sql(old_stmt), -1, &new_stmt,
+                                NULL);
+      if (rc != SQLITE_OK)
+        break;
 
 #ifdef PR_LOGGING
-    PR_LOG(gStorageLog, PR_LOG_NOTICE,
-           ("Cloned statement 0x%p to 0x%p", old_stmt, new_stmt));
+      PR_LOG(gStorageLog, PR_LOG_NOTICE,
+             ("Cloned statement 0x%p to 0x%p", old_stmt, new_stmt));
 #endif
 
-    // Transfer the bindings
-    rc = sqlite3_transfer_bindings(old_stmt, new_stmt);
-    if (rc != SQLITE_OK)
-      break;
+      // Transfer the bindings
+      rc = sqlite3_transfer_bindings(old_stmt, new_stmt);
+      if (rc != SQLITE_OK)
+        break;
 
-    Statement *storageStmt = static_cast<Statement *>(aStatements[i]);
-    StatementData data(new_stmt, storageStmt->bindingParamsArray());
-    if (!stmts.AppendElement(data)) {
-      rc = SQLITE_NOMEM;
-      break;
-    }
-  }
+      Statement *storageStmt = static_cast<Statement *>(aStatements[i]);
+      StatementData data(new_stmt, storageStmt->bindingParamsArray());
+      if (!stmts.AppendElement(data)) {
+        rc = SQLITE_NOMEM;
+        break;
+      }
+    } // for loop
+  } // locked Scope
 
   // Dispatch to the background
   nsresult rv = NS_OK;
@@ -682,8 +685,11 @@ Connection::ExecuteAsync(mozIStorageStatement **aStatements,
   }
 
   // Always reset all the statements
-  for (PRUint32 i = 0; i < aNumStatements; i++)
-    (void)aStatements[i]->Reset();
+  {
+    SQLiteMutexAutoLock lockedScope(mDBMutex);
+    for (PRUint32 i = 0; i < aNumStatements; i++)
+      (void)aStatements[i]->Reset();
+  }
 
   return rv;
 }

From 3207e737a20847df0ba419afa7e5c7c45450f031 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 22 Jul 2009 15:18:34 -0700
Subject: [PATCH 025/175] Bug 505813 - Use the connections executeAsync instead
 of calling it on each statement. r=dietrich

---
 .../places/src/nsPlacesAutoComplete.js        | 58 +++++++++----------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/toolkit/components/places/src/nsPlacesAutoComplete.js b/toolkit/components/places/src/nsPlacesAutoComplete.js
index 568d31afe6a..9d95b0fbe8b 100644
--- a/toolkit/components/places/src/nsPlacesAutoComplete.js
+++ b/toolkit/components/places/src/nsPlacesAutoComplete.js
@@ -143,10 +143,14 @@ function best_favicon_for_revhost(aTableName)
  *
  * @param aCallback
  *        A reference to a nsPlacesAutoComplete.
+ * @param aDBConnection
+ *        The database connection to execute the queries on.
  */
-function AutoCompleteStatementCallbackWrapper(aCallback)
+function AutoCompleteStatementCallbackWrapper(aCallback,
+                                              aDBConnection)
 {
   this._callback = aCallback;
+  this._db = aDBConnection;
 }
 
 AutoCompleteStatementCallbackWrapper.prototype = {
@@ -179,13 +183,15 @@ AutoCompleteStatementCallbackWrapper.prototype = {
    * Executes the specified query asynchronously.  This object will notify
    * this._callback if we should notify (logic explained in handleCompletion).
    *
-   * @param aQuery
-   *        The query to execute asynchronously.
-   * @return a mozIStoragePendingStatement that can be used to cancel the query.
+   * @param aQueries
+   *        The queries to execute asynchronously.
+   * @return a mozIStoragePendingStatement that can be used to cancel the
+   *         queries.
    */
-  executeAsync: function ACSCW_executeAsync(aQuery)
+  executeAsync: function ACSCW_executeAsync(aQueries)
   {
-    return this._handle = aQuery.executeAsync(this);
+    return this._handle = this._db.executeAsync(aQueries, aQueries.length,
+                                                this);
   },
 
   //////////////////////////////////////////////////////////////////////////////
@@ -438,7 +444,7 @@ nsPlacesAutoComplete.prototype = {
   stopSearch: function PAC_stopSearch()
   {
     // We need to cancel our searches so we do not get any [more] results.
-    this._stopActiveQueries();
+    this._stopActiveQuery();
 
     this._finishSearch(false);
   },
@@ -463,8 +469,8 @@ nsPlacesAutoComplete.prototype = {
       haveMatches = haveMatches || match;
 
       if (this._result.matchCount == this._maxRichResults) {
-        // We have enough results, so stop running our queries.
-        this._stopActiveQueries();
+        // We have enough results, so stop running our search.
+        this._stopActiveQuery();
 
         // And finish our search.
         this._finishSearch(true);
@@ -489,15 +495,6 @@ nsPlacesAutoComplete.prototype = {
     if (this.isSearchComplete())
       return;
 
-    // Remove the first query in our array of pending queries since it is the
-    // one we are getting notified about.
-    this._pendingQueries.shift();
-
-    // If we still have pending queries, we bail out because we aren't done
-    // getting results.
-    if (this._pendingQueries.length)
-      return;
-
     // If we do not have enough results, and our match type is
     // MATCH_BOUNDARY_ANYWHERE, search again with MATCH_ANYWHERE to get more
     // results.
@@ -610,6 +607,7 @@ nsPlacesAutoComplete.prototype = {
     delete this._listener;
     delete this._result;
     delete this._usedPlaceIds;
+    delete this._pendingQuery;
     this._secondPass = false;
   },
 
@@ -624,21 +622,19 @@ nsPlacesAutoComplete.prototype = {
     // Because we might get a handleCompletion for canceled queries, we want to
     // filter out queries we no longer care about (described in the
     // handleCompletion implementation of AutoCompleteStatementCallbackWrapper).
-    let PAC = this;
-    this._pendingQueries = aQueries.map(function(aQuery) {
-      // Create our wrapper object and execute the query.
-      let callbackWrapper = new AutoCompleteStatementCallbackWrapper(PAC);
-      return callbackWrapper.executeAsync(aQuery);
-    });
+
+    // Create our wrapper object and execute the queries.
+    let wrapper = new AutoCompleteStatementCallbackWrapper(this, this._db);
+    this._pendingQuery = wrapper.executeAsync(aQueries);
   },
 
   /**
-   * Stops executing all active queries.
+   * Stops executing our active query.
    */
-  _stopActiveQueries: function PAC_stopActiveQueries()
+  _stopActiveQuery: function PAC_stopActiveQuery()
   {
-    this._pendingQueries.forEach(function(aQuery) aQuery.cancel());
-    delete this._pendingQueries;
+    this._pendingQuery.cancel();
+    delete this._pendingQuery;
   },
 
   /**
@@ -1012,9 +1008,9 @@ nsPlacesAutoComplete.prototype = {
    */
   isSearchComplete: function PAC_isSearchComplete()
   {
-    // If _pendingQueries is null, we should no longer do any work since we have
+    // If _pendingQuery is null, we should no longer do any work since we have
     // already called _finishSearch.  This means we completed our search.
-    return this._pendingQueries == null;
+    return this._pendingQuery == null;
   },
 
   /**
@@ -1028,7 +1024,7 @@ nsPlacesAutoComplete.prototype = {
    */
   isPendingSearch: function PAC_isPendingSearch(aHandle)
   {
-    return this._pendingQueries.indexOf(aHandle) != -1;
+    return this._pendingQuery == aHandle;
   },
 
   //////////////////////////////////////////////////////////////////////////////

From 18bc7a3beb69a41091eeef2aa6a7a2ab826a82e1 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 22 Jul 2009 15:18:34 -0700
Subject: [PATCH 026/175] Bug 505871 - Use a timeout before searching in the
 location bar Searches are really fast, but we don't want to do too much extra
 work.  So, use a timeout.  In most cases, a user should get a result within
 100ms still, which should feel instantaneous. r=dietrich

---
 browser/base/content/browser.xul | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 393b8807545..928c1a6de44 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -384,6 +384,7 @@
                  showimagecolumn="true"
                  enablehistory="true"
                  maxrows="6"
+                 timeout="75"
                  newlines="stripsurroundingwhitespace"
                  oninput="gBrowser.userTypedValue = this.value;"
                  ontextentered="this.handleCommand(param);"

From 247b160761f903fd7abde7378671a62929843e28 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 22 Jul 2009 15:29:43 -0700
Subject: [PATCH 027/175] Bug 504384 - Excessive Flickering with the
 Asynchronous Location Bar This removes the synchronous call to adjustHeight. 
 The adjustHeight call running in the setTimeout will run after
 _appendCurrentResult has added our results, and after any overflow has
 happened that we might hit (see _adjustAcItem). r=gavin

---
 toolkit/content/widgets/autocomplete.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index 7774281c8a5..83826ee32f4 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -975,13 +975,15 @@
       <method name="_invalidate">
         <body>
           <![CDATA[
+          // If we do not have a specific height, we'll have to figure out what
+          // our actual height should be dynamically.
           if (!this.hasAttribute("height")) {
             // collapsed if no matches
             this.richlistbox.collapsed = (this._matchCount == 0);
 
-            // Dynamically update height until richlistbox.rows works (bug 401939)
-            // Adjust the height immediately and after the row contents update
-            this.adjustHeight();
+            // Adjust the height, but we need to delay this because adjustHeight
+            // gets the wrong values (see the comments in _adjustAcItem about
+            // overflow.  XXX why?).
             setTimeout(function(self) self.adjustHeight(), 0, this);
           }
 

From 0781cb50a9d9b300e9037ca92c71fbc2c4ef101d Mon Sep 17 00:00:00 2001
From: Neil Deakin <neil@mozilla.com>
Date: Wed, 29 Jul 2009 14:33:53 -0400
Subject: [PATCH 028/175] Bug 478416, replace chromedir attribute with
 :moz-locale-dir pseudoclass, r=neil,dao,dbaron,sr=dbaron

---
 browser/base/content/browser-context.inc      |   2 -
 browser/base/content/browser-doctype.inc      |   2 -
 browser/base/content/browser-menubar.inc      |   2 -
 browser/base/content/browser-places.js        |   4 +-
 browser/base/content/browser.css              |   2 +-
 browser/base/content/browser.js               |   4 +-
 browser/base/content/browser.xul              |  20 +-
 browser/base/content/pageinfo/pageInfo.xul    |   5 +-
 browser/base/content/tabbrowser.xml           |  23 +-
 browser/base/content/web-panels.xul           |   2 -
 browser/components/places/content/places.xml  |   5 -
 browser/components/places/content/places.xul  |   8 +-
 browser/components/places/content/toolbar.xml |   3 -
 browser/components/search/content/search.xml  |   8 +-
 .../themes/gnomestripe/browser/browser.css    |  42 ++--
 .../gnomestripe/browser/places/organizer.css  |   8 +-
 .../themes/gnomestripe/browser/searchbar.css  |   2 +-
 browser/themes/pinstripe/browser/browser.css  |  92 ++++----
 .../pinstripe/browser/places/organizer.css    |  28 +--
 .../themes/pinstripe/browser/searchbar.css    |  24 +-
 .../themes/winstripe/browser/browser-aero.css |  10 +-
 browser/themes/winstripe/browser/browser.css  | 124 +++++-----
 .../winstripe/browser/places/organizer.css    |  18 +-
 .../themes/winstripe/browser/searchbar.css    |   6 +-
 content/base/public/nsIDocument.h             |  13 +-
 content/base/src/nsGkAtomList.h               |   1 +
 content/xul/content/src/nsXULElement.cpp      |  21 +-
 content/xul/document/public/nsIXULDocument.h  |   5 +
 content/xul/document/src/Makefile.in          |   3 +
 content/xul/document/src/nsXULDocument.cpp    | 104 +++++++++
 content/xul/document/src/nsXULDocument.h      |  18 +-
 layout/style/nsCSSParser.cpp                  |   8 +
 layout/style/nsCSSPseudoClassList.h           |   4 +
 layout/style/nsCSSPseudoClasses.cpp           |   3 +-
 layout/style/nsCSSRuleProcessor.cpp           |  29 +++
 layout/style/test/test_selectors.html         |  10 +
 modules/libpref/src/init/all.js               |   5 +
 .../components/console/content/console.xul    |   5 +-
 toolkit/components/help/content/help.xul      |  10 +-
 .../help/content/helpContextOverlay.xul       |   4 -
 .../printing/content/printPreviewBindings.xml |  10 +-
 toolkit/content/tests/chrome/Makefile.in      |   4 +
 .../content/tests/chrome/rtltest/Makefile.in  |  49 ++++
 .../content/tests/chrome/rtltest/dirtest.xul  |  25 ++
 .../tests/chrome/rtltest/righttoleft.manifest |   3 +
 .../content/tests/chrome/test_righttoleft.xul | 217 ++++++++++++++++++
 toolkit/content/textbox.css                   |   4 +-
 toolkit/content/widgets/datetimepicker.xml    |  22 +-
 toolkit/content/widgets/findbar.xml           |   5 -
 toolkit/content/widgets/menu.xml              |  12 +-
 toolkit/content/widgets/resizer.xml           |  15 --
 toolkit/content/widgets/scrollbox.xml         |  13 +-
 toolkit/content/widgets/tabbox.xml            |   7 +-
 toolkit/content/widgets/textbox.xml           |  14 +-
 toolkit/content/widgets/toolbarbutton.xml     |   9 +-
 toolkit/content/widgets/tree.xml              |  11 +-
 toolkit/content/widgets/wizard.xml            |  14 +-
 toolkit/content/xul.css                       |   6 +-
 .../mozapps/extensions/content/extensions.xml |   2 -
 .../mozapps/extensions/content/extensions.xul |   4 +-
 toolkit/themes/faststripe/global/tabbox.css   |  18 +-
 toolkit/themes/faststripe/global/textbox.css  |   2 +-
 toolkit/themes/gnomestripe/global/button.css  |   8 +-
 toolkit/themes/gnomestripe/global/findBar.css |   8 +-
 .../gnomestripe/global/printPreview.css       |   8 +-
 toolkit/themes/gnomestripe/global/textbox.css |   2 +-
 toolkit/themes/gnomestripe/global/tree.css    |   8 +-
 toolkit/themes/gnomestripe/help/help.css      |  16 +-
 .../pinstripe/global/datetimepicker.css       |   2 +-
 toolkit/themes/pinstripe/global/findBar.css   |   8 +-
 toolkit/themes/pinstripe/global/resizer.css   |   4 +-
 toolkit/themes/pinstripe/global/tree.css      |   8 +-
 .../themes/pinstripe/global/viewbuttons.css   |  16 +-
 .../winstripe/global/datetimepicker.css       |  12 +-
 .../themes/winstripe/global/printPreview.css  |  16 +-
 toolkit/themes/winstripe/global/resizer.css   |   6 +-
 toolkit/themes/winstripe/global/scrollbox.css |  16 +-
 toolkit/themes/winstripe/global/tabbox.css    |  18 +-
 toolkit/themes/winstripe/global/textbox.css   |   2 +-
 toolkit/themes/winstripe/global/tree-aero.css |   8 +-
 toolkit/themes/winstripe/global/tree.css      |   8 +-
 toolkit/themes/winstripe/help/help.css        |   2 +-
 82 files changed, 857 insertions(+), 472 deletions(-)
 create mode 100644 toolkit/content/tests/chrome/rtltest/Makefile.in
 create mode 100644 toolkit/content/tests/chrome/rtltest/dirtest.xul
 create mode 100644 toolkit/content/tests/chrome/rtltest/righttoleft.manifest
 create mode 100644 toolkit/content/tests/chrome/test_righttoleft.xul

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index ddd1f60ec43..93979c16369 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -167,13 +167,11 @@
       <menuitem id="context-back"
                 label="&backCmd.label;"
                 accesskey="&backCmd.accesskey;"
-                chromedir="&locale.dir;"
                 command="Browser:BackOrBackDuplicate"
                 onclick="checkForMiddleClick(this, event);"/>
       <menuitem id="context-forward"
                 label="&forwardCmd.label;"
                 accesskey="&forwardCmd.accesskey;"
-                chromedir="&locale.dir;"
                 command="Browser:ForwardOrForwardDuplicate"
                 onclick="checkForMiddleClick(this, event);"/>
       <menuitem id="context-reload"
diff --git a/browser/base/content/browser-doctype.inc b/browser/base/content/browser-doctype.inc
index 6a331330c33..7e17b6a9cf8 100644
--- a/browser/base/content/browser-doctype.inc
+++ b/browser/base/content/browser-doctype.inc
@@ -3,8 +3,6 @@
 %brandDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
 %browserDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 <!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd">
 %globalRegionDTD;
 <!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" >
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index e186a1af955..485c041c639 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -474,7 +474,6 @@
 #else
                           key="goBackKb"
 #endif
-                          chromedir="&locale.dir;"
                           command="Browser:BackOrBackDuplicate"
                           onclick="checkForMiddleClick(this, event);"/>
                 <menuitem id="historyMenuForward"
@@ -484,7 +483,6 @@
 #else
                           key="goForwardKb"
 #endif
-                          chromedir="&locale.dir;"
                           command="Browser:ForwardOrForwardDuplicate"
                           onclick="checkForMiddleClick(this, event);"/>
                 <menuitem id="historyMenuHome"
diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index 1fa8f3caf5c..6bbe55b3096 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -432,9 +432,7 @@ var PlacesCommandHook = {
       if (starIcon && isElementVisible(starIcon)) {
         // Make sure the bookmark properties dialog hangs toward the middle of
         // the location bar in RTL builds
-        var position = "after_end";
-        if (gURLBar.getAttribute("chromedir") == "rtl")
-          position = "after_start";
+        var position = (getComputedStyle(gNavToolbox, "").direction == "rtl") ? 'after_start' : 'after_end';
         if (aShowEditUI)
           StarUI.showEditBookmarkPopup(itemId, starIcon, position);
 #ifdef ADVANCED_STARRING_UI
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 4984d7baa91..d0b9af3fc7d 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -45,7 +45,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > hbox[type="places"] {
   display: none;
 }
 
-#feed-menu[chromedir="rtl"] > menuitem {
+#feed-menu:-moz-locale-dir(rtl) > menuitem {
   direction: rtl;
 }
 
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 2cae4f4b2d5..12f78515ddd 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6628,9 +6628,7 @@ var gIdentityHandler = {
     
     // Make sure the identity popup hangs toward the middle of the location bar
     // in RTL builds
-    var position = 'after_start';
-    if (gURLBar.getAttribute("chromedir") == "rtl")
-      position = 'after_end';
+    var position = (getComputedStyle(gNavToolbox, "").direction == "rtl") ? 'after_end' : 'after_start';
 
     // Add the "open" attribute to the identity box for styling
     this._identityBox.setAttribute("open", "true");
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index de65307112f..d8a9a5022e7 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -104,17 +104,16 @@
 
   <popupset id="mainPopupSet">
     <menupopup id="backForwardMenu"
-               chromedir="&locale.dir;"
                onpopupshowing="return FillHistoryMenu(event.target);"
                oncommand="gotoHistoryIndex(event);"
                onclick="checkForMiddleClick(this, event);"/>
     <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
 
     <!-- for search and content formfill/pw manager -->
-    <panel type="autocomplete" chromedir="&locale.dir;" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
+    <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
 
     <!-- for url bar autocomplete -->
-    <panel type="autocomplete-richlistbox" chromedir="&locale.dir;" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
+    <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 
     <panel id="editBookmarkPanel"
            orient="vertical"
@@ -205,8 +204,7 @@
     <!-- Popup for site identity information -->
     <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true"
            onpopupshown="document.getElementById('identity-popup-more-info-button').focus();"
-           level="top"
-           chromedir="&locale.dir;">
+           level="top">
       <hbox id="identity-popup-container" align="top">
         <image id="identity-popup-icon"/>
         <vbox id="identity-popup-content-box">
@@ -318,18 +316,16 @@
       <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
                    context="backForwardMenu">
         <toolbarbutton id="back-button" class="toolbarbutton-1"
-                       chromedir="&locale.dir;"
                        label="&backCmd.label;"
                        command="Browser:BackOrBackDuplicate"
                        onclick="checkForMiddleClick(this, event);"
                        tooltiptext="&backButton.tooltip;"/>
         <toolbarbutton id="forward-button" class="toolbarbutton-1"
-                       chromedir="&locale.dir;"
                        label="&forwardCmd.label;"
                        command="Browser:ForwardOrForwardDuplicate"
                        onclick="checkForMiddleClick(this, event);"
                        tooltiptext="&forwardButton.tooltip;"/>
-        <toolbarbutton id="back-forward-dropmarker" type="menu" chromedir="&locale.dir;"
+        <toolbarbutton id="back-forward-dropmarker" type="menu"
                        disabled="true" tooltiptext="&backForwardMenu.tooltip;"
                        onbroadcast="if (this.disabled) this.disabled =
                                       document.getElementById('Browser:Back').hasAttribute('disabled') &amp;&amp;
@@ -337,7 +333,6 @@
           <!-- bug 415444: event.stopPropagation is here for the cloned version of
                this menupopup -->
           <menupopup context=""
-                     chromedir="&locale.dir;"
                      position="after_start"
                      onpopupshowing="return FillHistoryMenu(event.target);"
                      oncommand="gotoHistoryIndex(event); event.stopPropagation();"
@@ -374,7 +369,6 @@
                  bookmarkemptytext="&urlbar.bookmark.emptyText;"
                  historyemptytext="&urlbar.history.emptyText;"
                  noneemptytext="&urlbar.none.emptyText;"
-                 chromedir="&locale.dir;"
                  type="autocomplete"
                  autocompletesearch="history"
                  autocompletepopup="PopupAutoCompleteRichResult"
@@ -398,7 +392,6 @@
                We only add the identity-box button to the tab order when the location bar
                has focus, otherwise pressing F6 focuses it instead of the location bar -->
           <box id="identity-box" role="button"
-               chromedir="&locale.dir;"
                onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
                onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);">
             <hbox align="center">
@@ -418,13 +411,11 @@
                     style="-moz-user-focus: none"
                     class="plain urlbar-icon"
                     id="feed-button"
-                    chromedir="&locale.dir;"
                     collapsed="true"
                     tooltiptext="&feedButton.tooltip;"
                     onclick="return FeedHandler.onFeedButtonClick(event);">
               <menupopup position="after_end"
                          id="feed-menu"
-                         chromedir="&locale.dir;"
                          onpopupshowing="return FeedHandler.buildFeedList(this);"
                          oncommand="return FeedHandler.subscribeToFeed(null, event);"
                          onclick="checkForMiddleClick(this, event);"/>
@@ -433,7 +424,6 @@
                    class="urlbar-icon"
                    onclick="PlacesStarButton.onClick(event);"/>
             <image id="go-button"
-                   chromedir="&locale.dir;"
                    class="urlbar-icon"
                    tooltiptext="&goEndCap.tooltip;"
                    onclick="gURLBar.handleCommand(event);"/>
@@ -444,7 +434,7 @@
       <toolbaritem id="search-container" title="&searchItem.title;"
                    align="center" class="chromeclass-toolbar-additional"
                    flex="100" persist="width">
-        <searchbar id="searchbar" flex="1" chromedir="&locale.dir;"/>
+        <searchbar id="searchbar" flex="1"/>
       </toolbaritem>
 
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
diff --git a/browser/base/content/pageinfo/pageInfo.xul b/browser/base/content/pageinfo/pageInfo.xul
index c89419f0e19..a4e237f0d57 100644
--- a/browser/base/content/pageinfo/pageInfo.xul
+++ b/browser/base/content/pageinfo/pageInfo.xul
@@ -48,8 +48,6 @@
 <!DOCTYPE window [
   <!ENTITY % pageInfoDTD SYSTEM "chrome://browser/locale/pageInfo.dtd">
   %pageInfoDTD;
-  <!ENTITY % global SYSTEM "chrome://global/locale/global.dtd">
-  %global;
 ]>
 
 #ifdef XP_MACOSX
@@ -117,8 +115,7 @@
   </menupopup>
 
   <windowdragbox id="topBar" class="viewGroupWrapper">
-    <radiogroup id="viewGroup" class="chromeclass-toolbar" orient="horizontal"
-                chromedir="&locale.dir;">
+    <radiogroup id="viewGroup" class="chromeclass-toolbar" orient="horizontal">
       <radio id="generalTab"  label="&generalTab;"  accesskey="&generalTab.accesskey;"
            oncommand="showTab('general');"/>
       <radio id="mediaTab"    label="&mediaTab;"    accesskey="&mediaTab.accesskey;"
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 50c7698010c..6128d722ca1 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -50,8 +50,6 @@
 <!DOCTYPE bindings [
 <!ENTITY % tabBrowserDTD SYSTEM "chrome://browser/locale/tabbrowser.dtd" >
 %tabBrowserDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 ]>
 
 <bindings id="tabBrowserBindings"
@@ -68,7 +66,7 @@
       <xul:stringbundle anonid="tbstringbundle" src="chrome://browser/locale/tabbrowser.properties"/>
       <xul:tabbox anonid="tabbox" flex="1" eventnode="document" xbl:inherits="handleCtrlPageUpDown"
                   onselect="if (!('updateCurrentBrowser' in this.parentNode) || event.target.localName != 'tabpanels') return; this.parentNode.updateCurrentBrowser();">
-        <xul:hbox class="tab-drop-indicator-bar" collapsed="true" chromedir="&locale.dir;"
+        <xul:hbox class="tab-drop-indicator-bar" collapsed="true"
                   ondragover="this.parentNode.parentNode._onDragOver(event);"
                   ondragleave="this.parentNode.parentNode._onDragLeave(event);"
                   ondrop="this.parentNode.parentNode._onDrop(event);">
@@ -2812,8 +2810,7 @@
                          onmousedown="_startScroll(-1);"
                          onmouseover="_continueScroll(-1);"
                          onmouseup="_stopScroll();"
-                         onmouseout="_pauseScroll();"
-                         chromedir="&locale.dir;"/>
+                         onmouseout="_pauseScroll();"/>
       <xul:scrollbox xbl:inherits="orient,align,pack,dir" flex="1" anonid="scrollbox">
         <children/>
       </xul:scrollbox>
@@ -2829,8 +2826,7 @@
                            onmousedown="_startScroll(1);"
                            onmouseover="_continueScroll(1);"
                            onmouseup="_stopScroll();"
-                           onmouseout="_pauseScroll();"
-                           chromedir="&locale.dir;"/>
+                           onmouseout="_pauseScroll();"/>
       </xul:stack>
     </content>
 #endif
@@ -2851,7 +2847,7 @@
           </xul:stack>
 #endif
           <xul:arrowscrollbox anonid="arrowscrollbox" orient="horizontal" flex="1"
-                              style="min-width: 1px;" chromedir="&locale.dir;"
+                              style="min-width: 1px;"
 #ifndef XP_MACOSX
                               clicktoscroll="true"
 #endif
@@ -2863,13 +2859,13 @@
 # button, necessary due to the previous hack.
             <children/>
             <xul:toolbarbutton class="tabs-newtab-button"
-                               command="cmd_newNavigatorTab" chromedir="&locale.dir;"
+                               command="cmd_newNavigatorTab"
                                tooltiptext="&newTabButton.tooltip;"/>
           </xul:arrowscrollbox>
           <xul:toolbarbutton class="tabs-newtab-button" anonid="newtab-button"
-                             command="cmd_newNavigatorTab" chromedir="&locale.dir;"
+                             command="cmd_newNavigatorTab"
                              tooltiptext="&newTabButton.tooltip;"/>
-          <xul:stack align="center" pack="end" chromedir="&locale.dir;">
+          <xul:stack align="center" pack="end">
             <xul:hbox flex="1" class="tabs-alltabs-box-animate" anonid="alltabs-box-animate"/>
             <xul:toolbarbutton class="tabs-alltabs-button" anonid="alltabs-button"
                                type="menu"
@@ -2879,7 +2875,7 @@
             </xul:toolbarbutton>
           </xul:stack>
           <xul:toolbarbutton anonid="tabs-closebutton"
-                             class="close-button tabs-closebutton" chromedir="&locale.dir;"/>
+                             class="close-button tabs-closebutton"/>
         </xul:hbox>
       </xul:stack>
     </content>
@@ -3235,8 +3231,7 @@
 
   <binding id="tabbrowser-tab" display="xul:hbox"
            extends="chrome://global/content/bindings/tabbox.xml#tab">
-    <content chromedir="&locale.dir;"
-             closetabtext="&closeTab.label;">
+    <content closetabtext="&closeTab.label;">
       <xul:image xbl:inherits="validate,src=image" class="tab-icon-image"/>
       <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" class="tab-text"/>
       <xul:toolbarbutton anonid="close-button" tabindex="-1" class="tab-close-button"/>
diff --git a/browser/base/content/web-panels.xul b/browser/base/content/web-panels.xul
index 4e5e3d4bf58..b590371a003 100644
--- a/browser/base/content/web-panels.xul
+++ b/browser/base/content/web-panels.xul
@@ -47,8 +47,6 @@
 %browserDTD;
 <!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd">
 %textcontextDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 ]>
 
 <page id="webpanels-window"
diff --git a/browser/components/places/content/places.xml b/browser/components/places/content/places.xml
index 784dbba1e04..66740bd4f08 100644
--- a/browser/components/places/content/places.xml
+++ b/browser/components/places/content/places.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
-]>
-
 <bindings id="placesBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
diff --git a/browser/components/places/content/places.xul b/browser/components/places/content/places.xul
index aa1708dae84..315906bd139 100644
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@@ -62,8 +62,6 @@
 %placesDTD;
 <!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
 %editMenuOverlayDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
 %browserDTD;
 ]>
@@ -187,24 +185,22 @@
   </popupset>
 
   <toolbox id="placesToolbox">
-    <toolbar class="chromeclass-toolbar" id="placesToolbar" align="center" chromedir="&locale.dir;">
+    <toolbar class="chromeclass-toolbar" id="placesToolbar" align="center">
       <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      command="OrganizerCommand:Back"
                      tooltiptext="&backButton.tooltip;"
-                     chromedir="&locale.dir;"
                      disabled="true"/>
 
       <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      command="OrganizerCommand:Forward"
                      tooltiptext="&forwardButton.tooltip;"
-                     chromedir="&locale.dir;"
                      disabled="true"/>
 
 #ifdef XP_MACOSX
         <toolbarbutton type="menu" class="tabbable"
               onpopupshowing="document.getElementById('placeContent').focus()"
 #else
-      <menubar id="placesMenu" chromedir="&locale.dir;">
+      <menubar id="placesMenu">
         <menu accesskey="&organize.accesskey;" class="menu-iconic"
 #endif
               id="organizeButton" label="&organize.label;">
diff --git a/browser/components/places/content/toolbar.xml b/browser/components/places/content/toolbar.xml
index 7638d6baa65..ec06ddb933a 100644
--- a/browser/components/places/content/toolbar.xml
+++ b/browser/components/places/content/toolbar.xml
@@ -41,8 +41,6 @@
 
 
 <!DOCTYPE bindings [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd" >
-%globalDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
 %browserDTD;
 ]>
@@ -80,7 +78,6 @@
                            mousethrough="never"
                            collapsed="true"
                            tooltiptext="&bookmarksToolbarChevron.tooltip;"
-                           chromedir="&locale.dir;"
                            onpopupshowing="chevronPopupShowing(event);">
           <xul:menupopup anonid="chevronPopup"
                          xbl:inherits="tooltip"
diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index 6b858d29db4..c6dbcd61201 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -45,8 +45,6 @@
 <!DOCTYPE bindings [
 <!ENTITY % searchBarDTD SYSTEM "chrome://browser/locale/searchbar.dtd" >
 %searchBarDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
 %browserDTD;
 ]>
@@ -80,8 +78,7 @@
                    xbl:inherits="disabled,disableautocomplete,searchengine,src,newlines">
         <xul:button class="searchbar-engine-button"
                     type="menu"
-                    anonid="searchbar-engine-button"
-                    chromedir="&locale.dir;">
+                    anonid="searchbar-engine-button">
           <xul:image class="searchbar-engine-image" xbl:inherits="src"/>
           <xul:image class="searchbar-dropmarker-image"/>
           <xul:menupopup class="searchbar-popup"
@@ -93,10 +90,9 @@
                           oncommand="openManager(event);"/>
           </xul:menupopup>
         </xul:button>
-        <xul:hbox class="search-go-container" chromedir="&locale.dir;">
+        <xul:hbox class="search-go-container">
           <xul:image class="search-go-button"
                      anonid="search-go-button"
-                     chromedir="&locale.dir;"
                      onclick="handleSearchCommand(event);"
                      tooltiptext="&searchEndCap.label;" />
         </xul:hbox>
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index d1196ad6f88..5669fb879a3 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -401,13 +401,13 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled");
 }
 
-#historyMenuBack[chromedir="rtl"],
-#context-back[chromedir="rtl"] {
+#historyMenuBack:-moz-locale-dir(rtl),
+#context-back:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
 }
 
-#historyMenuBack[disabled][chromedir="rtl"],
-#context-back[disabled][chromedir="rtl"] {
+#historyMenuBack[disabled]:-moz-locale-dir(rtl),
+#context-back[disabled]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu&state=disabled");
 }
 
@@ -421,13 +421,13 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled");
 }
 
-#historyMenuForward[chromedir="rtl"],
-#context-forward[chromedir="rtl"] {
+#historyMenuForward:-moz-locale-dir(rtl),
+#context-forward:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
 }
 
-#historyMenuForward[disabled][chromedir="rtl"],
-#context-forward[disabled][chromedir="rtl"] {
+#historyMenuForward[disabled]:-moz-locale-dir(rtl),
+#context-forward[disabled]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled");
 }
 
@@ -522,10 +522,10 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled");
 }
 
-#back-button[chromedir="rtl"] {
+#back-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar");
 }
-#back-button[disabled="true"][chromedir="rtl"] {
+#back-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
 }
 
@@ -536,10 +536,10 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
 }
 
-#forward-button[chromedir="rtl"] {
+#forward-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
 }
-#forward-button[disabled="true"][chromedir="rtl"] {
+#forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
 }
 
@@ -648,13 +648,13 @@ toolbar[iconsize="small"] #back-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled");
 }
 
-toolbar[iconsize="small"] #back-button[chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
 }
-menupopup[chromedir="rtl"] > .unified-nav-back[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-back[_moz-menuactive] {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu") !important;
 }
-toolbar[iconsize="small"] #back-button[disabled="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu&state=disabled");
 }
 
@@ -668,13 +668,13 @@ toolbar[iconsize="small"] #forward-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled");
 }
 
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"] {
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
 }
-menupopup[chromedir="rtl"] > .unified-nav-forward[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-forward[_moz-menuactive] {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important;
 }
-toolbar[iconsize="small"] #forward-button[disabled="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled");
 }
 
@@ -833,7 +833,7 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   direction: ltr !important;
 }
 
-#PopupAutoComplete[chromedir="rtl"] > tree > treerows {
+#PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows {
   direction: rtl;
 }
 
@@ -875,7 +875,7 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   -moz-border-end: 1px solid ThreeDShadow;
 }
 
-#identity-box[chromedir="rtl"] {
+#identity-box:-moz-locale-dir(rtl) {
   -moz-border-start: 1px solid ThreeDShadow;
 }
 
@@ -1338,7 +1338,7 @@ toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }
 
-toolbarbutton.chevron[chromedir="rtl"] {
+toolbarbutton.chevron:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/toolbar/chevron-rtl.gif") !important;
 }
 
diff --git a/browser/themes/gnomestripe/browser/places/organizer.css b/browser/themes/gnomestripe/browser/places/organizer.css
index ca7b67f3f21..f9a3afba1f7 100644
--- a/browser/themes/gnomestripe/browser/places/organizer.css
+++ b/browser/themes/gnomestripe/browser/places/organizer.css
@@ -13,10 +13,10 @@
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled");
 }
 
-#back-button[chromedir="rtl"] {
+#back-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar");
 }
-#back-button[disabled="true"][chromedir="rtl"] {
+#back-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
 }
 
@@ -29,10 +29,10 @@
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
 }
 
-#forward-button[chromedir="rtl"] {
+#forward-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
 }
-#forward-button[disabled="true"][chromedir="rtl"] {
+#forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
 }
 
diff --git a/browser/themes/gnomestripe/browser/searchbar.css b/browser/themes/gnomestripe/browser/searchbar.css
index d034e68922a..5c2d6cc1db7 100644
--- a/browser/themes/gnomestripe/browser/searchbar.css
+++ b/browser/themes/gnomestripe/browser/searchbar.css
@@ -73,7 +73,7 @@
   cursor: pointer;
 }
 
-.search-go-button[chromedir="rtl"] {
+.search-go-button:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 7a9ce2268aa..eb205da1db4 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -124,12 +124,12 @@ toolbarbutton.bookmark-item[type=menu] > .toolbarbutton-menu-dropmarker {
   -moz-padding-end: 7px;
 }
 
-toolbarbutton.bookmark-item[type=menu][chromedir="rtl"] > .toolbarbutton-menu-dropmarker {
+toolbarbutton.bookmark-item[type=menu]:-moz-locale-dir(rtl) > .toolbarbutton-menu-dropmarker {
   -moz-padding-start: 4px;
   -moz-padding-end: 2px;
 }
 
-toolbarbutton.bookmark-item[chromedir="rtl"] {
+toolbarbutton.bookmark-item:-moz-locale-dir(rtl) {
   -moz-padding-start: 0px;
   -moz-padding-end: 7px;
 }
@@ -150,7 +150,7 @@ toolbarbutton.bookmark-item:not([container]) > .toolbarbutton-text {
   -moz-padding-end: 7px;
 }
 
-toolbarbutton.bookmark-item[chromedir="rtl"] > .toolbarbutton-text {
+toolbarbutton.bookmark-item:-moz-locale-dir(rtl) > .toolbarbutton-text {
   -moz-padding-end: 0;
   -moz-padding-start: 7px;
 }
@@ -170,14 +170,14 @@ toolbarbutton.bookmark-item[container]:not([open]):hover > .toolbarbutton-menu-d
 }
 
 toolbarbutton.bookmark-item[container]:hover > .toolbarbutton-text,
-toolbarbutton.bookmark-item[container][chromedir="rtl"]:not([open]):hover > .toolbarbutton-menu-dropmarker,
+toolbarbutton.bookmark-item[container]:-moz-locale-dir(rtl):not([open]):hover > .toolbarbutton-menu-dropmarker,
 #home-button.bookmark-item:hover > .toolbarbutton-icon,
-#home-button.bookmark-item[chromedir="rtl"]:hover > .toolbarbutton-text {
+#home-button.bookmark-item:-moz-locale-dir(rtl):hover > .toolbarbutton-text {
   background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-mid.png") repeat-x;
 }
 
-#home-button.bookmark-item:hover[chromedir="rtl"] > .toolbarbutton-icon,
-toolbarbutton.bookmark-item[chromedir="rtl"]:hover > .toolbarbutton-text {
+#home-button.bookmark-item:hover:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+toolbarbutton.bookmark-item:-moz-locale-dir(rtl):hover > .toolbarbutton-text {
   background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-right.png") no-repeat right top;
 }
 
@@ -190,15 +190,15 @@ toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-menu-dropma
 toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-text,
 toolbarbutton.bookmark-item[container][open="true"] > .toolbarbutton-text,
 #home-button.bookmark-item:hover:active > .toolbarbutton-icon,
-toolbarbutton.bookmark-item[container][chromedir="rtl"]:hover:active > .toolbarbutton-menu-dropmarker,
-toolbarbutton.bookmark-item[container][chromedir="rtl"][open="true"] > .toolbarbutton-menu-dropmarker,
-#home-button.bookmark-item:hover:active[chromedir="rtl"] > .toolbarbutton-text {
+toolbarbutton.bookmark-item[container]:-moz-locale-dir(rtl):hover:active > .toolbarbutton-menu-dropmarker,
+toolbarbutton.bookmark-item[container]:-moz-locale-dir(rtl)[open="true"] > .toolbarbutton-menu-dropmarker,
+#home-button.bookmark-item:hover:active:-moz-locale-dir(rtl) > .toolbarbutton-text {
   background: url("chrome://browser/skin/bookmark-open-mid.png") repeat-x !important;
 }
 
-toolbarbutton.bookmark-item[chromedir="rtl"][container]:hover:active > .toolbarbutton-text,
-toolbarbutton.bookmark-item[chromedir="rtl"][container][open] > .toolbarbutton-text,
-#home-button.bookmark-item[chromedir="rtl"]:hover:active > .toolbarbutton-icon {
+toolbarbutton.bookmark-item:-moz-locale-dir(rtl)[container]:hover:active > .toolbarbutton-text,
+toolbarbutton.bookmark-item:-moz-locale-dir(rtl)[container][open] > .toolbarbutton-text,
+#home-button.bookmark-item:-moz-locale-dir(rtl):hover:active > .toolbarbutton-icon {
   background: url("chrome://browser/skin/bookmark-open-right.png") no-repeat right top !important;
 }
 
@@ -290,8 +290,8 @@ toolbarbutton.bookmark-item-microsummarized {
   -moz-box-orient: vertical;
 }
 
-.toolbarbutton-1[chromedir="rtl"],
-#back-forward-dropmarker[chromedir="rtl"] {
+.toolbarbutton-1:-moz-locale-dir(rtl),
+#back-forward-dropmarker:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/Toolbar-rtl.png");
 }
 
@@ -375,7 +375,7 @@ toolbar[mode="icons"] #unified-back-forward-button > #back-button {
   border-right: none;
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #back-button[chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 571px, 33px, 540px);
 }
 
@@ -383,7 +383,7 @@ toolbar[mode="icons"] #unified-back-forward-button > #back-button[disabled="true
  -moz-image-region: rect(33px, 535px, 66px, 504px);
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #back-button[disabled="true"][chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #back-button[disabled="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(33px, 571px, 66px, 540px);
 }
 
@@ -392,8 +392,8 @@ toolbar[mode="icons"] #unified-back-forward-button > #back-button[open="true"] {
   -moz-image-region: rect(66px, 535px, 99px, 504px);
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #back-button:hover:active[chromedir="rtl"]:not([disabled]),
-toolbar[mode="icons"] #unified-back-forward-button > #back-button[open="true"][chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #back-button:hover:active:-moz-locale-dir(rtl):not([disabled]),
+toolbar[mode="icons"] #unified-back-forward-button > #back-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(66px, 571px, 99px, 540px);
 }
 
@@ -407,7 +407,7 @@ toolbar[mode="icons"] #unified-back-forward-button > #forward-button {
   border-right: none;
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #forward-button[chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 540px, 33px, 514px);
 }
 
@@ -415,7 +415,7 @@ toolbar[mode="icons"] #unified-back-forward-button > #forward-button[disabled="t
  -moz-image-region: rect(33px, 560px, 66px, 535px);
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #forward-button[disabled="true"][chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button[disabled="true"]:-moz-locale-dir(rtl) {
  -moz-image-region: rect(33px, 540px, 66px, 514px);
 }
 
@@ -425,8 +425,8 @@ toolbar[mode="icons"] #unified-back-forward-button > #forward-button[open="true"
   -moz-margin-start: -5px;
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #forward-button[chromedir="rtl"]:hover:active:not([disabled]),
-toolbar[mode="icons"] #unified-back-forward-button > #forward-button[open="true"][chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl):hover:active:not([disabled]),
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(99px, 545px, 132px, 514px);
 }
 
@@ -440,7 +440,7 @@ toolbar[mode="icons"] #unified-back-forward-button > #forward-button[open="true"
   border-right: none;
 }
 
-#back-forward-dropmarker[chromedir="rtl"] {
+#back-forward-dropmarker:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 514px, 33px, 504px);
 }
 
@@ -458,7 +458,7 @@ toolbar[mode="icons"] #back-forward-dropmarker > dropmarker {
  -moz-image-region: rect(33px, 571px, 66px, 560px);
 }
 
-#back-forward-dropmarker[disabled="true"][chromedir="rtl"] {
+#back-forward-dropmarker[disabled="true"]:-moz-locale-dir(rtl) {
  -moz-image-region: rect(33px, 514px, 66px, 504px);
 }
 
@@ -467,18 +467,18 @@ toolbar[mode="icons"] #back-forward-dropmarker > dropmarker {
   -moz-image-region: rect(66px, 571px, 99px, 560px);
 }
 
-#back-forward-dropmarker[chromedir="rtl"]:hover:active:not([disabled]),
-#back-forward-dropmarker[open="true"][chromedir="rtl"] {
+#back-forward-dropmarker:-moz-locale-dir(rtl):hover:active:not([disabled]),
+#back-forward-dropmarker[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(66px, 514px, 99px, 504px);
 }
 
 .unified-nav-back[_moz-menuactive],
-menupopup[chromedir="rtl"] > .unified-nav-forward[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-forward[_moz-menuactive] {
   list-style-image: url("chrome://browser/skin/menu-back.png") !important;
 }
 
 .unified-nav-forward[_moz-menuactive],
-menupopup[chromedir="rtl"] > .unified-nav-back[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-back[_moz-menuactive] {
   list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
 }
 
@@ -493,7 +493,7 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-but
   border-right: none;
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 648px, 23px, 614px);
 }
 
@@ -501,7 +501,7 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-but
   -moz-image-region: rect(23px, 605px, 46px, 571px);
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[disabled="true"][chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[disabled="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(23px, 648px, 46px, 614px);
 }
 
@@ -510,8 +510,8 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-but
   -moz-image-region: rect(46px, 605px, 69px, 571px);
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[chromedir="rtl"]:hover:active:not([disabled]),
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[open="true"][chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button:-moz-locale-dir(rtl):hover:active:not([disabled]),
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(46px, 648px, 69px, 614px);
 }
 
@@ -525,7 +525,7 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-
   border-right: none;
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 614px, 23px, 580px);
 }
 
@@ -533,7 +533,7 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-
  -moz-image-region: rect(23px, 638px, 46px, 605px);
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[disabled="true"][chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[disabled="true"]:-moz-locale-dir(rtl) {
  -moz-image-region: rect(23px, 614px, 46px, 580px);
 }
 
@@ -543,8 +543,8 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-
   -moz-margin-start: 0;
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[chromedir="rtl"]:hover:active:not([disabled]),
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[open="true"][chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl):hover:active:not([disabled]),
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(46px, 614px, 69px, 580px);
 }
 
@@ -554,7 +554,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   -moz-image-region: rect(0px, 648px, 23px, 638px);
 }
 
-toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[chromedir="rtl"] {
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 580px, 23px, 571px);
 }
 
@@ -562,7 +562,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
  -moz-image-region: rect(23px, 648px, 46px, 638px);
 }
 
-toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[disabled="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[disabled="true"]:-moz-locale-dir(rtl) {
  -moz-image-region: rect(23px, 580px, 46px, 571px);
 }
 
@@ -571,8 +571,8 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   -moz-image-region: rect(46px, 648px, 69px, 638px);
 }
 
-toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[chromedir="rtl"]:hover:active:not([disabled]),
-toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[open="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker:-moz-locale-dir(rtl):hover:active:not([disabled]),
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(46px, 580px, 69px, 571px);
 }
 
@@ -1461,7 +1461,7 @@ toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/icons/chevron.png") !important;
 }
 
-toolbarbutton.chevron[chromedir="rtl"] {
+toolbarbutton.chevron:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/icons/chevron-rtl.png") !important;
 }
 
@@ -1663,15 +1663,15 @@ tabbrowser > tabbox > tabpanels {
   border: none;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-up[chromedir="ltr"],
-.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down[chromedir="rtl"] {
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
+.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down:-moz-locale-dir(rtl) {
   border-right: 2px solid;
   -moz-border-right-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down[chromedir="ltr"],
-.tabbrowser-arrowscrollbox > .scrollbutton-up[chromedir="rtl"] {
+.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down:-moz-locale-dir(ltr),
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
   border-left: 2px solid;
   -moz-border-left-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right.png");
diff --git a/browser/themes/pinstripe/browser/places/organizer.css b/browser/themes/pinstripe/browser/places/organizer.css
index a997a0e6a4a..a5805a92210 100644
--- a/browser/themes/pinstripe/browser/places/organizer.css
+++ b/browser/themes/pinstripe/browser/places/organizer.css
@@ -96,7 +96,7 @@
   border-right: none;
 }
 
-#back-button[chromedir="rtl"] {
+#back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 67px, 23px, 34px);
 }
 
@@ -104,7 +104,7 @@
  -moz-image-region: rect(23px, 34px, 46px, 0px) !important;
 }
 
-#back-button[disabled="true"][chromedir="rtl"] {
+#back-button[disabled="true"]:-moz-locale-dir(rtl) {
  -moz-image-region: rect(23px, 67px, 46px, 34px) !important;
 }
 
@@ -114,9 +114,9 @@
   -moz-image-region: rect(46px, 34px, 69px, 0px);
 }
 
-#back-button:hover:active[chromedir="rtl"],
-#back-button[buttondown="true"][chromedir="rtl"],
-#back-button[open="true"][chromedir="rtl"] {
+#back-button:hover:active:-moz-locale-dir(rtl),
+#back-button[buttondown="true"]:-moz-locale-dir(rtl),
+#back-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(46px, 67px, 69px, 34px);
 }
 
@@ -136,7 +136,7 @@
   border-right: none;
 }
 
-#forward-button[chromedir="rtl"] {
+#forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 34px, 23px, 0px);
 }
 
@@ -144,7 +144,7 @@
   -moz-image-region: rect(23px, 67px, 46px, 34px) !important;
 }
 
-#forward-button[disabled="true"][chromedir="rtl"] {
+#forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(23px, 34px, 46px, 0px) !important;
 }
 
@@ -154,9 +154,9 @@
   -moz-image-region: rect(46px, 67px, 69px, 34px);
 }
 
-#forward-button:hover:active[chromedir="rtl"],
-#forward-button[buttondown="true"][chromedir="rtl"],
-#forward-button[open="true"][chromedir="rtl"] {
+#forward-button:hover:active:-moz-locale-dir(rtl),
+#forward-button[buttondown="true"]:-moz-locale-dir(rtl),
+#forward-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(46px, 34px, 69px, 0px);
 }
 
@@ -169,10 +169,10 @@
   background: url("chrome://browser/skin/places/menubutton-end-pressed.png") right center no-repeat;
 }
 
-#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"] {
+#placesToolbar:-moz-locale-dir(rtl) > toolbarbutton[type="menu"] {
   background: url("chrome://browser/skin/places/menubutton-end-rtl.png") left center no-repeat;
 }
-#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"][open="true"] {
+#placesToolbar:-moz-locale-dir(rtl) > toolbarbutton[type="menu"][open="true"] {
   background: url("chrome://browser/skin/places/menubutton-end-pressed-rtl.png") left center no-repeat;
 }
 
@@ -192,10 +192,10 @@
   background: url("chrome://browser/skin/places/menubutton-start-pressed.png") left center no-repeat;
 }
 
-#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"] > .toolbarbutton-icon {
+#placesToolbar:-moz-locale-dir(rtl) > toolbarbutton[type="menu"] > .toolbarbutton-icon {
   background: url("chrome://browser/skin/places/menubutton-start-rtl.png") right center no-repeat;
 }
-#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"][open="true"] > .toolbarbutton-icon {
+#placesToolbar:-moz-locale-dir(rtl) > toolbarbutton[type="menu"][open="true"] > .toolbarbutton-icon {
   background: url("chrome://browser/skin/places/menubutton-start-pressed-rtl.png") right center no-repeat;
 }
 
diff --git a/browser/themes/pinstripe/browser/searchbar.css b/browser/themes/pinstripe/browser/searchbar.css
index ef80b3b5277..59a7325afb5 100644
--- a/browser/themes/pinstripe/browser/searchbar.css
+++ b/browser/themes/pinstripe/browser/searchbar.css
@@ -45,7 +45,7 @@
   padding: 0;
 }
 
-.searchbar-engine-button[chromedir="rtl"] {
+.searchbar-engine-button:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/urlbar/startcap-rtl.png");
 }
 
@@ -53,7 +53,7 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-focused.png");
 }
 
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"] {
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/urlbar/startcap-focused-rtl.png");
 }
 
@@ -61,7 +61,7 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite.png");
 }
 
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-locale-dir(rtl):-moz-system-metric(mac-graphite-theme) {
   background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite-rtl.png");
 }
 
@@ -70,8 +70,8 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-active.png") !important;
 }
 
-.searchbar-engine-button:hover:active[chromedir="rtl"],
-.searchbar-engine-button[open="true"][chromedir="rtl"] {
+.searchbar-engine-button:hover:active:-moz-locale-dir(rtl),
+.searchbar-engine-button[open="true"]:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/urlbar/startcap-active-rtl.png") !important;
 }
 
@@ -80,8 +80,8 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-active-focused.png") !important;
 }
 
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:active,
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"][chromedir="rtl"] {
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-locale-dir(rtl):active,
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"]:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-rtl.png") !important;
 }
 
@@ -90,8 +90,8 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-graphite.png") !important;
 }
 
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:active:-moz-system-metric(mac-graphite-theme),
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"][chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-locale-dir(rtl):active:-moz-system-metric(mac-graphite-theme),
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"]:-moz-locale-dir(rtl):-moz-system-metric(mac-graphite-theme) {
   background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-graphite-rtl.png") !important;
 }
 
@@ -118,7 +118,7 @@
   -moz-padding-end: 5px;
 }
 
-.search-go-container[chromedir="rtl"] {
+.search-go-container:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/urlbar/endcap-rtl.png");
 }
 
@@ -126,7 +126,7 @@
   background-image: url("chrome://browser/skin/urlbar/endcap-focused.png");
 }
 
-.searchbar-textbox[focused="true"] > .search-go-container[chromedir="rtl"] {
+.searchbar-textbox[focused="true"] > .search-go-container:-moz-locale-dir(rtl) {
   background: url("chrome://browser/skin/urlbar/endcap-focused-rtl.png") no-repeat left top;
 }
 
@@ -134,7 +134,7 @@
   background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite.png");
 }
 
-.searchbar-textbox[focused="true"] > .search-go-container[chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+.searchbar-textbox[focused="true"] > .search-go-container:-moz-locale-dir(rtl):-moz-system-metric(mac-graphite-theme) {
   background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite-rtl.png");
 }
 
diff --git a/browser/themes/winstripe/browser/browser-aero.css b/browser/themes/winstripe/browser/browser-aero.css
index c56d77198b5..8b4176cbfef 100644
--- a/browser/themes/winstripe/browser/browser-aero.css
+++ b/browser/themes/winstripe/browser/browser-aero.css
@@ -18,20 +18,20 @@
 
 /* ::::: Identity Indicator Styling ::::: */
 
-#urlbar[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#urlbar:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-margin-start: 9px;
 }
 
-#identity-box[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#identity-box:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-margin-start: -7px;
 }
 
-#identity-box[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#identity-box:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-border-radius: 11px 0 2px 11px / 15px 0 2px 15px;
 }
 
-/* Match #identity-box[chromedir="ltr"]'s -moz-margin-start */
-#identity-popup[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+/* Match #identity-box:-moz-locale-dir(ltr)'s -moz-margin-start */
+#identity-popup:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-margin-start: 7px;
 }
 
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index aad9b4beab6..1b0af9a5a71 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -248,16 +248,16 @@ toolbar[iconsize="large"][mode="icons"] #back-button:not([disabled="true"]):hove
 
 /* unified back button with keyhole icons, RTL version */
 
-toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"] {
+toolbar[iconsize="large"][mode="icons"] #back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 516px 34px 480px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="large"][mode="icons"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(34px 516px 68px 480px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="large"][mode="icons"] #back-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(68px 516px 102px 480px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="large"][mode="icons"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(102px 516px 136px 480px);
 }
 
@@ -284,16 +284,16 @@ toolbar[iconsize="large"][mode="icons"] #forward-button:not([disabled="true"]):h
 
 /* unified forward button with keyhole icons, RTL version */
 
-toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"] {
+toolbar[iconsize="large"][mode="icons"] #forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(3px 480px 31px 454px);
 }
-toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="large"][mode="icons"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(37px 480px 65px 454px);
 }
-toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="large"][mode="icons"] #forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(71px 480px 99px 454px);
 }
-toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="large"][mode="icons"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(105px 480px 133px 454px);
 }
 
@@ -331,16 +331,16 @@ toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:not([disabled="
 
 /* unified dropmarker with keyhole icons, RTL version */
 
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"] {
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl) {
   -moz-image-region: rect(3px 454px 31px 438px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(37px 454px 65px 438px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(71px 454px 99px 438px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(105px 454px 133px 438px);
 }
 
@@ -368,16 +368,16 @@ toolbar[iconsize="small"][mode="icons"] #back-button:not([disabled="true"]):hove
 
 /* unified back button with keyhole icons, small icons mode, RTL version */
 
-toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"] {
+toolbar[iconsize="small"][mode="icons"] #back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 362px 24px 338px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="small"][mode="icons"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(24px 362px 48px 338px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="small"][mode="icons"] #back-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px 362px 72px 338px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"][mode="icons"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(72px 362px 96px 338px);
 }
 
@@ -398,16 +398,16 @@ toolbar[iconsize="small"][mode="icons"] #forward-button:not([disabled="true"]):h
 
 /* unified forward button with keyhole icons, small icons mode, RTL version */
 
-toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"] {
+toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 338px 24px 314px);
 }
-toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(24px 338px 48px 314px);
 }
-toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px 338px 72px 314px);
 }
-toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(72px 338px 96px 314px);
 }
 
@@ -429,16 +429,16 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:not([disabled="
 
 /* unified dropmarker with keyhole icons, small icons mode, RTL version */
 
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"] {
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 314px 24px 301px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(24px 314px 48px 301px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px 314px 72px 301px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(72px 314px 96px 301px);
 }
 
@@ -460,17 +460,17 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"
   -moz-image-region: rect(96px 24px 120px 0px);
 }
 
-#back-button[chromedir="rtl"] {
+#back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 48px 24px 24px);
 }
-#back-button[chromedir="rtl"]:not([disabled="true"]):hover,
-#back-button[chromedir="rtl"][buttonover="true"] {
+#back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover,
+#back-button:-moz-locale-dir(rtl)[buttonover="true"] {
   -moz-image-region: rect(24px 48px 48px 24px);
 }
-#back-button[chromedir="rtl"][disabled="true"] {
+#back-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px 48px 72px 24px);
 }
-#back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+#back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(96px 48px 120px 24px);
 }
 
@@ -490,17 +490,17 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"
   -moz-image-region: rect(96px 48px 120px 24px);
 }
 
-#forward-button[chromedir="rtl"] {
+#forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 24px 24px 0px); 
 }
-#forward-button[chromedir="rtl"]:not([disabled="true"]):hover,
-#forward-button[chromedir="rtl"][buttonover="true"] {
+#forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover,
+#forward-button:-moz-locale-dir(rtl)[buttonover="true"] {
   -moz-image-region: rect(24px 24px 48px 0px);
 }
-#forward-button[chromedir="rtl"][disabled="true"] {
+#forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px 24px 72px 0px);
 }
-#forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+#forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(96px 24px 120px 0px);
 }
 
@@ -727,21 +727,21 @@ toolbar[iconsize="small"] #back-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 16px 80px 0px);
 }
 
-toolbar[iconsize="small"] #back-button[chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
-toolbar[iconsize="small"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover,
-toolbar[iconsize="small"] #back-button[chromedir="rtl"][buttonover="true"] {
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover,
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl)[buttonover="true"] {
   -moz-image-region: rect(16px 32px 32px 16px);
 }
-toolbar[iconsize="small"] #back-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(32px 32px 48px 16px);
 }
-toolbar[iconsize="small"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 32px 80px 16px);
 }
 .unified-nav-back[_moz-menuactive],
-menupopup[chromedir="rtl"] > .unified-nav-forward[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-forward[_moz-menuactive] {
   list-style-image: url("chrome://browser/skin/menu-back.png") !important;
 }
 
@@ -764,21 +764,21 @@ toolbar[iconsize="small"] #forward-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 32px 80px 16px);
 }
 
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"] {
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover,
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"][buttonover="true"] {
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover,
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl)[buttonover="true"] {
   -moz-image-region: rect(16px 16px 32px 0px);
 }
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(32px 16px 48px 0px);
 }
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 16px 80px 0px);
 }
 .unified-nav-forward[_moz-menuactive],
-menupopup[chromedir="rtl"] > .unified-nav-back[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-back[_moz-menuactive] {
   list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
 }
 
@@ -1101,7 +1101,7 @@ toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
   direction: ltr !important;
 }
 
-#PopupAutoComplete[chromedir="rtl"] > tree > treerows {
+#PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows {
   direction: rtl;
 }
 
@@ -1508,7 +1508,7 @@ tabpanels {
   -moz-border-radius-topright: 2px;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-up[chromedir="rtl"] {
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
   border-left-style: solid;
   border-right-style: none;
   -moz-border-radius-topleft: 2px;
@@ -1527,16 +1527,16 @@ tabpanels {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right.png");
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-down[chromedir="rtl"],
-.tabs-container > .tabs-newtab-button[chromedir="rtl"],
-.tabs-container > stack[chromedir="rtl"] > .tabs-alltabs-button {
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl),
+.tabs-container > .tabs-newtab-button:-moz-locale-dir(rtl),
+.tabs-container > stack:-moz-locale-dir(rtl) > .tabs-alltabs-button {
   border-left-style: none;
   border-right-style: solid;
   -moz-border-radius-topleft: 0px;
   -moz-border-radius-topright: 2px;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-down[chromedir="rtl"] {
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
 }
 
@@ -1592,7 +1592,7 @@ tabpanels {
   opacity: 0.0;
 }
 
-stack[chromedir="rtl"] > hbox > .tabs-alltabs-box-animate {
+stack:-moz-locale-dir(rtl) > hbox > .tabs-alltabs-box-animate {
   background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png");
 }
 
@@ -1643,7 +1643,7 @@ stack[chromedir="rtl"] > hbox > .tabs-alltabs-box-animate {
   -moz-border-radius-topleft: 2px;
 }
 
-.tabs-container > .tabs-closebutton[chromedir="rtl"] {
+.tabs-container > .tabs-closebutton:-moz-locale-dir(rtl) {
   border-left: none;
   border-right: 1px solid threedshadow;
   -moz-border-radius-topleft: 0px;
@@ -1660,7 +1660,7 @@ toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }
 
-toolbarbutton.chevron[chromedir="rtl"] {
+toolbarbutton.chevron:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/toolbar/chevron-rtl.gif") !important;
 }
 
@@ -1712,13 +1712,13 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
   -moz-image-region: rect(0, 26px, 11px, 13px);
 }
 
-#urlbar[chromedir="ltr"] > .autocomplete-history-dropmarker {
+#urlbar:-moz-locale-dir(ltr) > .autocomplete-history-dropmarker {
   border-left: 1px solid;
   -moz-border-left-colors: transparent;
 }
 
-#urlbar[chromedir="ltr"] > .autocomplete-history-dropmarker:hover ,
-#urlbar[chromedir="ltr"] > .autocomplete-history-dropmarker[open="true"] {
+#urlbar:-moz-locale-dir(ltr) > .autocomplete-history-dropmarker:hover ,
+#urlbar:-moz-locale-dir(ltr) > .autocomplete-history-dropmarker[open="true"] {
   -moz-border-left-colors: ButtonShadow;
 }
 
@@ -1802,7 +1802,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 /* ::::: Identity Indicator Styling ::::: */
 /* Location bar visuals*/
 
-#urlbar[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#urlbar:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-margin-start: 6px;
 }
 
@@ -1818,10 +1818,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   -moz-box-shadow: 1px 1px 0 rgba(255,255,255,.3) inset,
                    0 -1px 0 rgba(255,255,255,.2) inset;
 }
-#identity-box[chromedir="rtl"] {
+#identity-box:-moz-locale-dir(ltr) {
   -moz-border-start-style: solid;
 }
-#identity-box[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#identity-box:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-border-radius: 6px 0 2px 6px / 15px 0 2px 15px;
   margin: -1px 0;
   -moz-margin-start: -4px;
@@ -1980,7 +1980,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 /* Bug 413060, comment 14: Match #identity-box's -moz-margin-start, less 1px */
-#identity-popup[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#identity-popup:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-margin-start: 3px;
 }
 
diff --git a/browser/themes/winstripe/browser/places/organizer.css b/browser/themes/winstripe/browser/places/organizer.css
index f2b5d494c1f..6eb2e9d9c16 100644
--- a/browser/themes/winstripe/browser/places/organizer.css
+++ b/browser/themes/winstripe/browser/places/organizer.css
@@ -20,36 +20,36 @@
 }
 
 #back-button,
-#forward-button[chromedir="rtl"] {  
+#forward-button:-moz-locale-dir(rtl) {  
   -moz-image-region: rect(0px, 24px, 24px, 0px);
 }
 #back-button:not([disabled="true"]):hover,
-#forward-button:not([disabled="true"]):hover[chromedir="rtl"] {
+#forward-button:not([disabled="true"]):hover:-moz-locale-dir(rtl) {
   -moz-image-region: rect(24px, 24px, 48px, 0px);
 }
 #back-button[disabled="true"],
-#forward-button[chromedir="rtl"][disabled="true"] {
+#forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px, 24px, 72px, 0px) !important;
 }
 #back-button:not([disabled="true"]):hover:active,
-#forward-button:not([disabled="true"]):hover:active[chromedir="rtl"] {
+#forward-button:not([disabled="true"]):hover:active:-moz-locale-dir(rtl) {
   -moz-image-region: rect(72px, 24px, 96px, 0px);
 }
 
 #forward-button,
-#back-button[chromedir="rtl"] {
+#back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 48px, 24px, 24px);
 }
 #forward-button:not([disabled="true"]):hover,
-#back-button:not([disabled="true"]):hover[chromedir="rtl"] {
+#back-button:not([disabled="true"]):hover:-moz-locale-dir(rtl) {
   -moz-image-region: rect(24px, 48px, 48px, 24px);
 }
 #forward-button[disabled="true"],
-#back-button[chromedir="rtl"][disabled="true"] {
+#back-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px, 48px, 72px, 24px) !important;
 }
 #forward-button:not([disabled="true"]):hover:active,
-#back-button:not([disabled="true"]):hover:active[chromedir="rtl"] {
+#back-button:not([disabled="true"]):hover:active:-moz-locale-dir(rtl) {
   -moz-image-region: rect(72px, 48px, 96px, 24px);
 }
 
@@ -94,7 +94,7 @@
   background: url(chrome://global/skin/arrow/arrow-dn.gif) right center no-repeat;
 }
 
-#placesMenu[chromedir="rtl"] > menu > label {
+#placesMenu:-moz-locale-dir(rtl) > menu > label {
   background-position: left center;
 }
 
diff --git a/browser/themes/winstripe/browser/searchbar.css b/browser/themes/winstripe/browser/searchbar.css
index 7684ba79fa6..6656a4b5044 100644
--- a/browser/themes/winstripe/browser/searchbar.css
+++ b/browser/themes/winstripe/browser/searchbar.css
@@ -45,7 +45,7 @@
                    0 -1px 0 rgba(255,255,255,.4) inset;
 }
 
-.searchbar-engine-button:-moz-system-metric(windows-default-theme)[chromedir="ltr"] {
+.searchbar-engine-button:-moz-system-metric(windows-default-theme):-moz-locale-dir(ltr) {
   -moz-border-right-colors: rgba(0,0,0,.05);
 }
 
@@ -68,7 +68,7 @@
   background: transparent url(chrome://browser/skin/Search-addengines.png) no-repeat right center;
 }
 
-.searchbar-engine-button[addengines="true"][chromedir="rtl"] > .button-box {
+.searchbar-engine-button[addengines="true"]:-moz-locale-dir(rtl) > .button-box {
   background-position: left center;
 }
 
@@ -94,7 +94,7 @@
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-.search-go-button[chromedir="rtl"] {
+.search-go-button:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index 37197b9228e..ea075f5599e 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -105,8 +105,8 @@ class nsIBoxObject;
 
 // IID for the nsIDocument interface
 #define NS_IDOCUMENT_IID      \
-  { 0x46003091, 0x7f99, 0x420f, \
-  { 0x95, 0xbc, 0x28, 0xd7, 0xd5, 0x01, 0x5a, 0x41 } }
+{ 0xe0ca6723, 0x1efa, 0x4819, \
+  { 0x84, 0xbb, 0xfa, 0x48, 0x39, 0xe8, 0xef, 0x19 } }
 
 // Flag for AddStyleSheet().
 #define NS_STYLESHEET_FROM_CATALOG                (1 << 0)
@@ -1156,6 +1156,15 @@ public:
    */
   virtual void MaybePreLoadImage(nsIURI* uri) = 0;
 
+  /**
+   * Returns true if the locale used for the document specifies a direction of
+   * right to left. For chrome documents, this comes from the chrome registry.
+   * This is used to determine the current state for the :-moz-locale-dir pseudoclass
+   * so once can know whether a document is expected to be rendered left-to-right
+   * or right-to-left.
+   */
+  virtual PRBool IsDocumentRightToLeft() { return PR_FALSE; }
+
 protected:
   ~nsIDocument()
   {
diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index d2b6957323c..ac97d1d4043 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -503,6 +503,7 @@ GK_ATOM(listing, "listing")
 GK_ATOM(listitem, "listitem")
 GK_ATOM(listrows, "listrows")
 GK_ATOM(load, "load")
+GK_ATOM(localedir, "localedir")
 GK_ATOM(localName, "local-name")
 GK_ATOM(longdesc, "longdesc")
 #ifdef MOZ_MEDIA
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 3bb92cfc1c7..6ed33863613 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -1119,6 +1119,15 @@ nsXULElement::AfterSetAttr(PRInt32 aNamespaceID, nsIAtom* aName,
             SetTitlebarColor(color, aName == nsGkAtoms::activetitlebarcolor);
         }
 
+        // if the localedir changed on the root element, reset the document direction
+        if (aName == nsGkAtoms::localedir &&
+            document && document->GetRootContent() == this) {
+            nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(document);
+            if (xuldoc) {
+                xuldoc->ResetDocumentDirection();
+            }
+        }
+
         if (aName == nsGkAtoms::src && document) {
             LoadSrc();
         }
@@ -1365,6 +1374,15 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, PRBool aNotify)
             SetTitlebarColor(NS_RGBA(0, 0, 0, 0), aName == nsGkAtoms::activetitlebarcolor);
         }
 
+        // if the localedir changed on the root element, reset the document direction
+        if (aName == nsGkAtoms::localedir &&
+            doc && doc->GetRootContent() == this) {
+            nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(doc);
+            if (xuldoc) {
+                xuldoc->ResetDocumentDirection();
+            }
+        }
+
         // If the accesskey attribute is removed, unregister it here
         // Also see nsXULLabelFrame, nsBoxFrame and nsTextBoxFrame's AttributeChanged
         if (aName == nsGkAtoms::accesskey || aName == nsGkAtoms::control) {
@@ -1793,8 +1811,7 @@ nsXULElement::GetAttributeChangeHint(const nsIAtom* aAttribute,
         retval = NS_STYLE_HINT_FRAMECHANGE;
     } else {
         // if left or top changes we reflow. This will happen in xul
-        // containers that manage positioned children such as a
-        // bulletinboard.
+        // containers that manage positioned children such as a stack.
         if (nsGkAtoms::left == aAttribute || nsGkAtoms::top == aAttribute)
             retval = NS_STYLE_HINT_REFLOW;
     }
diff --git a/content/xul/document/public/nsIXULDocument.h b/content/xul/document/public/nsIXULDocument.h
index bcc30d03a72..a6b04e85d3d 100644
--- a/content/xul/document/public/nsIXULDocument.h
+++ b/content/xul/document/public/nsIXULDocument.h
@@ -122,6 +122,11 @@ public:
    * Callback notifying when a document could not be parsed properly.
    */
   virtual PRBool OnDocumentParserError() = 0;
+
+  /**
+   * Reset the document direction so that it is recomputed.
+   */
+  virtual void ResetDocumentDirection() = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIXULDocument, NS_IXULDOCUMENT_IID)
diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in
index f7db62fb494..f205e1b8772 100644
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@@ -95,7 +95,10 @@ include $(topsrcdir)/config/rules.mk
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		  -I$(srcdir)/../../content/src \
 		  -I$(srcdir)/../../templates/src \
+		  -I$(srcdir)/../../../../layout/base \
+		  -I$(srcdir)/../../../../layout/generic \
 		  -I$(srcdir)/../../../../layout/style \
+		  -I$(srcdir)/../../../../layout/xul/base/src \
 		  -I$(srcdir)/../../../xml/document/src \
 		  -I$(srcdir)/../../../events/src \
 		  $(NULL)
diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp
index 51535642bf0..b3be0dd04bd 100644
--- a/content/xul/document/src/nsXULDocument.cpp
+++ b/content/xul/document/src/nsXULDocument.cpp
@@ -126,6 +126,7 @@
 #include "nsXULPopupManager.h"
 #include "nsCCUncollectableMarker.h"
 #include "nsURILoader.h"
+#include "nsCSSFrameConstructor.h"
 
 //----------------------------------------------------------------------
 //
@@ -222,6 +223,7 @@ nsRefMapEntry::RemoveContent(nsIContent* aContent)
 
 nsXULDocument::nsXULDocument(void)
     : nsXMLDocument("application/vnd.mozilla.xul+xml"),
+      mDocDirection(Direction_Uninitialized),
       mState(eState_Master),
       mResolutionPhase(nsForwardReference::eStart)
 {
@@ -260,6 +262,10 @@ nsXULDocument::~nsXULDocument()
 
     delete mTemplateBuilderTable;
 
+    nsContentUtils::UnregisterPrefCallback("intl.uidirection.",
+                                           nsXULDocument::DirectionChanged,
+                                           this);
+
     if (--gRefCnt == 0) {
         NS_IF_RELEASE(gRDFService);
 
@@ -1989,6 +1995,10 @@ nsXULDocument::Init()
         }
     }
 
+    nsContentUtils::RegisterPrefCallback("intl.uidirection.",
+                                         nsXULDocument::DirectionChanged,
+                                         this);
+
 #ifdef PR_LOGGING
     if (! gXULLog)
         gXULLog = PR_NewLogModule("nsXULDocument");
@@ -4627,6 +4637,100 @@ nsXULDocument::GetFocusController(nsIFocusController** aFocusController)
         *aFocusController = nsnull;
 }
 
+PRBool
+nsXULDocument::IsDocumentRightToLeft()
+{
+    if (mDocDirection == Direction_Uninitialized) {
+        mDocDirection = Direction_LeftToRight; // default to ltr on failure
+
+        // setting the localedir attribute on the root element forces a
+        // specific direction for the document.
+        nsIContent* content = GetRootContent();
+        if (content) {
+            static nsIContent::AttrValuesArray strings[] =
+                {&nsGkAtoms::ltr, &nsGkAtoms::rtl, nsnull};
+            switch (content->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::localedir,
+                                             strings, eCaseMatters)) {
+                case 0: mDocDirection = Direction_LeftToRight; return PR_FALSE;
+                case 1: mDocDirection = Direction_RightToLeft; return PR_TRUE;
+                default: break;// otherwise, not a valid value, so fall through
+            }
+        }
+
+        // otherwise, get the locale from the chrome registry and
+        // look up the intl.uidirection.<locale> preference
+        nsCOMPtr<nsIXULChromeRegistry> reg =
+            do_GetService(NS_CHROMEREGISTRY_CONTRACTID);
+        if (reg) {
+            nsCAutoString package;
+            PRBool isChrome;
+            if (NS_SUCCEEDED(mDocumentURI->SchemeIs("chrome", &isChrome)) &&
+                isChrome) {
+                mDocumentURI->GetHostPort(package);
+            }
+            else {
+                // use the 'global' package for about and resource uris.
+                // otherwise, just default to left-to-right.
+                PRBool isAbout, isResource;
+                if (NS_SUCCEEDED(mDocumentURI->SchemeIs("about", &isAbout)) &&
+                    isAbout) {
+                    package.AssignLiteral("global");
+                }
+                else if (NS_SUCCEEDED(mDocumentURI->SchemeIs("resource", &isResource)) &&
+                    isResource) {
+                    package.AssignLiteral("global");
+                }
+                else {
+                    return PR_FALSE;
+                }
+            }
+
+            nsCAutoString locale;
+            reg->GetSelectedLocale(package, locale);
+            if (locale.Length() >= 2) {
+                // first check the intl.uidirection.<locale> preference,
+                // and if that is not set, check the same preference but
+                // with just the first two characters of the locale. If
+                // that isn't set, default to left-to-right.
+                nsCAutoString prefString =
+                    NS_LITERAL_CSTRING("intl.uidirection.") + locale;
+                nsAdoptingCString dir = nsContentUtils::GetCharPref(prefString.get());
+                if (dir.IsEmpty()) {
+                    PRInt32 hyphen = prefString.FindChar('-');
+                    if (hyphen >= 1) {
+                        nsCAutoString shortPref(Substring(prefString, 0, hyphen));
+                        dir = nsContentUtils::GetCharPref(shortPref.get());
+                    }
+                }
+
+                mDocDirection = dir.EqualsLiteral("rtl") ?
+                                Direction_RightToLeft : Direction_LeftToRight;
+            }
+        }
+    }
+
+    return (mDocDirection == Direction_RightToLeft);
+}
+
+int
+nsXULDocument::DirectionChanged(const char* aPrefName, void* aData)
+{
+  // reset the direction and reflow the document. This will happen if
+  // the direction isn't actually being used, but that doesn't really
+  // matter too much
+  nsXULDocument* doc = (nsXULDocument *)aData;
+  if (doc)
+      doc->ResetDocumentDirection();
+
+  nsIPresShell *shell = doc->GetPrimaryShell();
+  if (shell) {
+      shell->FrameConstructor()->
+          PostRestyleEvent(doc->GetRootContent(), eReStyle_Self, NS_STYLE_HINT_NONE);
+  }
+
+  return 0;
+}
+
 NS_IMETHODIMP
 nsXULDocument::GetBoxObjectFor(nsIDOMElement* aElement, nsIBoxObject** aResult)
 {
diff --git a/content/xul/document/src/nsXULDocument.h b/content/xul/document/src/nsXULDocument.h
index 447aa843ecc..48c26ccd080 100644
--- a/content/xul/document/src/nsXULDocument.h
+++ b/content/xul/document/src/nsXULDocument.h
@@ -182,6 +182,10 @@ public:
 
     virtual void EndUpdate(nsUpdateType aUpdateType);
 
+    virtual PRBool IsDocumentRightToLeft();
+
+    virtual void ResetDocumentDirection() { mDocDirection = Direction_Uninitialized; }
+
     static PRBool
     MatchAttribute(nsIContent* aContent,
                    PRInt32 aNameSpaceID,
@@ -244,7 +248,8 @@ protected:
         return kNameSpaceID_XUL;
     }
 
-protected:
+    static NS_HIDDEN_(int) DirectionChanged(const char* aPrefName, void* aData);
+
     // pseudo constants
     static PRInt32 gRefCnt;
 
@@ -326,6 +331,17 @@ protected:
 
     nsCOMPtr<nsIDOMNode>    mTooltipNode;          // [OWNER] element triggering the tooltip
 
+    /**
+     * document direction for use with the -moz-locale-dir property
+     */
+    enum DocumentDirection {
+      Direction_Uninitialized, // not determined yet
+      Direction_LeftToRight,
+      Direction_RightToLeft
+    };
+
+    DocumentDirection               mDocDirection;
+
     /**
      * Context stack, which maintains the state of the Builder and allows
      * it to be interrupted.
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 4c340b795fe..e30a329af8b 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -3313,6 +3313,14 @@ CSSParserImpl::ParsePseudoClassWithIdentArg(nsCSSSelector& aSelector,
     return eSelectorParsingStatus_Error;
   }
 
+  // -moz-locale-dir can only have values of 'ltr' or 'rtl'.
+  if (aPseudo == nsCSSPseudoClasses::mozLocaleDir) {
+    if (!mToken.mIdent.EqualsLiteral("ltr") &&
+        !mToken.mIdent.EqualsLiteral("rtl")) {
+      return eSelectorParsingStatus_Error;
+    }
+  }
+
   // Add the pseudo with the language parameter
   aSelector.AddPseudoClass(aPseudo, mToken.mIdent.get());
 
diff --git a/layout/style/nsCSSPseudoClassList.h b/layout/style/nsCSSPseudoClassList.h
index 113b67fbb45..d61c97bddd3 100644
--- a/layout/style/nsCSSPseudoClassList.h
+++ b/layout/style/nsCSSPseudoClassList.h
@@ -104,6 +104,10 @@ CSS_PSEUDO_CLASS(mozIsHTML, ":-moz-is-html")
 // Matches anything when the specified look-and-feel metric is set
 CSS_PSEUDO_CLASS(mozSystemMetric, ":-moz-system-metric")
 
+// -moz-locale-dir(ltr) and -moz-locale-dir(rtl) may be used
+// to match based on the locale's chrome direction
+CSS_PSEUDO_CLASS(mozLocaleDir, ":-moz-locale-dir")
+
 #ifdef MOZ_MATHML
 CSS_PSEUDO_CLASS(mozMathIncrementScriptLevel, ":-moz-math-increment-script-level")
 #endif
diff --git a/layout/style/nsCSSPseudoClasses.cpp b/layout/style/nsCSSPseudoClasses.cpp
index bff32293bc6..a37e17f1585 100644
--- a/layout/style/nsCSSPseudoClasses.cpp
+++ b/layout/style/nsCSSPseudoClasses.cpp
@@ -73,7 +73,8 @@ nsCSSPseudoClasses::HasStringArg(nsIAtom* aAtom)
 {
   return aAtom == nsCSSPseudoClasses::lang ||
          aAtom == nsCSSPseudoClasses::mozEmptyExceptChildrenWithLocalname ||
-         aAtom == nsCSSPseudoClasses::mozSystemMetric;
+         aAtom == nsCSSPseudoClasses::mozSystemMetric ||
+         aAtom == nsCSSPseudoClasses::mozLocaleDir;
 }
 
 PRBool
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index 30323316a7f..a25fcafc9e7 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -1558,6 +1558,27 @@ static PRBool SelectorMatches(RuleProcessorData &data,
     else if (nsCSSPseudoClasses::mozIsHTML == pseudoClass->mAtom) {
       result = data.mIsHTMLContent && data.mContent->IsInHTMLDocument();
     }
+    else if (nsCSSPseudoClasses::mozLocaleDir == pseudoClass->mAtom) {
+      nsIDocument* doc = data.mContent ? data.mContent->GetDocument() :
+                                         data.mPresContext->Document();
+
+      if (doc) {
+        PRBool docIsRTL = doc && doc->IsDocumentRightToLeft();
+
+        nsDependentString dirString(pseudoClass->u.mString);
+        NS_ASSERTION(dirString.EqualsLiteral("ltr") || dirString.EqualsLiteral("rtl"),
+                     "invalid value for -moz-locale-dir");
+
+        if (dirString.EqualsLiteral("rtl")) {
+          result = docIsRTL;
+        } else if (dirString.EqualsLiteral("ltr")) {
+          result = !docIsRTL;
+        }
+      }
+      else {
+        result = PR_FALSE;
+      }
+    }
 #ifdef MOZ_MATHML
     else if (nsCSSPseudoClasses::mozMathIncrementScriptLevel == pseudoClass->mAtom) {
       stateToCheck = NS_EVENT_STATE_INCREMENT_SCRIPT_LEVEL;
@@ -2069,6 +2090,14 @@ nsCSSRuleProcessor::HasAttributeDependentStyle(AttributeRuleProcessorData* aData
   // XXXbz now that :link and :visited are also states, do we need a
   // similar optimization in HasStateDependentStyle?
 
+  // check for the localedir attribute on root XUL elements
+  if (aData->mAttribute == nsGkAtoms::localedir &&
+      aData->mNameSpaceID == kNameSpaceID_XUL &&
+      aData->mContent == aData->mContent->GetOwnerDoc()->GetRootContent())
+  {
+    data.change = nsReStyleHint(data.change | eReStyle_Self);
+  }
+
   RuleCascadeData* cascade = GetRuleCascade(aData->mPresContext);
 
   // We do the same thing for attributes that we do for state selectors
diff --git a/layout/style/test/test_selectors.html b/layout/style/test/test_selectors.html
index 63b72a8b261..d7a477066e2 100644
--- a/layout/style/test/test_selectors.html
+++ b/layout/style/test/test_selectors.html
@@ -632,6 +632,16 @@ function run() {
     test_selector_in_html("html|a:not(*|a)", single_a, empty_set, set_single,
                           xul_default_ns + html_ns);
 
+    // Test -moz-locale-dir
+    test_parseable(":-moz-locale-dir(ltr)");
+    test_parseable(":-moz-locale-dir(rtl)");
+
+    test_balanced_unparseable(":-moz-locale-dir(other)");
+    test_balanced_unparseable(":-moz-locale-dir()");
+    test_balanced_unparseable(":-moz-locale-dir('ltr')");
+    test_balanced_unparseable(":-moz-locale-dir(ltr, other)");
+    test_balanced_unparseable(":-moz-locale-dir");
+
     run_deferred_tests();
 }
 
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index a5bae40372b..4bd02803f00 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -910,6 +910,11 @@ pref("intl.locale.matchOS",                 false);
 pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
 pref("font.language.group",                 "chrome://global/locale/intl.properties");
 
+// these locales have right-to-left UI
+pref("intl.uidirection.ar", "rtl");
+pref("intl.uidirection.he", "rtl");
+pref("intl.uidirection.fa", "rtl");
+
 pref("font.mathfont-family", "STIXNonUnicode, STIXSize1, STIXGeneral, Standard Symbols L, DejaVu Sans, Cambria Math");
 
 // Some CJK fonts have bad underline offset, their CJK character glyphs are overlapped (or adjoined)  to its underline.
diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 0492b185587..9a8a78e50ca 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -45,7 +45,6 @@
 
 <!DOCTYPE window [
   <!ENTITY % console SYSTEM "chrome://global/locale/console.dtd"> %console;
-  <!ENTITY % global SYSTEM "chrome://global/locale/global.dtd"> %global;
 ]>
 
 <window id="JSConsoleWindow"
@@ -93,9 +92,9 @@
     </popup>
   </popupset>
   
-  <toolbox id="console-toolbox" chromedir="&locale.dir;">
+  <toolbox id="console-toolbox">
     <toolbar class="chromeclass-toolbar" id="ToolbarMode">
-      <hbox id="viewGroup" chromedir="&locale.dir;">
+      <hbox id="viewGroup">
         <toolbarbutton type="radio" group="mode" id="Console:modeAll" 
                        label="&all.label;" accesskey="&all.accesskey;"
                        oncommand="changeMode('All');"/>
diff --git a/toolkit/components/help/content/help.xul b/toolkit/components/help/content/help.xul
index fab7524a2eb..cf3a766cfae 100644
--- a/toolkit/components/help/content/help.xul
+++ b/toolkit/components/help/content/help.xul
@@ -46,8 +46,6 @@
     %brandDTD;
     <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
     %helpDTD;
-    <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-    %globalDTD;
 ]>
 
 <window id="help"
@@ -153,20 +151,18 @@
                 src="chrome://help/locale/help.properties"/>
 
     <toolbox id="help-toolbox" class="toolbox-top">
-      <toolbar id="HelpToolbar" class="chromeclass-toolbar" chromedir="&locale.dir;">
+      <toolbar id="HelpToolbar" class="chromeclass-toolbar">
         <toolbarbutton id="help-back-button" type="menu-button"
                        label="&backButton.label;"
                        oncommand="if (event.target == this) goBack(); else gotoHistoryIndex(event);"
                        observes="canGoBack" context="backMenu"
-                       tooltiptext="&backButton.tooltip;"
-                       chromedir="&locale.dir;">
+                       tooltiptext="&backButton.tooltip;">
           <menupopup context="" onpopupshowing="createBackMenu(event);"/>
         </toolbarbutton>
         <toolbarbutton id="help-forward-button" type="menu-button"
                        oncommand="if (event.target == this) goForward(); else gotoHistoryIndex(event);"
                        tooltiptext="&forwardButton.tooltip;"
-                       observes="canGoForward"
-                       chromedir="&locale.dir;">
+                       observes="canGoForward">
           <menupopup context="" onpopupshowing="createForwardMenu(event);"/>
         </toolbarbutton>
         <toolbarbutton id="help-home-button"
diff --git a/toolkit/components/help/content/helpContextOverlay.xul b/toolkit/components/help/content/helpContextOverlay.xul
index 4dff985f32a..9f9af91e75a 100644
--- a/toolkit/components/help/content/helpContextOverlay.xul
+++ b/toolkit/components/help/content/helpContextOverlay.xul
@@ -38,8 +38,6 @@
 <!DOCTYPE overlay [
     <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
     %helpDTD;
-    <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-    %globalDTD;
 ]>
 <overlay id="contentAreaContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -52,13 +50,11 @@
                 label="&backButton.label;"
                 accesskey="&backButton.accesskey;"
                 observes="canGoBack"
-                chromedir="&locale.dir;"
                 oncommand="goBack()"/>
       <menuitem id="context-forward"
                 label="&forwardButton.label;"
                 accesskey="&forwardButton.accesskey;"
                 observes="canGoForward"
-                chromedir="&locale.dir;"
                 oncommand="goForward()"/>
       <menuseparator/>
       <menuitem id="context-copy"
diff --git a/toolkit/components/printing/content/printPreviewBindings.xml b/toolkit/components/printing/content/printPreviewBindings.xml
index 55ddc116425..94d597fea40 100644
--- a/toolkit/components/printing/content/printPreviewBindings.xml
+++ b/toolkit/components/printing/content/printPreviewBindings.xml
@@ -42,8 +42,6 @@
 <!DOCTYPE bindings [
 <!ENTITY % printPreviewDTD SYSTEM "chrome://global/locale/printPreview.dtd" >
 %printPreviewDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 ]>
 
 <bindings id="printPreviewBindings"
@@ -66,9 +64,9 @@
       <xul:vbox align="center" pack="center">
         <xul:label value="&page.label;" accesskey="&page.accesskey;" control="pageNumber"/>
       </xul:vbox>
-      <xul:toolbarbutton class="home-arrow tabbable" chromedir="&locale.dir;"
+      <xul:toolbarbutton class="home-arrow tabbable"
         oncommand="parentNode.navigate(0, 0, 'home');" tooltiptext="&homearrow.tooltip;"/>
-      <xul:toolbarbutton class="left-arrow tabbable" chromedir="&locale.dir;"
+      <xul:toolbarbutton class="left-arrow tabbable"
         oncommand="parentNode.navigate(-1, 0, 0);" tooltiptext="&leftarrow.tooltip;"/>
       <xul:hbox align="center" pack="center">
         <xul:textbox id="pageNumber" size="3" value="1" lastvalid="1"
@@ -76,9 +74,9 @@
         <xul:label value="&of.label;"/>
         <xul:label value="1"/>
       </xul:hbox>
-      <xul:toolbarbutton class="right-arrow tabbable" chromedir="&locale.dir;"
+      <xul:toolbarbutton class="right-arrow tabbable"
         oncommand="parentNode.navigate(1, 0, 0);" tooltiptext="&rightarrow.tooltip;"/>
-      <xul:toolbarbutton class="end-arrow tabbable" chromedir="&locale.dir;"
+      <xul:toolbarbutton class="end-arrow tabbable"
         oncommand="parentNode.navigate(0, 0, 'end');" tooltiptext="&endarrow.tooltip;"/>
 
       <xul:toolbarseparator class="toolbarseparator-primary"/>
diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in
index eb3b95defd4..24415d55f44 100644
--- a/toolkit/content/tests/chrome/Makefile.in
+++ b/toolkit/content/tests/chrome/Makefile.in
@@ -42,6 +42,9 @@ VPATH		= @srcdir@
 relativesrcdir  = toolkit/content/tests/chrome
 
 include $(DEPTH)/config/autoconf.mk
+
+DIRS = rtltest
+
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = 	findbar_window.xul \
@@ -86,6 +89,7 @@ _TEST_FILES = 	findbar_window.xul \
 		test_keys.xul \
 		window_keys.xul \
 		test_showcaret.xul \
+		test_righttoleft.xul \
 		$(NULL)
 
 # test_panel_focus.xul won't work if the Full Keyboard Access preference is set to
diff --git a/toolkit/content/tests/chrome/rtltest/Makefile.in b/toolkit/content/tests/chrome/rtltest/Makefile.in
new file mode 100644
index 00000000000..6bfec3fc203
--- /dev/null
+++ b/toolkit/content/tests/chrome/rtltest/Makefile.in
@@ -0,0 +1,49 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2009
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+relativesrcdir  = toolkit/content/tests/chrome/rtltest
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+libs:: righttoleft.manifest dirtest.xul
+	$(INSTALL) @srcdir@/righttoleft.manifest $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/
+	$(INSTALL) @srcdir@/dirtest.xul $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/content/
diff --git a/toolkit/content/tests/chrome/rtltest/dirtest.xul b/toolkit/content/tests/chrome/rtltest/dirtest.xul
new file mode 100644
index 00000000000..b75d41eaa3a
--- /dev/null
+++ b/toolkit/content/tests/chrome/rtltest/dirtest.xul
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window xmlns:html="http://www.w3.org/1999/xhtml"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<html:style>
+hbox, vbox { background-color: white; }
+hbox:-moz-locale-dir(ltr) { background-color: yellow; }
+vbox:-moz-locale-dir(rtl) { background-color: green; }
+</html:style>
+
+<hbox id="hbox">
+  <button label="One"/>
+  <button label="Two"/>
+  <button label="Three"/>
+</hbox>
+<vbox id="vbox">
+  <button label="One"/>
+  <button label="Two"/>
+  <button label="Three"/>
+</vbox>
+
+</window>
diff --git a/toolkit/content/tests/chrome/rtltest/righttoleft.manifest b/toolkit/content/tests/chrome/rtltest/righttoleft.manifest
new file mode 100644
index 00000000000..db98656bce2
--- /dev/null
+++ b/toolkit/content/tests/chrome/rtltest/righttoleft.manifest
@@ -0,0 +1,3 @@
+content ltrtest content/
+content rtltest content/
+locale rtltest ar-QA content/
diff --git a/toolkit/content/tests/chrome/test_righttoleft.xul b/toolkit/content/tests/chrome/test_righttoleft.xul
new file mode 100644
index 00000000000..3deb6d0140e
--- /dev/null
+++ b/toolkit/content/tests/chrome/test_righttoleft.xul
@@ -0,0 +1,217 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet 
+  href="chrome://mochikit/content/tests/SimpleTest/test.css"
+  type="text/css"?>
+
+<window title="Right to Left UI Test"
+        onload="runTest()"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script type="application/javascript" 
+          src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" 
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+  <body  xmlns="http://www.w3.org/1999/xhtml">
+    <p id="display"></p>
+    <div id="content" style="display: none">
+    </div>
+    <pre id="test">
+    </pre>
+  </body>
+
+  <iframe id="subframe" width="100" height="100" onload="frameLoaded();"/>
+
+  <script type="application/javascript">
+    <![CDATA[
+
+      /* This code is mostly copied from chrome/test/unit/head_crtestutils.js */
+      const NS_CHROME_MANIFESTS_FILE_LIST = "ChromeML";
+
+      const Cc = Components.classes;
+      const Ci = Components.interfaces;
+      const Cr = Components.results;
+
+      function ArrayEnumerator(array)
+      {
+        this.array = array;
+      }
+
+      ArrayEnumerator.prototype = {
+        pos: 0,
+        
+        hasMoreElements: function() {
+          return this.pos < this.array.length;
+        },
+        
+        getNext: function() {
+          if (this.pos < this.array.length)
+            return this.array[this.pos++];
+          throw Cr.NS_ERROR_FAILURE;
+        },
+
+        QueryInterface: function(iid) {
+          if (iid.equals(Ci.nsISimpleEnumerator)
+           || iid.equals(Ci.nsISupports))
+            return this;
+
+          throw Cr.NS_ERROR_NO_INTERFACE;
+        }
+      };
+
+      function ChromeProvider(manifests)
+      {
+        this._manifests = manifests;
+      }
+
+      ChromeProvider.prototype = {
+        getFile: function(prop, persistent) {
+          throw Cr.NS_ERROR_FAILURE;
+        },
+
+        getFiles: function(prop) {
+          if (prop == NS_CHROME_MANIFESTS_FILE_LIST) {
+            return new ArrayEnumerator(this._manifests);
+          }
+          throw Cr.NS_ERROR_FAILURE;
+        },
+
+        QueryInterface: function(iid) {
+          if (iid.equals(Ci.nsIDirectoryServiceProvider)
+           || iid.equals(Ci.nsIDirectoryServiceProvider2)
+           || iid.equals(Ci.nsISupports))
+            return this;
+
+          throw Cr.NS_ERROR_NO_INTERFACE;
+        }
+      };
+
+      let dirSvc = Cc["@mozilla.org/file/directory_service;1"].
+                   getService(Ci.nsIDirectoryService);
+      function registerManifests(manifests)
+      {
+        let provider = new ChromeProvider(manifests);
+        dirSvc.registerProvider(provider);
+        return provider;
+      }
+
+      SimpleTest.waitForExplicitFinish();
+
+      // Disable XUL cache temporarily
+      let prefs = Cc["@mozilla.org/preferences-service;1"].
+                  getService(Ci.nsIPrefBranch);
+      const XUL_CACHE_PREF = "nglayout.debug.disable_xul_cache";
+      const UI_DIRECTION_PREF = "intl.uidirection.ar";
+      prefs.setBoolPref(XUL_CACHE_PREF, true);
+      prefs.setCharPref(UI_DIRECTION_PREF, "rtl");
+
+      // Register our manifest
+      let cr = Cc["@mozilla.org/chrome/chrome-registry;1"].
+               getService(Ci.nsIXULChromeRegistry);
+      let manifests = [];
+      let currentManifests = dirSvc.QueryInterface(Ci.nsIProperties)
+                                   .get(NS_CHROME_MANIFESTS_FILE_LIST,
+                                        Ci.nsISimpleEnumerator);
+      while (currentManifests.hasMoreElements())
+        manifests.push(currentManifests.getNext());
+
+      let ioService = Cc["@mozilla.org/network/io-service;1"].
+                        getService(Ci.nsIIOService);
+
+      let uri = ioService.newURI("chrome://mochikit/content/chrome/toolkit/content/tests/chrome/rtltest/", null, null);
+      uri = cr.convertChromeURL(uri);
+      let newChromePath = uri.QueryInterface(Ci.nsIFileURL).file;
+      manifests.push(newChromePath);
+      let provider = registerManifests(manifests);
+      cr.checkForNewChrome();
+      cr.refreshSkins();
+
+      function runTest()
+      {
+        var subframe = document.getElementById("subframe");
+        subframe.setAttribute("src", "chrome://ltrtest/content/dirtest.xul");
+      }
+
+      function frameLoaded()
+      {
+        var subframe = document.getElementById("subframe");
+        var subwin = subframe.contentWindow;
+        var subdoc = subframe.contentDocument;
+        var url = String(subwin.location);
+        if (url.indexOf("chrome://ltrtest") == 0) {
+          is(subwin.getComputedStyle(subdoc.getElementById("hbox"), "").backgroundColor,
+             "rgb(255, 255, 0)", "left to right with :-moz-locale-dir(ltr)");
+          is(subwin.getComputedStyle(subdoc.getElementById("vbox"), "").backgroundColor,
+             "rgb(255, 255, 255)", "left to right with :-moz-locale-dir(rtl)");
+
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "ltr",
+             "left to right direction");
+
+          subdoc.documentElement.setAttribute("localedir", "rtl");
+
+          is(subwin.getComputedStyle(subdoc.getElementById("hbox"), "").backgroundColor,
+             "rgb(255, 255, 255)", "left to right with :-moz-locale-dir(ltr) and localedir='rtl'");
+          is(subwin.getComputedStyle(subdoc.getElementById("vbox"), "").backgroundColor,
+             "rgb(0, 128, 0)", "left to right with :-moz-locale-dir(rtl) and localedir='rtl'");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "rtl",
+             "left to right direction with localedir='rtl'");
+
+          subdoc.documentElement.removeAttribute("localedir");
+
+          is(subwin.getComputedStyle(subdoc.getElementById("hbox"), "").backgroundColor,
+             "rgb(255, 255, 0)", "left to right with :-moz-locale-dir(ltr) and localedir removed");
+          is(subwin.getComputedStyle(subdoc.getElementById("vbox"), "").backgroundColor,
+             "rgb(255, 255, 255)", "left to right with :-moz-locale-dir(rtl) and localedir removed");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "ltr",
+             "left to right direction with localedir removed");
+
+          subframe.setAttribute("src", "chrome://rtltest/content/dirtest.xul");
+        }
+        else if (url.indexOf("chrome://rtltest") == 0) {
+          is(subwin.getComputedStyle(subdoc.getElementById("hbox"), "").backgroundColor,
+             "rgb(255, 255, 255)", "right to left with :-moz-locale-dir(ltr)");
+          is(subwin.getComputedStyle(subdoc.getElementById("vbox"), "").backgroundColor,
+             "rgb(0, 128, 0)", "right to left with :-moz-locale-dir(rtl)");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "rtl",
+             "right to left direction");
+
+          subdoc.documentElement.setAttribute("localedir", "ltr");
+
+          is(subwin.getComputedStyle(subdoc.getElementById("hbox"), "").backgroundColor,
+             "rgb(255, 255, 0)", "right to left with :-moz-locale-dir(ltr) and localedir='ltr'");
+          is(subwin.getComputedStyle(subdoc.getElementById("vbox"), "").backgroundColor,
+             "rgb(255, 255, 255)", "right to left with :-moz-locale-dir(rtl) and localedir='ltr'");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "ltr",
+             "right to left direction with localedir='ltr'");
+
+          subdoc.documentElement.removeAttribute("localedir");
+
+          prefs.setCharPref(UI_DIRECTION_PREF, "");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "ltr",
+             "left to right direction with no preference set");
+          prefs.setCharPref(UI_DIRECTION_PREF + "-QA", "rtl");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "rtl",
+             "right to left direction with more specific preference set");
+          prefs.setCharPref(UI_DIRECTION_PREF, "ltr");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "rtl",
+             "right to left direction with less specific and more specific preference set");
+          prefs.setCharPref(UI_DIRECTION_PREF, "rtl");
+          prefs.setCharPref(UI_DIRECTION_PREF + "-QA", "ltr");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "ltr",
+             "left to right direction specific preference overrides");
+          prefs.clearUserPref(UI_DIRECTION_PREF + "-QA");
+
+          dirSvc.unregisterProvider(provider);
+          cr.checkForNewChrome();
+          cr.refreshSkins();
+          prefs.clearUserPref(XUL_CACHE_PREF);
+          prefs.clearUserPref(UI_DIRECTION_PREF);
+
+          SimpleTest.finish();
+        }
+      }
+    ]]>
+  </script>
+
+</window>
diff --git a/toolkit/content/textbox.css b/toolkit/content/textbox.css
index e6bfa93770a..daf885d028d 100644
--- a/toolkit/content/textbox.css
+++ b/toolkit/content/textbox.css
@@ -20,8 +20,8 @@ textbox[isempty="true"] html|*.textbox-textarea {
   direction: ltr;
 }
 
-textbox[isempty="true"][chromedir="rtl"] html|*.textbox-input ,
-textbox[isempty="true"][chromedir="rtl"] html|*.textbox-textarea {
+textbox[isempty="true"]:-moz-locale-dir(rtl) html|*.textbox-input ,
+textbox[isempty="true"]:-moz-locale-dir(rtl) html|*.textbox-textarea {
   text-align: right;
   direction: rtl;
 }
diff --git a/toolkit/content/widgets/datetimepicker.xml b/toolkit/content/widgets/datetimepicker.xml
index 594672242f1..9119ec84041 100644
--- a/toolkit/content/widgets/datetimepicker.xml
+++ b/toolkit/content/widgets/datetimepicker.xml
@@ -39,8 +39,6 @@
 <!DOCTYPE bindings [
   <!ENTITY % datetimepickerDTD SYSTEM "chrome://global/locale/datetimepicker.dtd">
   %datetimepickerDTD;
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
 ]>
 
 <bindings id="timepickerBindings"
@@ -64,24 +62,24 @@
                 xbl:inherits="context">
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-one"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-first" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-two"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-second" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-three"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-ampm"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
       </xul:hbox>
@@ -853,7 +851,7 @@
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
         <hbox class="datepicker-monthbox" align="center">
           <button class="datepicker-previous datepicker-button" type="repeat"
-                  chromedir="&locale.dir;" xbl:inherits="disabled"
+                  xbl:inherits="disabled"
                   oncommand="document.getBindingParent(this)._increaseOrDecreaseMonth(-1);"/>
           <spacer flex="1"/>
           <deck anonid="monthlabeldeck">
@@ -873,7 +871,7 @@
           <label anonid="yearlabel" class="datepicker-gridlabel"/>
           <spacer flex="1"/>
           <button class="datepicker-next datepicker-button" type="repeat"
-                  chromedir="&locale.dir;" xbl:inherits="disabled"
+                  xbl:inherits="disabled"
                   oncommand="document.getBindingParent(this)._increaseOrDecreaseMonth(1);"/>
         </hbox>
         <grid class="datepicker-grid" role="grid">
@@ -1207,24 +1205,24 @@
                 allowevents="true" xbl:inherits="context">
         <xul:hbox class="datetimepicker-input-subbox" align="baseline">
           <html:input class="datetimepicker-input textbox-input" anonid="input-one"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-first" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="datetimepicker-input-subbox" align="baseline">
           <html:input class="datetimepicker-input textbox-input" anonid="input-two"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-second" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-three"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:hbox class="datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-ampm"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;" 
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
       </xul:hbox>
diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml
index 07ead86fd4f..42afb4e661d 100644
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -46,8 +46,6 @@
 <!DOCTYPE bindings [
 <!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
 %findBarDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 ]>
 
 <bindings id="findbarBindings"
@@ -219,7 +217,6 @@
                          tooltiptext="&previous.tooltip;"
                          oncommand="onFindAgainCommand(true);"
                          disabled="true"
-                         chromedir="&locale.dir;"
                          xbl:inherits="accesskey=findpreviousaccesskey"/>
 #endif
       <xul:toolbarbutton anonid="find-next"
@@ -229,7 +226,6 @@
                          tooltiptext="&next.tooltip;"
                          oncommand="onFindAgainCommand(false);"
                          disabled="true"
-                         chromedir="&locale.dir;"
                          xbl:inherits="accesskey=findnextaccesskey"/>
 #ifndef MOZ_WIDGET_GTK2
       <xul:toolbarbutton anonid="find-previous"
@@ -239,7 +235,6 @@
                          tooltiptext="&previous.tooltip;"
                          oncommand="onFindAgainCommand(true);"
                          disabled="true"
-                         chromedir="&locale.dir;"
                          xbl:inherits="accesskey=findpreviousaccesskey"/>
 #endif
       <xul:toolbarbutton anonid="highlight"
diff --git a/toolkit/content/widgets/menu.xml b/toolkit/content/widgets/menu.xml
index 4e2f626eb28..449e5c8a7c9 100644
--- a/toolkit/content/widgets/menu.xml
+++ b/toolkit/content/widgets/menu.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-]>
-
 <bindings id="menuitemBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -176,8 +171,7 @@
       <xul:hbox class="menu-accel-container" anonid="accel">
         <xul:label class="menu-accel" xbl:inherits="value=acceltext"/>
       </xul:hbox>
-      <xul:hbox align="center" class="menu-right" chromedir="&locale.dir;"
-                xbl:inherits="_moz-menuactive,disabled">
+      <xul:hbox align="center" class="menu-right" xbl:inherits="_moz-menuactive,disabled">
         <xul:image/>
       </xul:hbox>
       <children includes="menupopup"/>
@@ -254,8 +248,8 @@
       <xul:hbox class="menu-accel-container" anonid="accel">
         <xul:label class="menu-iconic-accel" xbl:inherits="value=acceltext"/>
       </xul:hbox>
-      <xul:hbox class="menu-right" chromedir="&locale.dir;"
-                xbl:inherits="_moz-menuactive,disabled" align="center" pack="center">
+      <xul:hbox class="menu-right" xbl:inherits="_moz-menuactive,disabled"
+                align="center" pack="center">
         <xul:image/>
       </xul:hbox>
       <children includes="menupopup|template"/>
diff --git a/toolkit/content/widgets/resizer.xml b/toolkit/content/widgets/resizer.xml
index 5ffca7726fa..0ab1f535825 100644
--- a/toolkit/content/widgets/resizer.xml
+++ b/toolkit/content/widgets/resizer.xml
@@ -1,27 +1,12 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
-]>
-
 <bindings id="resizerBindings"
    xmlns="http://www.mozilla.org/xbl">
 
   <binding id="resizer">
-    <content chromedir="&locale.dir;">
-      <children/>
-    </content>
     <resources>
       <stylesheet src="chrome://global/skin/resizer.css"/>
     </resources>
-    <implementation>
-      <constructor><![CDATA[
-        // Bindings that extend this one wouldn't inherit the
-        // chromedir attribute if it would only be set in <content>.
-        this.setAttribute("chromedir", "]]>&locale.dir;<![CDATA[");
-      ]]></constructor>
-    </implementation>
   </binding>
 
 </bindings>
diff --git a/toolkit/content/widgets/scrollbox.xml b/toolkit/content/widgets/scrollbox.xml
index 7669e1bcdd9..e252c2b2cae 100644
--- a/toolkit/content/widgets/scrollbox.xml
+++ b/toolkit/content/widgets/scrollbox.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-]>
-
 <bindings id="arrowscrollboxBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -521,7 +516,7 @@
   </binding>
 
   <binding id="autorepeatbutton" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
-    <content repeat="hover" chromedir="&locale.dir;">
+    <content repeat="hover">
       <xul:image class="autorepeatbutton-icon"/>
     </content>
   </binding>
@@ -535,8 +530,7 @@
                          onmousedown="_startScroll(-1);"
                          onmouseover="_continueScroll(-1);"
                          onmouseup="_stopScroll();"
-                         onmouseout="_pauseScroll();"
-                         chromedir="&locale.dir;"/>
+                         onmouseout="_pauseScroll();"/>
       <xul:scrollbox xbl:inherits="orient,align,pack,dir" flex="1" anonid="scrollbox">
         <children/>
       </xul:scrollbox>
@@ -547,8 +541,7 @@
                          onmousedown="_startScroll(1);"
                          onmouseover="_continueScroll(1);"
                          onmouseup="_stopScroll();"
-                         onmouseout="_pauseScroll();"
-                         chromedir="&locale.dir;"/>
+                         onmouseout="_pauseScroll();"/>
     </content>
     <implementation implements="nsITimerCallback, nsIDOMEventListener">
       <constructor><![CDATA[
diff --git a/toolkit/content/widgets/tabbox.xml b/toolkit/content/widgets/tabbox.xml
index bad131d5262..3a5927d5054 100644
--- a/toolkit/content/widgets/tabbox.xml
+++ b/toolkit/content/widgets/tabbox.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-]>
-
 <bindings id="tabBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -583,7 +578,7 @@
       <stylesheet src="chrome://global/skin/tabbox.css"/>
     </resources>
 
-    <content chromedir="&locale.dir;">
+    <content>
       <xul:hbox class="tab-middle box-inherit" xbl:inherits="align,dir,pack,orient,selected" flex="1">
         <xul:image class="tab-icon" xbl:inherits="validate,src=image"/>
         <xul:label class="tab-text" xbl:inherits="value=label,accesskey,crop,disabled" flex="1"/>
diff --git a/toolkit/content/widgets/textbox.xml b/toolkit/content/widgets/textbox.xml
index 7994d909473..cf1b8e552a8 100644
--- a/toolkit/content/widgets/textbox.xml
+++ b/toolkit/content/widgets/textbox.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
   <!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" >
   %textcontextDTD;
 ]>
@@ -212,10 +210,6 @@
           this.boxObject.removeProperty("value");
         }
 
-        // Bindings that extend this one wouldn't inherit the
-        // chromedir attribute if it would only be set in <content>.
-        this.setAttribute("chromedir", "]]>&locale.dir;<![CDATA[");
-
         this._updateVisibleText();
         this._setNewlineHandling();
       ]]></constructor>
@@ -383,12 +377,10 @@
         <xul:deck class="textbox-search-icons" anonid="search-icons">
           <xul:image class="textbox-search-icon"
                      onclick="document.getBindingParent(this)._iconClick();"
-                     xbl:inherits="src=image,searchbutton,disabled"
-                     chromedir="&locale.dir;"/>
+                     xbl:inherits="src=image,searchbutton,disabled"/>
           <xul:image class="textbox-search-clear"
                      onclick="document.getBindingParent(this)._clearSearch();"
-                     xbl:inherits="disabled"
-                     chromedir="&locale.dir;"/>
+                     xbl:inherits="disabled"/>
         </xul:deck>
       </xul:hbox>
     </content>
@@ -521,7 +513,6 @@
       <children/>
       <xul:menupopup anonid="input-box-contextmenu"
                      class="textbox-contextmenu"
-                     chromedir="&locale.dir;"
                      onpopupshowing="if (document.commandDispatcher.focusedElement != this.parentNode.firstChild)
                                        this.parentNode.firstChild.focus();
                                      this.parentNode._doPopupItemEnabling(this);"
@@ -584,7 +575,6 @@
       <children/>
       <xul:menupopup anonid="input-box-contextmenu"
                      class="textbox-contextmenu"
-                     chromedir="&locale.dir;"
                      onpopupshowing="if (document.commandDispatcher.focusedElement != this.parentNode.firstChild)
                                        this.parentNode.firstChild.focus();
                                      this.parentNode._doPopupItemEnablingSpell(this);"
diff --git a/toolkit/content/widgets/toolbarbutton.xml b/toolkit/content/widgets/toolbarbutton.xml
index e4932183830..4befb7bb02d 100644
--- a/toolkit/content/widgets/toolbarbutton.xml
+++ b/toolkit/content/widgets/toolbarbutton.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-]>
-
 <bindings id="toolbarbuttonBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -16,7 +11,7 @@
       <stylesheet src="chrome://global/skin/toolbarbutton.css"/>
     </resources>
     
-    <content chromedir="&locale.dir;">
+    <content>
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle,label"/>
       <xul:label class="toolbarbutton-text" crop="right" flex="1"
@@ -34,7 +29,7 @@
 
   <binding id="menu" display="xul:menu" 
            extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
-    <content chromedir="&locale.dir;">
+    <content>
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle,label,type"/>
       <xul:label class="toolbarbutton-text" crop="right" flex="1"
diff --git a/toolkit/content/widgets/tree.xml b/toolkit/content/widgets/tree.xml
index 4c741886917..96eddde2881 100644
--- a/toolkit/content/widgets/tree.xml
+++ b/toolkit/content/widgets/tree.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 <!ENTITY % treeDTD SYSTEM "chrome://global/locale/tree.dtd">
 %treeDTD;
 ]>
@@ -32,7 +30,7 @@
   </binding>
 
   <binding id="tree" extends="chrome://global/content/bindings/tree.xml#tree-base">
-    <content hidevscroll="true" hidehscroll="true" chromedir="&locale.dir;">
+    <content hidevscroll="true" hidehscroll="true">
       <children includes="treecols"/>
       <xul:stack class="tree-stack" flex="1">
         <xul:treerows class="tree-rows" flex="1" xbl:inherits="hidevscroll">
@@ -276,13 +274,6 @@
         </getter>
       </property>
 
-      <constructor><![CDATA[
-          // Bindings that extend this one wouldn't inherit the
-          // chromedir attribute if it would only be set in <content>.
-          this.setAttribute("chromedir", "]]>&locale.dir;<![CDATA[");
-        ]]>
-      </constructor>
-
       <method name="_getNextColumn">
         <parameter name="row"/>
         <parameter name="left"/>
diff --git a/toolkit/content/widgets/wizard.xml b/toolkit/content/widgets/wizard.xml
index 566e12c83b1..60170a43a03 100644
--- a/toolkit/content/widgets/wizard.xml
+++ b/toolkit/content/widgets/wizard.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
   <!ENTITY % wizardDTD SYSTEM "chrome://global/locale/wizard.dtd">
   %wizardDTD;
 ]>
@@ -20,7 +18,7 @@
   
   <binding id="wizard" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
     <content>
-      <xul:hbox class="wizard-header" chromedir="&locale.dir;" anonid="Header"/>
+      <xul:hbox class="wizard-header" anonid="Header"/>
       
       <xul:deck class="wizard-page-box" flex="1" anonid="Deck">
         <children includes="wizardpage"/>
@@ -539,8 +537,7 @@
                       dlgtype="cancel" icon="cancel"/>
           <xul:spacer style="width: 24px"/>
           <xul:button label="&button-back-unix.label;" accesskey="&button-back-unix.accesskey;"
-                      class="wizard-button" dlgtype="back" icon="go-back"
-                      chromedir="&locale.dir;"/>
+                      class="wizard-button" dlgtype="back" icon="go-back"/>
           <xul:deck class="wizard-next-deck" anonid="WizardButtonDeck">
             <xul:hbox>
               <xul:button label="&button-finish-unix.label;" class="wizard-button"
@@ -549,13 +546,12 @@
             <xul:hbox>
               <xul:button label="&button-next-unix.label;" accesskey="&button-next-unix.accesskey;"
                           class="wizard-button" dlgtype="next" icon="go-forward" 
-                          chromedir="&locale.dir;" default="true" flex="1"/>
+                          default="true" flex="1"/>
             </xul:hbox>
           </xul:deck>
 #else
           <xul:button label="&button-back-win.label;" accesskey="&button-back-win.accesskey;"
-                      class="wizard-button" dlgtype="back" icon="go-back"
-                      chromedir="&locale.dir;"/>
+                      class="wizard-button" dlgtype="back" icon="go-back"/>
           <xul:deck class="wizard-next-deck" anonid="WizardButtonDeck">
             <xul:hbox>
               <xul:button label="&button-finish-win.label;" class="wizard-button"
@@ -564,7 +560,7 @@
             <xul:hbox>
               <xul:button label="&button-next-win.label;" accesskey="&button-next-win.accesskey;"
                           class="wizard-button" dlgtype="next" icon="go-forward" 
-                          chromedir="&locale.dir;" default="true" flex="1"/>
+                          default="true" flex="1"/>
             </xul:hbox>
           </xul:deck>
           <xul:button label="&button-cancel-win.label;" class="wizard-button"
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index f50099a4a60..ded48058b7a 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -21,6 +21,10 @@
   text-rendering: optimizeLegibility;
 }
 
+:root:-moz-locale-dir(rtl) {
+  direction: rtl;
+}
+
 /* hide the content and destroy the frame */
 [hidden="true"] {
   display: none;
@@ -692,7 +696,7 @@ textbox[type="number"] {
   -moz-binding: url("chrome://global/content/bindings/numberbox.xml#numberbox");
 }
 
-.textbox-contextmenu[chromedir="rtl"] {
+.textbox-contextmenu:-moz-locale-dir(rtl) {
   direction: rtl;
 }
 
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index e5d69fdadc3..a208ea2fd61 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -43,10 +43,8 @@
 
 <!DOCTYPE bindings [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
   <!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd" >
   %brandDTD;
-  %globalDTD;
   %extensionsDTD;
 ]>
 
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul
index 32b98ef1187..e4e60565c4c 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -48,8 +48,6 @@
 %brandDTD;
 <!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd">
 %extensionsDTD;
-<!ENTITY % global SYSTEM "chrome://global/locale/global.dtd">
-%global;
 ]>
 
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -164,7 +162,7 @@
     <deck flex="1">
       <hbox class="viewGroupWrapper">
         <radiogroup id="viewGroup" xhtml:role="listbox" persist="last-selected"
-                    orient="horizontal" chromedir="&locale.dir;">
+                    orient="horizontal">
           <radio id="search-view" label="&search.label;" oncommand="showView('search');" persist="last-selected"/>
           <radio id="extensions-view" label="&extensions.label;" oncommand="showView('extensions');" persist="last-selected"/>
           <radio id="themes-view" label="&themes.label;" oncommand="showView('themes');" persist="last-selected"/>
diff --git a/toolkit/themes/faststripe/global/tabbox.css b/toolkit/themes/faststripe/global/tabbox.css
index 3e360e78f27..cf5c60dbbff 100644
--- a/toolkit/themes/faststripe/global/tabbox.css
+++ b/toolkit/themes/faststripe/global/tabbox.css
@@ -76,7 +76,7 @@ tab
   color: -moz-DialogText;
 }
 
-tab[chromedir="rtl"] {
+tab:-moz-locale-dir(rtl) {
   -moz-border-radius-bottomleft: 1px;
   -moz-border-radius-bottomright: 0px;
 }
@@ -96,14 +96,14 @@ tab:focus > .tab-middle {
   outline: 1px dotted;
 }
 
-tab[beforeselected="true"]:not([chromedir="rtl"]),
-tab[selected="true"][chromedir="rtl"] + tab {
+tab[beforeselected="true"]:not(:-moz-locale-dir(rtl)),
+tab[selected="true"]:-moz-locale-dir(rtl) + tab {
   border-right: none;
   -moz-border-radius-topright: 0;
 }
 
-tab[selected="true"]:not([chromedir="rtl"]) + tab,
-tab[beforeselected="true"][chromedir="rtl"] {
+tab[selected="true"]:not(:-moz-locale-dir(rtl)) + tab,
+tab[beforeselected="true"]:-moz-locale-dir(rtl) {
   border-left: none;
   -moz-border-radius-topleft: 0;
 }
@@ -136,13 +136,13 @@ tab:first-of-type[selected="true"] {
   padding: 4px 6px 1px 6px;
 }
 
-.tab-bottom[beforeselected="true"]:not([chromedir="rtl"]),
-.tab-bottom[selected="true"][chromedir="rtl"] + .tab-bottom {
+.tab-bottom[beforeselected="true"]:not(:-moz-locale-dir(rtl)),
+.tab-bottom[selected="true"]:-moz-locale-dir(rtl) + .tab-bottom {
   -moz-border-radius-bottomright: 0;
 }
 
-.tab-bottom[selected="true"]:not([chromedir="rtl"]) + .tab-bottom,
-.tab-bottom[beforeselected="true"][chromedir="rtl"] {
+.tab-bottom[selected="true"]:not(:-moz-locale-dir(rtl)) + .tab-bottom,
+.tab-bottom[beforeselected="true"]:-moz-locale-dir(rtl) {
   -moz-border-radius-bottomleft: 0;
 }
 
diff --git a/toolkit/themes/faststripe/global/textbox.css b/toolkit/themes/faststripe/global/textbox.css
index 117da51c0ec..fff167878b8 100644
--- a/toolkit/themes/faststripe/global/textbox.css
+++ b/toolkit/themes/faststripe/global/textbox.css
@@ -104,7 +104,7 @@ textbox.plain {
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-.textbox-search-icon[chromedir="rtl"] {
+.textbox-search-icon:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
diff --git a/toolkit/themes/gnomestripe/global/button.css b/toolkit/themes/gnomestripe/global/button.css
index 0bf0ad37a53..d012fbe0b66 100644
--- a/toolkit/themes/gnomestripe/global/button.css
+++ b/toolkit/themes/gnomestripe/global/button.css
@@ -326,11 +326,11 @@ button[icon="go-forward"][disabled="true"] .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=button&state=disabled");
 }
 
-button[icon="go-forward"][chromedir="rtl"] .button-icon {
+button[icon="go-forward"]:-moz-locale-dir(rtl) .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=button");
 }
 
-button[icon="go-forward"][chromedir="rtl"][disabled="true"] .button-icon {
+button[icon="go-forward"]:-moz-locale-dir(rtl)[disabled="true"] .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=button&state=disabled");
 }
 
@@ -342,11 +342,11 @@ button[icon="go-back"][disabled="true"] .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=button&state=disabled");
 }
 
-button[icon="go-back"][chromedir="rtl"] .button-icon {
+button[icon="go-back"]:-moz-locale-dir(rtl) .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=button");
 }
 
-button[icon="go-back"][chromedir="rtl"][disabled="true"] .button-icon {
+button[icon="go-back"]:-moz-locale-dir(rtl)[disabled="true"] .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=button&state=disabled");
 }
 
diff --git a/toolkit/themes/gnomestripe/global/findBar.css b/toolkit/themes/gnomestripe/global/findBar.css
index 2e0d05e7dd5..b1ef0b76981 100644
--- a/toolkit/themes/gnomestripe/global/findBar.css
+++ b/toolkit/themes/gnomestripe/global/findBar.css
@@ -21,11 +21,11 @@ findbar {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled");
 }
 
-.findbar-find-next[chromedir="rtl"] {
+.findbar-find-next:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
 }
 
-.findbar-find-next[disabled="true"][chromedir="rtl"] {
+.findbar-find-next[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled");
 }
 
@@ -39,11 +39,11 @@ findbar {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled");
 }
 
-.findbar-find-previous[chromedir="rtl"] {
+.findbar-find-previous:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
 }
 
-.findbar-find-previous[disabled="true"][chromedir="rtl"] {
+.findbar-find-previous[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu&state=disabled");
 }
 
diff --git a/toolkit/themes/gnomestripe/global/printPreview.css b/toolkit/themes/gnomestripe/global/printPreview.css
index acdfecb06f8..d352f6a3251 100644
--- a/toolkit/themes/gnomestripe/global/printPreview.css
+++ b/toolkit/themes/gnomestripe/global/printPreview.css
@@ -4,7 +4,7 @@
   list-style-image: url("moz-icon://stock/gtk-goto-first-ltr?size=menu");
 }
 
-.home-arrow[chromedir="rtl"] {
+.home-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-goto-first-rtl?size=menu");
 }
 
@@ -12,7 +12,7 @@
   list-style-image: url("moz-icon://stock/gtk-goto-last-ltr?size=menu");
 }
 
-.end-arrow[chromedir="rtl"] {
+.end-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-goto-last-rtl?size=menu");
 }
 
@@ -20,7 +20,7 @@
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu");
 }
 
-.left-arrow[chromedir="rtl"] {
+.left-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
 }
 
@@ -28,7 +28,7 @@
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu");
 }
 
-.right-arrow[chromedir="rtl"] {
+.right-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
 }
 
diff --git a/toolkit/themes/gnomestripe/global/textbox.css b/toolkit/themes/gnomestripe/global/textbox.css
index acedd6bb77b..6a684000f3a 100644
--- a/toolkit/themes/gnomestripe/global/textbox.css
+++ b/toolkit/themes/gnomestripe/global/textbox.css
@@ -109,7 +109,7 @@ textbox.plain {
   list-style-image: url(chrome://global/skin/icons/Search-glass.png);
 }
 
-.textbox-search-icon[chromedir="rtl"] {
+.textbox-search-icon:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
diff --git a/toolkit/themes/gnomestripe/global/tree.css b/toolkit/themes/gnomestripe/global/tree.css
index 2501d41edbe..60b29d1de60 100644
--- a/toolkit/themes/gnomestripe/global/tree.css
+++ b/toolkit/themes/gnomestripe/global/tree.css
@@ -302,13 +302,13 @@ treecol[dragging="true"] {
   color: ThreeDHighlight !important;
 }
 
-tree[chromedir="ltr"] treecol[insertafter="true"],
-tree[chromedir="rtl"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(ltr) treecol[insertafter="true"],
+tree:-moz-locale-dir(rtl) treecol[insertbefore="true"] {
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
-tree[chromedir="rtl"] treecol[insertafter="true"],
-tree[chromedir="ltr"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(rtl) treecol[insertafter="true"],
+tree:-moz-locale-dir(ltr) treecol[insertbefore="true"] {
   -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
diff --git a/toolkit/themes/gnomestripe/help/help.css b/toolkit/themes/gnomestripe/help/help.css
index ff11cfa1309..578ce641379 100644
--- a/toolkit/themes/gnomestripe/help/help.css
+++ b/toolkit/themes/gnomestripe/help/help.css
@@ -52,11 +52,11 @@
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled");
 }
 
-#help-back-button[chromedir="rtl"] {
+#help-back-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar");
 }
 
-#help-back-button[disabled="true"][chromedir="rtl"] {
+#help-back-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
 }
 
@@ -68,11 +68,11 @@
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
 }
 
-#help-forward-button[chromedir="rtl"] {
+#help-forward-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
 }
 
-#help-forward-button[disabled="true"][chromedir="rtl"] {
+#help-forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
 }
 
@@ -120,7 +120,7 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu");
 }
 
-#context-back[chromedir="rtl"] {
+#context-back:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
 }
 
@@ -128,7 +128,7 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled");
 }
 
-#context-back[disabled="true"][chromedir="rtl"] {
+#context-back[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu&state=disabled");
 }
 
@@ -136,7 +136,7 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu");
 }
 
-#context-forward[chromedir="rtl"] {
+#context-forward:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
 }
 
@@ -144,7 +144,7 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled");
 }
 
-#context-forward[disabled="true"][chromedir="rtl"] {
+#context-forward[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled");
 }
 
diff --git a/toolkit/themes/pinstripe/global/datetimepicker.css b/toolkit/themes/pinstripe/global/datetimepicker.css
index 827b6885604..47451849493 100644
--- a/toolkit/themes/pinstripe/global/datetimepicker.css
+++ b/toolkit/themes/pinstripe/global/datetimepicker.css
@@ -72,7 +72,7 @@ html|*.datetimepicker-input {
   text-align: right;
 }
 
-html|*.datetimepicker-input[chromedir="rtl"] {
+html|*.datetimepicker-input:-moz-locale-dir(rtl) {
   text-align: left;
 }
 
diff --git a/toolkit/themes/pinstripe/global/findBar.css b/toolkit/themes/pinstripe/global/findBar.css
index 3452ef344e9..39b752b1f61 100644
--- a/toolkit/themes/pinstripe/global/findBar.css
+++ b/toolkit/themes/pinstripe/global/findBar.css
@@ -160,8 +160,8 @@ findbar {
   -moz-margin-end: 0 !important;
 }
 
-.findbar-find-next[chromedir="ltr"],
-.findbar-find-previous[chromedir="rtl"] {
+.findbar-find-next:-moz-locale-dir(ltr),
+.findbar-find-previous:-moz-locale-dir(rtl) {
   -moz-border-radius-topright: 0px;
   -moz-border-radius-bottomright: 0px;
 }
@@ -172,8 +172,8 @@ findbar {
   -moz-margin-start: 0 !important;
 }
 
-.findbar-find-previous[chromedir="ltr"],
-.findbar-find-next[chromedir="rtl"] {
+.findbar-find-previous:-moz-locale-dir(ltr),
+.findbar-find-next:-moz-locale-dir(rtl) {
   -moz-border-radius-topleft: 0px;
   -moz-border-radius-bottomleft: 0px;
 }
diff --git a/toolkit/themes/pinstripe/global/resizer.css b/toolkit/themes/pinstripe/global/resizer.css
index 728f7b1da85..02648398ddc 100644
--- a/toolkit/themes/pinstripe/global/resizer.css
+++ b/toolkit/themes/pinstripe/global/resizer.css
@@ -15,7 +15,7 @@ resizer[dir="topleft"] {
 }
 
 resizer[dir="bottomright"],
-resizer[dir="bottomend"][chromedir="ltr"] {
+resizer[dir="bottomend"]:-moz-locale-dir(ltr) {
   cursor: se-resize;
 }
 
@@ -24,6 +24,6 @@ resizer[dir="topright"] {
 }
 
 resizer[dir="bottomleft"],
-resizer[dir="bottomend"][chromedir="rtl"] {
+resizer[dir="bottomend"]:-moz-locale-dir(rtl) {
   cursor: sw-resize;
 }
diff --git a/toolkit/themes/pinstripe/global/tree.css b/toolkit/themes/pinstripe/global/tree.css
index 216771f429e..e355c61c0b2 100644
--- a/toolkit/themes/pinstripe/global/tree.css
+++ b/toolkit/themes/pinstripe/global/tree.css
@@ -266,13 +266,13 @@ treecol[dragging="true"] {
   color: ThreeDHighlight !important;
 }
 
-tree[chromedir="ltr"] treecol[insertafter="true"],
-tree[chromedir="rtl"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(ltr) treecol[insertafter="true"],
+tree:-moz-locale-dir(rtl) treecol[insertbefore="true"] {
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
-tree[chromedir="rtl"] treecol[insertafter="true"],
-tree[chromedir="ltr"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(rtl) treecol[insertafter="true"],
+tree:-moz-locale-dir(ltr) treecol[insertbefore="true"] {
   -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
diff --git a/toolkit/themes/pinstripe/global/viewbuttons.css b/toolkit/themes/pinstripe/global/viewbuttons.css
index dba5917b74b..df67b091b33 100644
--- a/toolkit/themes/pinstripe/global/viewbuttons.css
+++ b/toolkit/themes/pinstripe/global/viewbuttons.css
@@ -101,19 +101,19 @@
   -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 3px 5px;
 }
 
-#viewGroup:not([chromedir=rtl]) > :first-child,
-#viewGroup:not([chromedir=rtl]) > [first-visible],
-#viewGroup[chromedir=rtl] > :last-child,
-#viewGroup[chromedir=rtl] > [last-visible] {
+#viewGroup:-moz-locale-dir(ltr) > :first-child,
+#viewGroup:-moz-locale-dir(ltr) > [first-visible],
+#viewGroup:-moz-locale-dir(rtl) > :last-child,
+#viewGroup:-moz-locale-dir(rtl) > [last-visible] {
   -moz-border-radius-topleft: 2px;
   -moz-border-radius-bottomleft: 2px;
   border-left: none !important;
 }
 
-#viewGroup:not([chromedir=rtl]) > :last-child,
-#viewGroup:not([chromedir=rtl]) > [last-visible],
-#viewGroup[chromedir=rtl] > :first-child,
-#viewGroup[chromedir=rtl] > [first-visible] {
+#viewGroup:-moz-locale-dir(ltr) > :last-child,
+#viewGroup:-moz-locale-dir(ltr) > [last-visible],
+#viewGroup:-moz-locale-dir(rtl) > :first-child,
+#viewGroup:-moz-locale-dir(rtl) > [first-visible] {
   -moz-border-radius-topright: 2px;
   -moz-border-radius-bottomright: 2px;
 }
diff --git a/toolkit/themes/winstripe/global/datetimepicker.css b/toolkit/themes/winstripe/global/datetimepicker.css
index eec51ea0709..7713dc981d7 100644
--- a/toolkit/themes/winstripe/global/datetimepicker.css
+++ b/toolkit/themes/winstripe/global/datetimepicker.css
@@ -154,26 +154,26 @@ timepicker[disabled="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif");
 }
 
-.datepicker-previous[chromedir="rtl"] {
+.datepicker-previous:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
 }
 
-.datepicker-next[chromedir="rtl"] {
+.datepicker-next:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif");
 }
 
-.datepicker-previous[chromedir="rtl"] {
+.datepicker-previous:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit-hov.gif");
 }
 
-.datepicker-next[chromedir="rtl"]:hover {
+.datepicker-next:-moz-locale-dir(rtl):hover {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft-hov.gif");
 }
 
-.datepicker-previous[disabled="true"][chromedir="rtl"] {
+.datepicker-previous[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif");
 }
 
-.datepicker-next[disabled="true"][chromedir="rtl"] {
+.datepicker-next[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif");
 }
diff --git a/toolkit/themes/winstripe/global/printPreview.css b/toolkit/themes/winstripe/global/printPreview.css
index 2d080be6705..936a3d3bce6 100644
--- a/toolkit/themes/winstripe/global/printPreview.css
+++ b/toolkit/themes/winstripe/global/printPreview.css
@@ -1,46 +1,46 @@
 /* ..... page navigation ..... */
 
 .home-arrow,
-.end-arrow[chromedir="rtl"] {
+.end-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/printpreview/arrow-left-end.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .home-arrow:hover,
-.end-arrow[chromedir="rtl"]:hover {
+.end-arrow:-moz-locale-dir(rtl):hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .end-arrow,
-.home-arrow[chromedir="rtl"] {
+.home-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/printpreview/arrow-right-end.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .end-arrow:hover,
-.home-arrow[chromedir="rtl"]:hover {
+.home-arrow:-moz-locale-dir(rtl):hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .left-arrow,
-.right-arrow[chromedir="rtl"] {
+.right-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/printpreview/arrow-left.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .left-arrow:hover,
-.right-arrow[chromedir="rtl"]:hover {
+.right-arrow:-moz-locale-dir(rtl):hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .right-arrow,
-.left-arrow[chromedir="rtl"] {
+.left-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/printpreview/arrow-right.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .right-arrow:hover,
-.left-arrow[chromedir="rtl"]:hover {
+.left-arrow:-moz-locale-dir(rtl):hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
diff --git a/toolkit/themes/winstripe/global/resizer.css b/toolkit/themes/winstripe/global/resizer.css
index cf1fb39c4e6..7f398d74e7f 100644
--- a/toolkit/themes/winstripe/global/resizer.css
+++ b/toolkit/themes/winstripe/global/resizer.css
@@ -15,7 +15,7 @@ resizer[dir="topleft"] {
 }
 
 resizer[dir="bottomright"],
-resizer[dir="bottomend"][chromedir="ltr"] {
+resizer[dir="bottomend"]:-moz-locale-dir(ltr) {
   cursor: se-resize;
 }
 
@@ -24,11 +24,11 @@ resizer[dir="topright"] {
 }
 
 resizer[dir="bottomleft"],
-resizer[dir="bottomend"][chromedir="rtl"] {
+resizer[dir="bottomend"]:-moz-locale-dir(rtl) {
   cursor: sw-resize;
 }
 
-resizer[dir="bottomright"][chromedir="ltr"],
+resizer[dir="bottomright"]:-moz-locale-dir(ltr),
 resizer[dir="bottomend"] {
   -moz-appearance: resizer;
 }
diff --git a/toolkit/themes/winstripe/global/scrollbox.css b/toolkit/themes/winstripe/global/scrollbox.css
index a79de5f7d85..5ac4b5d9c97 100644
--- a/toolkit/themes/winstripe/global/scrollbox.css
+++ b/toolkit/themes/winstripe/global/scrollbox.css
@@ -6,34 +6,34 @@
 
 /* Horizontal enabled */
 .autorepeatbutton-up[orient="horizontal"],
-.autorepeatbutton-down[chromedir="rtl"][orient="horizontal"],
+.autorepeatbutton-down:-moz-locale-dir(rtl)[orient="horizontal"],
 .scrollbutton-up[orient="horizontal"],
-.scrollbutton-down[chromedir="rtl"][orient="horizontal"] {
+.scrollbutton-down:-moz-locale-dir(rtl)[orient="horizontal"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif");
   -moz-image-region: auto; /* cut off inheritance */
 }
 
 .autorepeatbutton-down[orient="horizontal"],
-.autorepeatbutton-up[chromedir="rtl"][orient="horizontal"],
+.autorepeatbutton-up:-moz-locale-dir(rtl)[orient="horizontal"],
 .scrollbutton-down[orient="horizontal"],
-.scrollbutton-up[chromedir="rtl"][orient="horizontal"] {
+.scrollbutton-up:-moz-locale-dir(rtl)[orient="horizontal"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
   -moz-image-region: auto; /* cut off inheritance */
 }
 
  /* Horizontal disabled */
 .autorepeatbutton-up[orient="horizontal"][disabled="true"],
-.autorepeatbutton-down[chromedir="rtl"][orient="horizontal"][disabled="true"],
+.autorepeatbutton-down:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"],
 .scrollbutton-up[orient="horizontal"][disabled="true"],
-.scrollbutton-down[chromedir="rtl"][orient="horizontal"][disabled="true"] {
+.scrollbutton-down:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif");
   -moz-image-region: auto; /* cut off inheritance */
 }
 
 .autorepeatbutton-down[orient="horizontal"][disabled="true"],
-.autorepeatbutton-up[chromedir="rtl"][orient="horizontal"][disabled="true"],
+.autorepeatbutton-up:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"],
 .scrollbutton-down[orient="horizontal"][disabled="true"],
-.scrollbutton-up[chromedir="rtl"][orient="horizontal"][disabled="true"] {
+.scrollbutton-up:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif");
   -moz-image-region: auto; /* cut off inheritance */
 }
diff --git a/toolkit/themes/winstripe/global/tabbox.css b/toolkit/themes/winstripe/global/tabbox.css
index 271f5221b3d..c0db5e42701 100644
--- a/toolkit/themes/winstripe/global/tabbox.css
+++ b/toolkit/themes/winstripe/global/tabbox.css
@@ -85,7 +85,7 @@ tab
   color: -moz-DialogText;
 }
 
-tab[chromedir="rtl"] {
+tab:-moz-locale-dir(rtl) {
   -moz-border-radius-bottomleft: 1px;
   -moz-border-radius-bottomright: 0px;
 }
@@ -105,14 +105,14 @@ tab:focus > .tab-middle {
   outline: 1px dotted;
 }
 
-tab[beforeselected="true"]:not([chromedir="rtl"]),
-tab[selected="true"][chromedir="rtl"] + tab {
+tab[beforeselected="true"]:-moz-locale-dir(ltr),
+tab[selected="true"]:-moz-locale-dir(rtl) + tab {
   border-right: none;
   -moz-border-radius-topright: 0;
 }
 
-tab[selected="true"]:not([chromedir="rtl"]) + tab,
-tab[beforeselected="true"][chromedir="rtl"] {
+tab[selected="true"]:-moz-locale-dir(ltr) + tab,
+tab[beforeselected="true"]:-moz-locale-dir(rtl) {
   border-left: none;
   -moz-border-radius-topleft: 0;
 }
@@ -147,13 +147,13 @@ tab:first-of-type[selected="true"] {
   padding: 4px 6px 1px 6px;
 }
 
-.tab-bottom[beforeselected="true"]:not([chromedir="rtl"]),
-.tab-bottom[selected="true"][chromedir="rtl"] + .tab-bottom {
+.tab-bottom[beforeselected="true"]:-moz-locale-dir(ltr),
+.tab-bottom[selected="true"]:-moz-locale-dir(rtl) + .tab-bottom {
   -moz-border-radius-bottomright: 0;
 }
 
-.tab-bottom[selected="true"]:not([chromedir="rtl"]) + .tab-bottom,
-.tab-bottom[beforeselected="true"][chromedir="rtl"] {
+.tab-bottom[selected="true"]:-moz-locale-dir(ltr) + .tab-bottom,
+.tab-bottom[beforeselected="true"]:-moz-locale-dir(rtl) {
   -moz-border-radius-bottomleft: 0;
 }
 
diff --git a/toolkit/themes/winstripe/global/textbox.css b/toolkit/themes/winstripe/global/textbox.css
index ccfed2c5e46..4d29bfcb3d9 100644
--- a/toolkit/themes/winstripe/global/textbox.css
+++ b/toolkit/themes/winstripe/global/textbox.css
@@ -110,7 +110,7 @@ textbox.plain {
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-.textbox-search-icon[chromedir="rtl"] {
+.textbox-search-icon:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
diff --git a/toolkit/themes/winstripe/global/tree-aero.css b/toolkit/themes/winstripe/global/tree-aero.css
index d3cf4c227f7..536264e9535 100644
--- a/toolkit/themes/winstripe/global/tree-aero.css
+++ b/toolkit/themes/winstripe/global/tree-aero.css
@@ -28,18 +28,18 @@ treechildren::-moz-tree-twisty(hover, open) {
   list-style-image: url("chrome://global/skin/tree/twisty-open-hover.png");
 }
 
-tree[chromedir="rtl"] > treechildren::-moz-tree-twisty {
+tree:-moz-locale-dir(rtl) > treechildren::-moz-tree-twisty {
   list-style-image: url("chrome://global/skin/tree/twisty-clsd-rtl.png");
 }
 
-tree[chromedir="rtl"] > treechildren::-moz-tree-twisty(open) {
+tree:-moz-locale-dir(rtl) > treechildren::-moz-tree-twisty(open) {
   list-style-image: url("chrome://global/skin/tree/twisty-open-rtl.png");
 }
 
-tree[chromedir="rtl"] > treechildren::-moz-tree-twisty(hover) {
+tree:-moz-locale-dir(rtl) > treechildren::-moz-tree-twisty(hover) {
   list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover-rtl.png");
 }
 
-tree[chromedir="rtl"] > treechildren::-moz-tree-twisty(hover, open) {
+tree:-moz-locale-dir(rtl) > treechildren::-moz-tree-twisty(hover, open) {
   list-style-image: url("chrome://global/skin/tree/twisty-open-hover-rtl.png");
 }
diff --git a/toolkit/themes/winstripe/global/tree.css b/toolkit/themes/winstripe/global/tree.css
index 2ba926a441f..65afb1f3187 100644
--- a/toolkit/themes/winstripe/global/tree.css
+++ b/toolkit/themes/winstripe/global/tree.css
@@ -296,13 +296,13 @@ treecol[dragging="true"] {
   color: ThreeDHighlight !important;
 }
 
-tree[chromedir="ltr"] treecol[insertafter="true"],
-tree[chromedir="rtl"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(ltr) treecol[insertafter="true"],
+tree:-moz-locale-dir(rtl) treecol[insertbefore="true"] {
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
-tree[chromedir="rtl"] treecol[insertafter="true"],
-tree[chromedir="ltr"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(rtl) treecol[insertafter="true"],
+tree:-moz-locale-dir(ltr) treecol[insertbefore="true"] {
   -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
diff --git a/toolkit/themes/winstripe/help/help.css b/toolkit/themes/winstripe/help/help.css
index 5eb8a609380..0fcc4c5970f 100644
--- a/toolkit/themes/winstripe/help/help.css
+++ b/toolkit/themes/winstripe/help/help.css
@@ -45,7 +45,7 @@
   padding: 4px 5px;
 }
 
-#HelpToolbar[chromedir="rtl"] toolbarbutton {
+#HelpToolbar:-moz-locale-dir(rtl) toolbarbutton {
   list-style-image: url("chrome://help/skin/Toolbar-rtl.png");
 }
 

From 658641df9992f16354103a4403617aedd2bf7c68 Mon Sep 17 00:00:00 2001
From: Siddharth Agarwal <sid.bugzilla@gmail.com>
Date: Thu, 30 Jul 2009 00:05:05 +0530
Subject: [PATCH 029/175] Part of bug 503756 -- Rename the js/ mozilla-config.h
 to js-confdefs.h. r=bsmedberg, jimb

--HG--
extra : rebase_source : 8b0956fef406cde43c329c76bf63594a882216e4
---
 js/src/Makefile.in               |  2 +-
 js/src/configure.in              | 28 ++++++++++++++--------------
 js/src/xpconnect/src/Makefile.in |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 1653c69c0e4..00bf8509ca0 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -343,7 +343,7 @@ endif
 
 DIST_GARBAGE = config.cache config.log config.status \
    config/myrules.mk config/myconfig.mk \
-   unallmakefiles js-config js-config.h mozilla-config.h
+   unallmakefiles js-config js-config.h js-confdefs.h
 
 distclean::
 	cat unallmakefiles | $(XARGS) rm -f
diff --git a/js/src/configure.in b/js/src/configure.in
index 69d8e1e40b6..dc68057bd1b 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1251,7 +1251,7 @@ if test "$GNU_CC"; then
     fi
 
 
-    _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT'
+    _DEFINES_CFLAGS='-include $(DEPTH)/js-confdefs.h -DMOZILLA_CLIENT'
     _USE_CPP_INCLUDE_FLAG=1
 elif test "$SOLARIS_SUNPRO_CC"; then
     MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
@@ -1270,7 +1270,7 @@ elif test "$SOLARIS_SUNPRO_CC"; then
     else
         DSO_PIC_CFLAGS='-KPIC'
     fi
-    _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
+    _DEFINES_CFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
 else
     MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
     MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
@@ -1283,7 +1283,7 @@ else
 
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-KPIC'
-    _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
+    _DEFINES_CFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
 fi
 
 if test "$GNU_CXX"; then
@@ -1303,7 +1303,7 @@ if test "$GNU_CXX"; then
        esac
     fi
 
-    _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/mozilla-config.h'
+    _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/js-confdefs.h'
     _USE_CPP_INCLUDE_FLAG=1
 
     AC_CACHE_CHECK(whether the compiler supports -Wno-invalid-offsetof,
@@ -1342,7 +1342,7 @@ if test "$GNU_CXX"; then
         _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-variadic-macros"
     fi
 else
-    _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -D_MOZILLA_CONFIG_H_ $(ACDEFINES)'
+    _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -D_JS_CONFDEFS_H_ $(ACDEFINES)'
 fi
 
 dnl gcc can come with its own linker so it is better to use the pass-thru calls
@@ -2129,8 +2129,8 @@ case "$target" in
 	USE_PTHREADS=1
 	_PEDANTIC=
 	LIBS="$LIBS -lsocket -lstdc++"
-	_DEFINES_CFLAGS='-Wp,-include -Wp,$(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT -D_POSIX_C_SOURCE=199506'
-	_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -Wp,-include -Wp,$(DEPTH)/mozilla-config.h -D_POSIX_C_SOURCE=199506'
+	_DEFINES_CFLAGS='-Wp,-include -Wp,$(DEPTH)/js-confdefs.h -DMOZILLA_CLIENT -D_POSIX_C_SOURCE=199506'
+	_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -Wp,-include -Wp,$(DEPTH)/js-confdefs.h -D_POSIX_C_SOURCE=199506'
 	if test "$with_x" != "yes"
 	then
 		_PLATFORM_DEFAULT_TOOLKIT="photon"
@@ -4798,8 +4798,8 @@ if test "$_cpp_md_flag"; then
 else
   COMPILER_DEPEND=
   _USE_CPP_INCLUDE_FLAG=
-  _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
-  _DEFINES_CXXFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
+  _DEFINES_CFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
+  _DEFINES_CXXFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
 fi
 fi # MOZ_AUTO_DEPS
 MDDEPDIR='.deps'
@@ -5178,7 +5178,7 @@ dnl ========================================================
 # Save the defines header file before autoconf removes it.
 # (Do not add AC_DEFINE calls after this line.)
   _CONFIG_TMP=confdefs-tmp.h
-  _CONFIG_DEFS_H=mozilla-config.h
+  _CONFIG_DEFS_H=js-confdefs.h
 
   cat > $_CONFIG_TMP <<\EOF
 /* List of defines generated by configure. Included with preprocessor flag,
@@ -5186,8 +5186,8 @@ dnl ========================================================
  * Do not edit.
  */
 
-#ifndef _MOZILLA_CONFIG_H_
-#define _MOZILLA_CONFIG_H_
+#ifndef _JS_CONFDEFS_H_
+#define _JS_CONFDEFS_H_
 EOF
 
 _EGREP_PATTERN='^#define ('
@@ -5202,11 +5202,11 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_never_defined)"
 
   cat >> $_CONFIG_TMP <<\EOF
 
-#endif /* _MOZILLA_CONFIG_H_ */
+#endif /* _JS_CONFDEFS_H_ */
 
 EOF
 
-  # Only write mozilla-config.h when something changes (or it doesn't exist)
+  # Only write js-confdefs.h when something changes (or it doesn't exist)
   if cmp -s $_CONFIG_TMP $_CONFIG_DEFS_H; then
     rm $_CONFIG_TMP
   else
diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in
index 162bd6a5592..030bc6477cd 100644
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -156,13 +156,13 @@ DEFINES += \
   -DEXPORT_XPC_API \
   $(NULL)
 
-CONFIG := $(shell cat $(DEPTH)/js/src/mozilla-config.h)
+CONFIG := $(shell cat $(DEPTH)/js/src/js-confdefs.h)
 
 ENABLE_JIT = $(filter JS_TRACER, $(CONFIG))
 
 ifneq (,$(ENABLE_JIT))
 
-# Ugly! We need the AVMPLUS defines out of js/src/mozilla-config.h to make the
+# Ugly! We need the AVMPLUS defines out of js/src/js-confdefs.h to make the
 # nanojit headers happy. Gotta figure out a better way to get them, bug 483677.
 DEFINES += \
   -DJS_TRACER=1 \
@@ -211,7 +211,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
                     $(srcdir)/qsgen.py \
                     $(topsrcdir)/xpcom/idl-parser/header.py \
                     $(topsrcdir)/xpcom/idl-parser/xpidl.py \
-                    $(DEPTH)/js/src/mozilla-config.h
+                    $(DEPTH)/js/src/js-confdefs.h
 	$(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \

From 6df0ded0a0b9b2b8ef9251251bf4728bf15f4ca5 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sun, 26 Jul 2009 21:27:33 -0400
Subject: [PATCH 030/175] Bug 495176.  Improve security error reporting when
 document.domain is involved.  r=jst,pike sr=jst

---
 caps/src/nsScriptSecurityManager.cpp          |  85 ++++++++++++---
 .../en-US/chrome/security/caps.properties     | 103 +++++++++++++++++-
 2 files changed, 169 insertions(+), 19 deletions(-)

diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index b03383edddb..8496f37bdef 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -139,8 +139,7 @@ PRUint32 nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin;
 
 static
 nsresult
-GetPrincipalDomainOrigin(nsIPrincipal* aPrincipal,
-                         nsACString& aOrigin)
+GetOriginFromURI(nsIURI* aURI, nsACString& aOrigin)
 {
   if (nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin > 1) {
       // Allow a single recursive call to GetPrincipalDomainOrigin, since that
@@ -151,16 +150,8 @@ GetPrincipalDomainOrigin(nsIPrincipal* aPrincipal,
   }
 
   nsAutoInPrincipalDomainOriginSetter autoSetter;
-  aOrigin.Truncate();
 
-  nsCOMPtr<nsIURI> uri;
-  aPrincipal->GetDomain(getter_AddRefs(uri));
-  if (!uri) {
-    aPrincipal->GetURI(getter_AddRefs(uri));
-  }
-  NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
-
-  uri = NS_GetInnermostURI(uri);
+  nsCOMPtr<nsIURI> uri = NS_GetInnermostURI(aURI);
   NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
 
   nsCAutoString hostPort;
@@ -182,6 +173,22 @@ GetPrincipalDomainOrigin(nsIPrincipal* aPrincipal,
   return NS_OK;
 }
 
+static
+nsresult
+GetPrincipalDomainOrigin(nsIPrincipal* aPrincipal,
+                         nsACString& aOrigin)
+{
+
+  nsCOMPtr<nsIURI> uri;
+  aPrincipal->GetDomain(getter_AddRefs(uri));
+  if (!uri) {
+    aPrincipal->GetURI(getter_AddRefs(uri));
+  }
+  NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
+
+  return GetOriginFromURI(uri, aOrigin);
+}
+
 // Inline copy of JS_GetPrivate() for better inlining and optimization
 // possibilities. Also doesn't take a cx argument as it's not
 // needed. We access the private data only on objects whose private
@@ -831,35 +838,81 @@ nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
 
         NS_ConvertUTF8toUTF16 className(classInfoData.GetName());
         nsCAutoString subjectOrigin;
+        nsCAutoString subjectDomain;
         if (!nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin) {
-            GetPrincipalDomainOrigin(subjectPrincipal, subjectOrigin);
+            nsCOMPtr<nsIURI> uri, domain;
+            subjectPrincipal->GetURI(getter_AddRefs(uri));
+            // Subject can't be system if we failed the security
+            // check, so |uri| is non-null.
+            NS_ASSERTION(uri, "How did that happen?");
+            GetOriginFromURI(uri, subjectOrigin);
+            subjectPrincipal->GetDomain(getter_AddRefs(domain));
+            if (domain) {
+                GetOriginFromURI(domain, subjectDomain);
+            }
         } else {
             subjectOrigin.AssignLiteral("the security manager");
         }
         NS_ConvertUTF8toUTF16 subjectOriginUnicode(subjectOrigin);
+        NS_ConvertUTF8toUTF16 subjectDomainUnicode(subjectDomain);
 
         nsCAutoString objectOrigin;
+        nsCAutoString objectDomain;
         if (!nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin &&
             objectPrincipal) {
-            GetPrincipalDomainOrigin(objectPrincipal, objectOrigin);
+            nsCOMPtr<nsIURI> uri, domain;
+            objectPrincipal->GetURI(getter_AddRefs(uri));
+            if (uri) { // Object principal might be system
+                GetOriginFromURI(uri, objectOrigin);
+            }
+            objectPrincipal->GetDomain(getter_AddRefs(domain));
+            if (domain) {
+                GetOriginFromURI(domain, objectDomain);
+            }
         }
         NS_ConvertUTF8toUTF16 objectOriginUnicode(objectOrigin);
-            
+        NS_ConvertUTF8toUTF16 objectDomainUnicode(objectDomain);
+
         nsXPIDLString errorMsg;
         const PRUnichar *formatStrings[] =
         {
             subjectOriginUnicode.get(),
             className.get(),
             JSValIDToString(cx, aProperty),
-            objectOriginUnicode.get()
+            objectOriginUnicode.get(),
+            subjectDomainUnicode.get(),
+            objectDomainUnicode.get()
         };
 
         PRUint32 length = NS_ARRAY_LENGTH(formatStrings);
 
+        // XXXbz Our localization system is stupid and can't handle not showing
+        // some strings that get passed in.  Which means that we have to get
+        // our length precisely right: it has to be exactly the number of
+        // strings our format string wants.  This means we'll have to move
+        // strings in the array as needed, sadly...
         if (nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin ||
             !objectPrincipal) {
             stringName.AppendLiteral("OnlySubject");
-            --length;
+            length -= 3;
+        } else {
+            // default to a length that doesn't include the domains, then
+            // increase it as needed.
+            length -= 2;
+            if (!subjectDomainUnicode.IsEmpty()) {
+                stringName.AppendLiteral("SubjectDomain");
+                length += 1;
+            }
+            if (!objectDomainUnicode.IsEmpty()) {
+                stringName.AppendLiteral("ObjectDomain");
+                length += 1;
+                if (length != NS_ARRAY_LENGTH(formatStrings)) {
+                    // We have an object domain but not a subject domain.
+                    // Scoot our string over one slot.  See the XXX comment
+                    // above for why we need to do this.
+                    formatStrings[length-1] = formatStrings[length];
+                }
+            }
         }
         
         // We need to keep our existing failure rv and not override it
diff --git a/dom/locales/en-US/chrome/security/caps.properties b/dom/locales/en-US/chrome/security/caps.properties
index 09aa7c39318..5628acdfaf5 100644
--- a/dom/locales/en-US/chrome/security/caps.properties
+++ b/dom/locales/en-US/chrome/security/caps.properties
@@ -43,9 +43,106 @@ EnableCapabilityQuery = A script from "%S" is requesting enhanced abilities that
 EnableCapabilityDenied = A script from "%S" was denied %S privileges.
 CheckLoadURIError = Security Error: Content at %S may not load or link to %S.
 CheckSameOriginError = Security Error: Content at %S may not load data from %S.
-GetPropertyDeniedOrigins = Permission denied for <%S> to get property %S.%S from <%S>.
-SetPropertyDeniedOrigins = Permission denied for <%S> to set property %S.%S on <%S>.
-CallMethodDeniedOrigins = Permission denied for <%S> to call method %S.%S on <%S>.
+
+# LOCALIZATION NOTE (GetPropertyDeniedOrigins):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+GetPropertyDeniedOrigins = Permission denied for <%1$S> to get property %2$S.%3$S from <%4$S>.
+# LOCALIZATION NOTE (GetPropertyDeniedOriginsSubjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain".
+GetPropertyDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to get property %2$S.%3$S from <%4$S> (document.domain has not been set).
+# LOCALIZATION NOTE (GetPropertyDeniedOriginsObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+GetPropertyDeniedOriginsObjectDomain = Permission denied for <%1$S> (document.domain has not been set) to get property %2$S.%3$S from <%4$S> (document.domain=<%5$S>).
+# LOCALIZATION NOTE (GetPropertyDeniedOriginsSubjectDomainObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain"
+# %6$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+GetPropertyDeniedOriginsSubjectDomainObjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to get property %2$S.%3$S from <%4$S> (document.domain=<%6$S>).
+
+# LOCALIZATION NOTE (SetPropertyDeniedOrigins):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+SetPropertyDeniedOrigins = Permission denied for <%1$S> to set property %2$S.%3$S on <%4$S>.
+# LOCALIZATION NOTE (SetPropertyDeniedOriginsSubjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain".
+SetPropertyDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to set property %2$S.%3$S on <%4$S> (document.domain has not been set).
+# LOCALIZATION NOTE (SetPropertyDeniedOriginsObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+SetPropertyDeniedOriginsObjectDomain = Permission denied for <%1$S> (document.domain has not been set) to set property %2$S.%3$S on <%4$S> (document.domain=<%5$S>).
+# LOCALIZATION NOTE (SetPropertyDeniedOriginsSubjectDomainObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain"
+# %6$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+SetPropertyDeniedOriginsSubjectDomainObjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to set property %2$S.%3$S on <%4$S> (document.domain=<%6$S>).
+
+# LOCALIZATION NOTE (CallMethodDeniedOrigins):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the method of that object that access was denied for.
+CallMethodDeniedOrigins = Permission denied for <%1$S> to call method %2$S.%3$S on <%4$S>.
+# LOCALIZATION NOTE (CallMethodDeniedOriginsSubjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the method of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain".
+CallMethodDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to call method %2$S.%3$S on <%4$S> (document.domain has not been set).
+# LOCALIZATION NOTE (CallMethodDeniedOriginsObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the method of that object that access was denied for.
+# %5$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+CallMethodDeniedOriginsObjectDomain = Permission denied for <%1$S> (document.domain has not been set) to call method %2$S.%3$S on <%4$S> (document.domain=<%5$S>).
+# LOCALIZATION NOTE (CallMethodDeniedOriginsSubjectDomainObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the method of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain"
+# %6$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+CallMethodDeniedOriginsSubjectDomainObjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to call method %2$S.%3$S on <%4$S> (document.domain=<%6$S>).
+
 GetPropertyDeniedOriginsOnlySubject = Permission denied for <%S> to get property %S.%S
 SetPropertyDeniedOriginsOnlySubject = Permission denied for <%S> to set property %S.%S
 CallMethodDeniedOriginsOnlySubject = Permission denied for <%S> to call method %S.%S

From ebe55e75dcbc6cc52f76b4e0589ffb0a1bdbf825 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Tue, 28 Jul 2009 10:11:09 -0700
Subject: [PATCH 031/175] Backed out changeset 246b44df7dd3 (bug 504384). This
 fix was wrong.

---
 toolkit/content/widgets/autocomplete.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index 83826ee32f4..7774281c8a5 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -975,15 +975,13 @@
       <method name="_invalidate">
         <body>
           <![CDATA[
-          // If we do not have a specific height, we'll have to figure out what
-          // our actual height should be dynamically.
           if (!this.hasAttribute("height")) {
             // collapsed if no matches
             this.richlistbox.collapsed = (this._matchCount == 0);
 
-            // Adjust the height, but we need to delay this because adjustHeight
-            // gets the wrong values (see the comments in _adjustAcItem about
-            // overflow.  XXX why?).
+            // Dynamically update height until richlistbox.rows works (bug 401939)
+            // Adjust the height immediately and after the row contents update
+            this.adjustHeight();
             setTimeout(function(self) self.adjustHeight(), 0, this);
           }
 

From ce8cac983753141f018eee74813a8e6f27b3b57a Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Tue, 28 Jul 2009 10:21:03 -0700
Subject: [PATCH 032/175] Bug 506022 - Avoid obtaining the database mutex at
 all costs in Connection::ExecuteAsync Stop calling any SQLite functions that
 would acquire the database mutex inside Connection::ExecuteAsync. 
 Additionally, do not actually bind parameters when the binding functions are
 called, but rather when we execute (so for async statements, that will happen
 on the background thread creating no mutex contention with the main thread).
 r=asuth

---
 storage/src/Variant.h                         |  10 +-
 .../src/mozStorageAsyncStatementExecution.cpp |   6 +-
 storage/src/mozStorageBindingParams.cpp       |  10 +-
 storage/src/mozStorageBindingParams.h         |   5 +
 storage/src/mozStorageBindingParamsArray.h    |  19 +-
 storage/src/mozStorageConnection.cpp          |  64 ++----
 storage/src/mozStorageStatement.cpp           | 189 ++++++++++++++++--
 storage/src/mozStorageStatement.h             |  34 ++++
 storage/src/mozStorageStatementData.h         |  34 +++-
 .../test/unit/test_statement_executeAsync.js  |   8 +-
 storage/test/unit/test_storage_connection.js  |  20 ++
 11 files changed, 308 insertions(+), 91 deletions(-)

diff --git a/storage/src/Variant.h b/storage/src/Variant.h
index 58d3929e81e..f5544db8d8e 100644
--- a/storage/src/Variant.h
+++ b/storage/src/Variant.h
@@ -289,7 +289,15 @@ struct variant_blob_traits<PRUint8[]>
                                  PRUint32 *_size,
                                  void **_result)
   {
-    // Copy the array
+    // For empty blobs, we return nsnull.
+    if (aData.Length() == 0) {
+      *_result = nsnull;
+      *_type = nsIDataType::VTYPE_UINT8;
+      *_size = 0;
+      return NS_OK;
+    }
+
+    // Otherwise, we copy the array.
     *_result = nsMemory::Clone(aData.Elements(), aData.Length() * sizeof(PRUint8));
     NS_ENSURE_TRUE(*_result, NS_ERROR_OUT_OF_MEMORY);
 
diff --git a/storage/src/mozStorageAsyncStatementExecution.cpp b/storage/src/mozStorageAsyncStatementExecution.cpp
index 5b4bdf9621d..37df29f50de 100644
--- a/storage/src/mozStorageAsyncStatementExecution.cpp
+++ b/storage/src/mozStorageAsyncStatementExecution.cpp
@@ -566,9 +566,9 @@ AsyncExecuteStatements::Run()
   // If there is more than one statement, run it in a transaction.  We assume
   // that we have been given write statements since getting a batch of read
   // statements doesn't make a whole lot of sense.
-  // Additionally, if we have only one statement and it has parameters to be
-  // bound, we assume that the consumer would want a transaction as well.
-  if (mStatements.Length() > 1 || mStatements[0].hasParametersToBeBound()) {
+  // Additionally, if we have only one statement and it needs a transaction, we
+  // will wrap it in one.
+  if (mStatements.Length() > 1 || mStatements[0].needsTransaction()) {
     // We don't error if this failed because it's not terrible if it does.
     mTransactionManager = new mozStorageTransaction(mConnection, PR_FALSE,
                                                     mozIStorageConnection::TRANSACTION_IMMEDIATE);
diff --git a/storage/src/mozStorageBindingParams.cpp b/storage/src/mozStorageBindingParams.cpp
index 82326e14cc3..f1019161a85 100644
--- a/storage/src/mozStorageBindingParams.cpp
+++ b/storage/src/mozStorageBindingParams.cpp
@@ -136,6 +136,7 @@ BindingParams::BindingParams(BindingParamsArray *aOwningArray,
 , mLocked(false)
 {
   (void)mOwningStatement->GetParameterCount(&mParamCount);
+  (void)mParameters.SetCapacity(mParamCount);
 }
 
 void
@@ -151,6 +152,13 @@ BindingParams::lock()
   mOwningArray = nsnull;
 }
 
+void
+BindingParams::unlock()
+{
+  NS_ASSERTION(mLocked == true, "Parameters were not yet locked!");
+  mLocked = false;
+}
+
 const BindingParamsArray *
 BindingParams::getOwner() const
 {
@@ -285,7 +293,7 @@ BindingParams::BindByIndex(PRUint32 aIndex,
   ENSURE_INDEX_VALUE(aIndex, mParamCount);
 
   // Store the variant for later use.
-  NS_ENSURE_TRUE(mParameters.InsertObjectAt(aValue, aIndex),
+  NS_ENSURE_TRUE(mParameters.ReplaceObjectAt(aValue, aIndex),
                  NS_ERROR_OUT_OF_MEMORY);
   return NS_OK;
 }
diff --git a/storage/src/mozStorageBindingParams.h b/storage/src/mozStorageBindingParams.h
index f1e9450e847..fd175954131 100644
--- a/storage/src/mozStorageBindingParams.h
+++ b/storage/src/mozStorageBindingParams.h
@@ -66,6 +66,11 @@ public:
    */
   void lock();
 
+  /**
+   * Unlocks the parameters and allows modification to it again.
+   */
+  void unlock();
+
   /**
    * @returns the pointer to the owning BindingParamsArray.
    */
diff --git a/storage/src/mozStorageBindingParamsArray.h b/storage/src/mozStorageBindingParamsArray.h
index 27ce1dd6630..0ce35ca93b5 100644
--- a/storage/src/mozStorageBindingParamsArray.h
+++ b/storage/src/mozStorageBindingParamsArray.h
@@ -59,6 +59,8 @@ public:
 
   BindingParamsArray(Statement *aOwningStatement);
 
+  typedef nsTArray_base::size_type size_type;
+
   /**
    * Locks the array and prevents further modification to it (such as adding
    * more elements to it).
@@ -66,10 +68,15 @@ public:
   void lock();
 
   /**
-   * @returns the pointer to the owning BindingParamsArray.
+   * @return the pointer to the owning BindingParamsArray.
    */
   const Statement *getOwner() const;
 
+  /**
+   * @return the number of elemets the array contains.
+   */
+  const size_type length() const { return mArray.Length(); }
+
   class iterator {
   public:
     iterator(BindingParamsArray *aArray,
@@ -95,7 +102,7 @@ public:
     }
     BindingParams *operator*()
     {
-      NS_ASSERTION(mIndex < mArray->mArray.Length(),
+      NS_ASSERTION(mIndex < mArray->length(),
                    "Dereferenceing an invalid value!");
       return mArray->mArray[mIndex].get();
     }
@@ -110,7 +117,8 @@ public:
    */
   inline iterator begin()
   {
-    NS_ASSERTION(mLocked, "Obtaining an iterator when we are not locked!");
+    NS_ASSERTION(length() != 0,
+                 "Obtaining an iterator to the beginning with no elements!");
     return iterator(this, 0);
   }
 
@@ -119,8 +127,9 @@ public:
    */
   inline iterator end()
   {
-    NS_ASSERTION(mLocked, "Obtaining an iterator when we are not locked!");
-    return iterator(this, mArray.Length());
+    NS_ASSERTION(mLocked,
+                 "Obtaining an iterator to the end when we are not locked!");
+    return iterator(this, length());
   }
 private:
   nsRefPtr<Statement> mOwningStatement;
diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp
index 29c3e23d055..83e7db3905e 100644
--- a/storage/src/mozStorageConnection.cpp
+++ b/storage/src/mozStorageConnection.cpp
@@ -639,64 +639,24 @@ Connection::ExecuteAsync(mozIStorageStatement **aStatements,
                          mozIStorageStatementCallback *aCallback,
                          mozIStoragePendingStatement **_handle)
 {
-  int rc = SQLITE_OK;
   nsTArray<StatementData> stmts(aNumStatements);
-  for (PRUint32 i = 0; i < aNumStatements && rc == SQLITE_OK; i++) {
-    sqlite3_stmt *old_stmt =
-        static_cast<Statement *>(aStatements[i])->nativeStatement();
-    if (!old_stmt) {
-      rc = SQLITE_MISUSE;
-      break;
-    }
-    NS_ASSERTION(::sqlite3_db_handle(old_stmt) == mDBConn,
+  for (PRUint32 i = 0; i < aNumStatements; i++) {
+    Statement *stmt = static_cast<Statement *>(aStatements[i]);
+
+    // Obtain our StatementData.
+    StatementData data;
+    nsresult rv = stmt->getAsynchronousStatementData(data);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    NS_ASSERTION(::sqlite3_db_handle(stmt->nativeStatement()) == mDBConn,
                  "Statement must be from this database connection!");
 
-    // Clone this statement.  We only need a sqlite3_stmt object, so we can
-    // avoid all the extra work that making a new Statement would normally
-    // involve and use the SQLite API.
-    sqlite3_stmt *new_stmt;
-    rc = ::sqlite3_prepare_v2(mDBConn, ::sqlite3_sql(old_stmt), -1, &new_stmt,
-                              NULL);
-    if (rc != SQLITE_OK)
-      break;
-
-#ifdef PR_LOGGING
-    PR_LOG(gStorageLog, PR_LOG_NOTICE,
-           ("Cloned statement 0x%p to 0x%p", old_stmt, new_stmt));
-#endif
-
-    // Transfer the bindings
-    rc = sqlite3_transfer_bindings(old_stmt, new_stmt);
-    if (rc != SQLITE_OK)
-      break;
-
-    Statement *storageStmt = static_cast<Statement *>(aStatements[i]);
-    StatementData data(new_stmt, storageStmt->bindingParamsArray());
-    if (!stmts.AppendElement(data)) {
-      rc = SQLITE_NOMEM;
-      break;
-    }
+    // Now append it to our array.
+    NS_ENSURE_TRUE(stmts.AppendElement(data), NS_ERROR_OUT_OF_MEMORY);
   }
 
   // Dispatch to the background
-  nsresult rv = NS_OK;
-  if (rc == SQLITE_OK)
-    rv = AsyncExecuteStatements::execute(stmts, this, aCallback, _handle);
-
-  // We had a failure, so we need to clean up...
-  if (rc != SQLITE_OK || NS_FAILED(rv)) {
-    for (PRUint32 i = 0; i < stmts.Length(); i++)
-      (void)::sqlite3_finalize(stmts[i]);
-
-    if (rc != SQLITE_OK)
-      rv = convertResultCode(rc);
-  }
-
-  // Always reset all the statements
-  for (PRUint32 i = 0; i < aNumStatements; i++)
-    (void)aStatements[i]->Reset();
-
-  return rv;
+  return AsyncExecuteStatements::execute(stmts, this, aCallback, _handle);
 }
 
 NS_IMETHODIMP
diff --git a/storage/src/mozStorageStatement.cpp b/storage/src/mozStorageStatement.cpp
index 971eb4fbfa2..ec8750775bb 100644
--- a/storage/src/mozStorageStatement.cpp
+++ b/storage/src/mozStorageStatement.cpp
@@ -43,9 +43,13 @@
 
 #include "nsError.h"
 #include "nsMemory.h"
+#include "nsThreadUtils.h"
 #include "nsIClassInfoImpl.h"
 #include "nsIProgrammingLanguage.h"
 
+#include "mozIStorageError.h"
+
+#include "mozStorageBindingParams.h"
 #include "mozStorageConnection.h"
 #include "mozStorageStatementJSHelper.h"
 #include "mozStoragePrivateHelpers.h"
@@ -62,6 +66,33 @@ extern PRLogModuleInfo* gStorageLog;
 namespace mozilla {
 namespace storage {
 
+////////////////////////////////////////////////////////////////////////////////
+//// Local Classes
+
+namespace {
+
+/**
+ * Used to finalize an asynchronous statement on the background thread.
+ */
+class AsyncStatementFinalizer : public nsRunnable
+{
+public:
+  AsyncStatementFinalizer(sqlite3_stmt *aStatement)
+  : mStatement(aStatement)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    (void)::sqlite3_finalize(mStatement);
+    return NS_OK;
+  }
+private:
+  sqlite3_stmt *mStatement;
+};
+
+} // anonymous namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 //// nsIClassInfo
 
@@ -151,6 +182,7 @@ Statement::Statement()
 , mDBStatement(NULL)
 , mColumnNames()
 , mExecuting(false)
+, mCachedAsyncStatement(NULL)
 {
 }
 
@@ -231,6 +263,82 @@ Statement::initialize(Connection *aDBConnection,
   return NS_OK;
 }
 
+nsresult
+Statement::getAsynchronousStatementData(StatementData &_data)
+{
+  if (!mDBStatement)
+    return NS_ERROR_UNEXPECTED;
+
+  sqlite3_stmt *stmt;
+  int rc = getAsyncStatement(&stmt);
+  if (rc != SQLITE_OK)
+    return convertResultCode(rc);
+
+  _data = StatementData(stmt, bindingParamsArray(), this);
+
+  return NS_OK;
+}
+
+int
+Statement::getAsyncStatement(sqlite3_stmt **_stmt)
+{
+  // If we have no statement, we shouldn't be calling this method!
+  NS_ASSERTION(mDBStatement != NULL, "We have no statement to clone!");
+
+  // If we do not yet have a cached async statement, clone our statement now.
+  if (!mCachedAsyncStatement) {
+    int rc = ::sqlite3_prepare_v2(mDBConnection->GetNativeConnection(),
+                                  ::sqlite3_sql(mDBStatement), -1,
+                                  &mCachedAsyncStatement, NULL);
+    if (rc != SQLITE_OK)
+      return rc;
+
+#ifdef PR_LOGGING
+    PR_LOG(gStorageLog, PR_LOG_NOTICE,
+           ("Cloned statement 0x%p to 0x%p", mDBStatement,
+            mCachedAsyncStatement));
+#endif
+  }
+
+  *_stmt = mCachedAsyncStatement;
+  return SQLITE_OK;
+}
+
+BindingParams *
+Statement::getParams()
+{
+  nsresult rv;
+
+  // If we do not have an array object yet, make it.
+  if (!mParamsArray) {
+    nsCOMPtr<mozIStorageBindingParamsArray> array;
+    rv = NewBindingParamsArray(getter_AddRefs(array));
+    NS_ENSURE_SUCCESS(rv, nsnull);
+
+    mParamsArray = static_cast<BindingParamsArray *>(array.get());
+  }
+
+  // If there isn't already any rows added, we'll have to add one to use.
+  if (mParamsArray->length() == 0) {
+    nsRefPtr<BindingParams> params(new BindingParams(mParamsArray, this));
+    NS_ENSURE_TRUE(params, nsnull);
+
+    rv = mParamsArray->AddParams(params);
+    NS_ENSURE_SUCCESS(rv, nsnull);
+
+    // We have to unlock our params because AddParams locks them.  This is safe
+    // because no reference to the params object was, or ever will be given out.
+    params->unlock();
+
+    // We also want to lock our array at this point - we don't want anything to
+    // be added to it.  Nothing has, or will ever get a reference to it, but we
+    // will get additional safety checks via assertions by doing this.
+    mParamsArray->lock();
+  }
+
+  return *mParamsArray->begin();
+}
+
 Statement::~Statement()
 {
   (void)Finalize();
@@ -280,6 +388,20 @@ Statement::Finalize()
   int srv = ::sqlite3_finalize(mDBStatement);
   mDBStatement = NULL;
 
+  // We need to finalize our async statement too, but want to make sure that any
+  // queued up statements run first.  Dispatch an event to the background thread
+  // that will do this for us.
+  if (mCachedAsyncStatement) {
+    nsCOMPtr<nsIRunnable> event =
+      new AsyncStatementFinalizer(mCachedAsyncStatement);
+    NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY);
+
+    nsCOMPtr<nsIEventTarget> target = mDBConnection->getAsyncExecutionTarget();
+    nsresult rv = target->Dispatch(event, NS_DISPATCH_NORMAL);
+    NS_ENSURE_SUCCESS(rv, rv);
+    mCachedAsyncStatement = NULL;
+  }
+
   // We are considered dead at this point, so any wrappers for row or params
   // need to lose their reference to us.
   if (mStatementParamsHolder) {
@@ -415,6 +537,7 @@ Statement::Reset()
   checkAndLogStatementPerformance(mDBStatement);
 #endif
 
+  mParamsArray = nsnull;
   (void)sqlite3_reset(mDBStatement);
   (void)sqlite3_clear_bindings(mDBStatement);
 
@@ -430,10 +553,10 @@ Statement::BindUTF8StringParameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_text(mDBStatement, aParamIndex + 1,
-                                PromiseFlatCString(aValue).get(),
-                                aValue.Length(), SQLITE_TRANSIENT);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindUTF8StringByIndex(aParamIndex, aValue);
 }
 
 NS_IMETHODIMP
@@ -443,10 +566,10 @@ Statement::BindStringParameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_text16(mDBStatement, aParamIndex + 1,
-                                  PromiseFlatString(aValue).get(),
-                                  aValue.Length() * 2, SQLITE_TRANSIENT);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindStringByIndex(aParamIndex, aValue);
 }
 
 NS_IMETHODIMP
@@ -456,8 +579,10 @@ Statement::BindDoubleParameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_double(mDBStatement, aParamIndex + 1, aValue);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindDoubleByIndex(aParamIndex, aValue);
 }
 
 NS_IMETHODIMP
@@ -467,8 +592,10 @@ Statement::BindInt32Parameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_int(mDBStatement, aParamIndex + 1, aValue);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindInt32ByIndex(aParamIndex, aValue);
 }
 
 NS_IMETHODIMP
@@ -478,8 +605,10 @@ Statement::BindInt64Parameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_int64(mDBStatement, aParamIndex + 1, aValue);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindInt64ByIndex(aParamIndex, aValue);
 }
 
 NS_IMETHODIMP
@@ -488,8 +617,10 @@ Statement::BindNullParameter(PRUint32 aParamIndex)
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_null(mDBStatement, aParamIndex + 1);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindNullByIndex(aParamIndex);
 }
 
 NS_IMETHODIMP
@@ -500,9 +631,10 @@ Statement::BindBlobParameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_blob(mDBStatement, aParamIndex + 1, aValue,
-                                aValueSize, SQLITE_TRANSIENT);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindBlobByIndex(aParamIndex, aValue, aValueSize);
 }
 
 NS_IMETHODIMP
@@ -551,6 +683,25 @@ Statement::ExecuteStep(PRBool *_moreResults)
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
+  // Bind any parameters first before executing.
+  if (mParamsArray) {
+    // If we have more than one row of parameters to bind, they shouldn't be
+    // calling this method (and instead use executeAsync).
+    if (mParamsArray->length() != 1)
+      return NS_ERROR_UNEXPECTED;
+
+    BindingParamsArray::iterator row = mParamsArray->begin();
+    nsCOMPtr<mozIStorageError> error;
+    error = (*row)->bind(mDBStatement);
+    if (error) {
+      PRInt32 srv;
+      (void)error->GetResult(&srv);
+      return convertResultCode(srv);
+    }
+
+    // We have bound, so now we can clear our array.
+    mParamsArray = nsnull;
+  }
   int srv = ::sqlite3_step(mDBStatement);
 
 #ifdef PR_LOGGING
diff --git a/storage/src/mozStorageStatement.h b/storage/src/mozStorageStatement.h
index 62fcd420577..c3dfe7908b9 100644
--- a/storage/src/mozStorageStatement.h
+++ b/storage/src/mozStorageStatement.h
@@ -46,6 +46,7 @@
 #include "nsTArray.h"
 
 #include "mozStorageBindingParamsArray.h"
+#include "mozStorageStatementData.h"
 #include "mozIStorageStatement.h"
 
 class nsIXPConnectJSObjectHolder;
@@ -55,6 +56,7 @@ namespace mozilla {
 namespace storage {
 class StatementJSHelper;
 class Connection;
+class BindingParams;
 
 class Statement : public mozIStorageStatement
 {
@@ -92,6 +94,16 @@ public:
     return mParamsArray.forget();
   }
 
+  /**
+   * Obtains the StatementData needed for asynchronous execution.
+   *
+   * @param _data
+   *        A reference to a StatementData object that will be populated upon
+   *        successful execution of this method.
+   * @return an nsresult indicating success or failure.
+   */
+  nsresult getAsynchronousStatementData(StatementData &_data);
+
 private:
     ~Statement();
 
@@ -102,12 +114,34 @@ private:
     nsTArray<nsCString> mColumnNames;
     bool mExecuting;
 
+    /**
+     * @return a pointer to the BindingParams object to use with our Bind*
+     *         method.
+     */
+    BindingParams *getParams();
+
     /**
      * Holds the array of parameters to bind to this statement when we execute
      * it asynchronously.
      */
     nsRefPtr<BindingParamsArray> mParamsArray;
 
+    /**
+     * Holds a copy of mDBStatement that we can use asynchronously.  Access to
+     * this is serialized on the asynchronous thread, so it does not need to be
+     * protected.  We will finalize this statement in our destructor.
+     */
+    sqlite3_stmt *mCachedAsyncStatement;
+
+    /**
+     * Obtains the statement to use on the background thread.
+     *
+     * @param _stmt
+     *        An outparm where the new statement should be placed.
+     * @return a SQLite result code indicating success or failure.
+     */
+    int getAsyncStatement(sqlite3_stmt **_stmt);
+
     /**
      * The following two members are only used with the JS helper.  They cache
      * the row and params objects.
diff --git a/storage/src/mozStorageStatementData.h b/storage/src/mozStorageStatementData.h
index ff1270a4d33..1ad80bd88b6 100644
--- a/storage/src/mozStorageStatementData.h
+++ b/storage/src/mozStorageStatementData.h
@@ -40,6 +40,8 @@
 #ifndef _mozStorageStatementData_h_
 #define _mozStorageStatementData_h_
 
+#include "sqlite3.h"
+
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 
@@ -54,14 +56,17 @@ class StatementData
 {
 public:
   StatementData(sqlite3_stmt *aStatement,
-                already_AddRefed<BindingParamsArray> aParamsArray)
+                already_AddRefed<BindingParamsArray> aParamsArray,
+                nsISupports *aStatementOwner)
   : mStatement(aStatement)
   , mParamsArray(aParamsArray)
+  , mStatementOwner(aStatementOwner)
   {
   }
   StatementData(const StatementData &aSource)
   : mStatement(aSource.mStatement)
   , mParamsArray(aSource.mParamsArray)
+  , mStatementOwner(aSource.mStatementOwner)
   {
   }
   StatementData()
@@ -76,28 +81,45 @@ public:
   operator BindingParamsArray *() const { return mParamsArray; }
 
   /**
-   * Finalizes and NULLs out our sqlite3_stmt.  Also releases our parameter
-   * array since we'll no longer need it.
+   * NULLs out our sqlite3_stmt (it is held by the owner) after reseting it and
+   * clear all bindings to it.  Then, NULL out the rest of our data.
    */
   inline void finalize()
   {
-    (void)::sqlite3_finalize(mStatement);
+    (void)::sqlite3_reset(mStatement);
+    (void)::sqlite3_clear_bindings(mStatement);
     mStatement = NULL;
     mParamsArray = nsnull;
+    mStatementOwner = nsnull;
   }
 
   /**
    * Indicates if this statement has parameters to be bound before it is
    * executed.
    *
-   * @returns true if the statement has parameters to bind against, false
-   *          otherwise.
+   * @return true if the statement has parameters to bind against, false
+   *         otherwise.
    */
   inline bool hasParametersToBeBound() const { return mParamsArray != nsnull; }
+  /**
+   * Indicates if this statement needs a transaction for execution.
+   *
+   * @return true if the statement needs a transaction, false otherwise.
+   */
+  inline bool needsTransaction() const
+  {
+    return mParamsArray != nsnull && mParamsArray->length() > 1;
+  }
 
 private:
   sqlite3_stmt *mStatement;
   nsRefPtr<BindingParamsArray> mParamsArray;
+
+  /**
+   * We hold onto a reference of the statement's owner so it doesn't get
+   * destroyed out from under us.
+   */
+  nsCOMPtr<nsISupports> mStatementOwner;
 };
 
 } // namespace storage
diff --git a/storage/test/unit/test_statement_executeAsync.js b/storage/test/unit/test_statement_executeAsync.js
index 64aad197ef5..6c2fa58aadc 100644
--- a/storage/test/unit/test_statement_executeAsync.js
+++ b/storage/test/unit/test_statement_executeAsync.js
@@ -96,11 +96,11 @@ function test_add_data()
     "INSERT INTO test (id, string, number, nuller, blober) " +
     "VALUES (?, ?, ?, ?, ?)"
   );
-  stmt.bindInt32Parameter(0, INTEGER);
-  stmt.bindStringParameter(1, TEXT);
-  stmt.bindDoubleParameter(2, REAL);
-  stmt.bindNullParameter(3);
   stmt.bindBlobParameter(4, BLOB, BLOB.length);
+  stmt.bindNullParameter(3);
+  stmt.bindDoubleParameter(2, REAL);
+  stmt.bindStringParameter(1, TEXT);
+  stmt.bindInt32Parameter(0, INTEGER);
 
   stmt.executeAsync({
     handleResult: function(aResultSet)
diff --git a/storage/test/unit/test_storage_connection.js b/storage/test/unit/test_storage_connection.js
index a715b77b514..cef154339e4 100644
--- a/storage/test/unit/test_storage_connection.js
+++ b/storage/test/unit/test_storage_connection.js
@@ -37,6 +37,9 @@
 
 // This file tests the functions of mozIStorageConnection
 
+////////////////////////////////////////////////////////////////////////////////
+//// Test Functions
+
 function test_connectionReady_open()
 {
   // there doesn't seem to be a way for the connection to not be ready (unless
@@ -211,6 +214,22 @@ function test_defaultSynchronousAtNormal()
   }
 }
 
+function test_close_succeeds_with_finalized_async_statement()
+{
+  // We want to make sure we create a cached async statement to make sure that
+  // when we finalize our statement, we end up finalizing the async one too so
+  // close will succeed.
+  let stmt = createStatement("SELECT * FROM test");
+  stmt.executeAsync();
+  stmt.finalize();
+
+  // Cleanup calls close, as well as removes the database file.
+  cleanup();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// Test Runner
+
 var tests = [
   test_connectionReady_open,
   test_connectionReady_closed,
@@ -231,6 +250,7 @@ var tests = [
   test_set_schemaVersion_negative,
   test_createTable,
   test_defaultSynchronousAtNormal,
+  test_close_succeeds_with_finalized_async_statement,
 ];
 
 function run_test()

From 4e7257b0a1da95ec9dc2046ae37f4ae0cafd0aa5 Mon Sep 17 00:00:00 2001
From: Joe Drew <joe@drew.ca>
Date: Wed, 29 Jul 2009 11:03:58 -0400
Subject: [PATCH 033/175] Bug 506113 - Remove stray reference to gfx/shared
 from toolkit/toolkit-makefiles.sh. blanket-r=bsmedberg

---
 toolkit/toolkit-makefiles.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 77094a4f0d5..6e8746139f3 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -119,7 +119,6 @@ MAKEFILES_gfx="
   gfx/public/Makefile
   gfx/src/Makefile
   gfx/src/psshared/Makefile
-  gfx/src/shared/Makefile
   gfx/src/thebes/Makefile
   gfx/tests/Makefile
   gfx/thebes/Makefile

From ca62ee38ad086c99c26184c836ba9138096a70c7 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Wed, 29 Jul 2009 13:39:28 -0400
Subject: [PATCH 034/175] Bug 451898.  When stopping an error page load, make
 sure to null out mLSHE.  r=biesi

---
 docshell/base/nsDocShell.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 0f552fe6362..bbcffad92d5 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -3952,6 +3952,12 @@ nsDocShell::Stop(PRUint32 aStopFlags)
     // Revoke any pending event related to content viewer restoration
     mRestorePresentationEvent.Revoke();
 
+    if (mLoadType == LOAD_ERROR_PAGE && mLSHE) {
+        // Since error page loads never unset mLSHE, do so now
+        SetHistoryEntry(&mOSHE, mLSHE);
+        SetHistoryEntry(&mLSHE, nsnull);
+    }
+
     if (nsIWebNavigation::STOP_CONTENT & aStopFlags) {
         // Stop the document loading
         if (mContentViewer)

From 78b1e5309918b4718488ab779a953c518cfd0836 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Wed, 29 Jul 2009 13:54:44 -0400
Subject: [PATCH 035/175] Bug 392526. Some callers of nsID::ToString use a
 mismatched allocator to free the string. r=bsmedberg

---
 caps/src/nsScriptSecurityManager.cpp                 |  6 +++---
 extensions/java/xpcom/src/nsJavaWrapper.cpp          |  4 ++--
 .../java/xpcom/src/nsJavaXPCOMBindingUtils.cpp       | 10 +++++-----
 extensions/java/xpcom/src/nsJavaXPTCStub.cpp         | 12 ++++++------
 intl/uconv/public/nsEncoderDecoderUtils.h            |  3 ---
 js/src/xpconnect/src/xpcwrappedjs.cpp                |  2 +-
 js/src/xpconnect/src/xpcwrappedjsclass.cpp           |  2 +-
 7 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index 8fea1fe279d..b03383edddb 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -2863,7 +2863,7 @@ nsScriptSecurityManager::CanCreateWrapper(JSContext *cx,
 #ifdef DEBUG_CAPS_CanCreateWrapper
     char* iidStr = aIID.ToString();
     printf("### CanCreateWrapper(%s) ", iidStr);
-    nsCRT::free(iidStr);
+    NS_Free(iidStr);
 #endif
 // XXX Special case for nsIXPCException ?
     ClassInfoData objClassInfo = ClassInfoData(aClassInfo, nsnull);
@@ -2992,7 +2992,7 @@ nsScriptSecurityManager::CanCreateInstance(JSContext *cx,
 #ifdef DEBUG_CAPS_CanCreateInstance
     char* cidStr = aCID.ToString();
     printf("### CanCreateInstance(%s) ", cidStr);
-    nsCRT::free(cidStr);
+    NS_Free(cidStr);
 #endif
 
     nsresult rv = CheckXPCPermissions(nsnull, nsnull, nsnull, nsnull);
@@ -3029,7 +3029,7 @@ nsScriptSecurityManager::CanGetService(JSContext *cx,
 #ifdef DEBUG_CAPS_CanGetService
     char* cidStr = aCID.ToString();
     printf("### CanGetService(%s) ", cidStr);
-    nsCRT::free(cidStr);
+    NS_Free(cidStr);
 #endif
 
     nsresult rv = CheckXPCPermissions(nsnull, nsnull, nsnull, nsnull);
diff --git a/extensions/java/xpcom/src/nsJavaWrapper.cpp b/extensions/java/xpcom/src/nsJavaWrapper.cpp
index 1868b4fb62e..1d6806d4e65 100644
--- a/extensions/java/xpcom/src/nsJavaWrapper.cpp
+++ b/extensions/java/xpcom/src/nsJavaWrapper.cpp
@@ -1801,7 +1801,7 @@ GetNewOrUsedJavaWrapper(JNIEnv* env, nsISupports* aXPCOMObject,
            (PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID,
                                                java_obj),
            (PRUint32) rootObject, iid_str));
-      PR_Free(iid_str);
+      NS_Free(iid_str);
 #endif
 
       // Associate XPCOM object with Java proxy
@@ -1844,7 +1844,7 @@ GetXPCOMInstFromProxy(JNIEnv* env, jobject aJavaObject, void** aResult)
        (PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID,
                                            aJavaObject),
        (PRUint32) inst->GetInstance(), iid_str));
-  PR_Free(iid_str);
+  NS_Free(iid_str);
   nsMemory::Free(iid);
 #endif
   return NS_OK;
diff --git a/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp b/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp
index 19967ead8c2..aeac8136c15 100644
--- a/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp
+++ b/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp
@@ -490,7 +490,7 @@ DestroyJavaProxyMappingEnum(PLDHashTable* aTable, PLDHashEntryHdr* aHeader,
            (PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID,
                                                javaObject),
            (PRUint32) entry, iid_str));
-      PR_Free(iid_str);
+      NS_Free(iid_str);
 #endif
       delete inst;  // releases native XPCOM object
     }
@@ -548,7 +548,7 @@ NativeToJavaProxyMap::Add(JNIEnv* env, nsISupports* aXPCOMObject,
   LOG(("+ NativeToJavaProxyMap (Java=%08x | XPCOM=%08x | IID=%s)\n",
        (PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID, aProxy),
        (PRUint32) aXPCOMObject, iid_str));
-  PR_Free(iid_str);
+  NS_Free(iid_str);
 #endif
   return NS_OK;
 }
@@ -584,7 +584,7 @@ NativeToJavaProxyMap::Find(JNIEnv* env, nsISupports* aNativeObject,
              (PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID,
                                                  *aResult),
              (PRUint32) aNativeObject, iid_str));
-        PR_Free(iid_str);
+        NS_Free(iid_str);
 #endif
       }
     }
@@ -620,7 +620,7 @@ NativeToJavaProxyMap::Remove(JNIEnv* env, nsISupports* aNativeObject,
            (PRUint32) env->CallStaticIntMethod(systemClass, hashCodeMID,
                                                item->javaObject),
            (PRUint32) aNativeObject, iid_str));
-      PR_Free(iid_str);
+      NS_Free(iid_str);
 #endif
 
       env->CallVoidMethod(item->javaObject, clearReferentMID);
@@ -709,7 +709,7 @@ JavaToXPTCStubMap::Add(jint aJavaObjectHashCode, nsJavaXPTCStub* aProxy)
   char* iid_str = iid->ToString();
   LOG(("+ JavaToXPTCStubMap (Java=%08x | XPCOM=%08x | IID=%s)\n",
        (PRUint32) aJavaObjectHashCode, (PRUint32) aProxy, iid_str));
-  PR_Free(iid_str);
+  NS_Free(iid_str);
   nsMemory::Free(iid);
   NS_RELEASE(iface_info);
 #endif
diff --git a/extensions/java/xpcom/src/nsJavaXPTCStub.cpp b/extensions/java/xpcom/src/nsJavaXPTCStub.cpp
index 0eb34751666..b8cda885410 100644
--- a/extensions/java/xpcom/src/nsJavaXPTCStub.cpp
+++ b/extensions/java/xpcom/src/nsJavaXPTCStub.cpp
@@ -72,7 +72,7 @@ nsJavaXPTCStub::nsJavaXPTCStub(jobject aJavaObject, nsIInterfaceInfo *aIInfo,
   char* iid_str = iid->ToString();
   LOG(("+ nsJavaXPTCStub (Java=%08x | XPCOM=%08x | IID=%s)\n",
       (PRUint32) mJavaRefHashCode, (PRUint32) this, iid_str));
-  PR_Free(iid_str);
+  NS_Free(iid_str);
 #endif
 }
 
@@ -112,7 +112,7 @@ nsJavaXPTCStub::AddRef()
   int refcnt = PRInt32(mMaster ? mMaster->mRefCnt : mRefCnt) + 1;
   LOG(("= nsJavaXPTCStub::AddRef (XPCOM=%08x | refcnt = %d | IID=%s)\n",
        (int) this, refcnt, iid_str));
-  PR_Free(iid_str);
+  NS_Free(iid_str);
   nsMemory::Free(iid);
 #endif
 
@@ -152,7 +152,7 @@ nsJavaXPTCStub::Release()
   int refcnt = PRInt32(mMaster ? mMaster->mRefCnt : mRefCnt) - 1;
   LOG(("= nsJavaXPTCStub::Release (XPCOM=%08x | refcnt = %d | IID=%s)\n",
        (int) this, refcnt, iid_str));
-  PR_Free(iid_str);
+  NS_Free(iid_str);
   nsMemory::Free(iid);
 #endif
 
@@ -171,7 +171,7 @@ nsJavaXPTCStub::Destroy()
   char* iid_str = iid->ToString();
   LOG(("- nsJavaXPTCStub (Java=%08x | XPCOM=%08x | IID=%s)\n",
       (PRUint32) mJavaRefHashCode, (PRUint32) this, iid_str));
-  PR_Free(iid_str);
+  NS_Free(iid_str);
   nsMemory::Free(iid);
 #endif
 
@@ -293,7 +293,7 @@ nsJavaXPTCStub::QueryInterface(const nsID &aIID, void **aInstancePtr)
     env->ExceptionClear();
     return NS_ERROR_OUT_OF_MEMORY;
   }
-  PR_Free(iid_str);
+  NS_Free(iid_str);
 
   // call queryInterface method
   jobject obj = env->CallObjectMethod(javaObject, qiMID, iid_jstr);
@@ -1653,7 +1653,7 @@ nsJavaXPTCStub::GetJavaObject()
   char* iid_str = iid->ToString();
   LOG(("< nsJavaXPTCStub (Java=%08x | XPCOM=%08x | IID=%s)\n",
        (PRUint32) mJavaRefHashCode, (PRUint32) this, iid_str));
-  PR_Free(iid_str);
+  NS_Free(iid_str);
   nsMemory::Free(iid);
 #endif
 
diff --git a/intl/uconv/public/nsEncoderDecoderUtils.h b/intl/uconv/public/nsEncoderDecoderUtils.h
index 576a738b492..2fddd95fc36 100644
--- a/intl/uconv/public/nsEncoderDecoderUtils.h
+++ b/intl/uconv/public/nsEncoderDecoderUtils.h
@@ -123,10 +123,7 @@ nsUConverterUnregSelf(nsIComponentManager *aCompMgr,                        \
     }                                                                   \
     key = entry->charset;                                               \
                                                                         \
-    char * value = entry->cid.ToString();                               \
-                                                                        \
     rv = catman->DeleteCategoryEntry(category, key, PR_TRUE);           \
-    CRTFREEIF(value);                                                   \
   }                                                                     \
   return rv;                                                            \
 }
diff --git a/js/src/xpconnect/src/xpcwrappedjs.cpp b/js/src/xpconnect/src/xpcwrappedjs.cpp
index 0a715d2e593..ed8c884c4b3 100644
--- a/js/src/xpconnect/src/xpcwrappedjs.cpp
+++ b/js/src/xpconnect/src/xpcwrappedjs.cpp
@@ -648,7 +648,7 @@ nsXPCWrappedJS::DebugDump(PRInt16 depth)
         char * iid = GetClass()->GetIID().ToString();
         XPC_LOG_ALWAYS(("IID number is %s", iid ? iid : "invalid"));
         if(iid)
-            PR_Free(iid);
+            NS_Free(iid);
         XPC_LOG_ALWAYS(("nsXPCWrappedJSClass @ %x", mClass));
 
         if(!isRoot)
diff --git a/js/src/xpconnect/src/xpcwrappedjsclass.cpp b/js/src/xpconnect/src/xpcwrappedjsclass.cpp
index c4843de541f..2dabc44676b 100644
--- a/js/src/xpconnect/src/xpcwrappedjsclass.cpp
+++ b/js/src/xpconnect/src/xpcwrappedjsclass.cpp
@@ -1947,7 +1947,7 @@ nsXPCWrappedJSClass::DebugDump(PRInt16 depth)
         char * iid = mIID.ToString();
         XPC_LOG_ALWAYS(("IID number is %s", iid ? iid : "invalid"));
         if(iid)
-            PR_Free(iid);
+            NS_Free(iid);
         XPC_LOG_ALWAYS(("InterfaceInfo @ %x", mInfo));
         uint16 methodCount = 0;
         if(depth)

From 5b07444635c21ffc942fca4e5923d2ec7bf66e68 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Tue, 28 Jul 2009 10:21:03 -0700
Subject: [PATCH 036/175] Bug 506022 - Avoid obtaining the database mutex at
 all costs in Connection::ExecuteAsync Stop calling any SQLite functions that
 would acquire the database mutex inside Connection::ExecuteAsync. 
 Additionally, do not actually bind parameters when the binding functions are
 called, but rather when we execute (so for async statements, that will happen
 on the background thread creating no mutex contention with the main thread).
 r=asuth

--HG--
extra : rebase_source : e42e10b28489c54463c60d6312a25bbf363398d8
---
 storage/src/Variant.h                         |  10 +-
 .../src/mozStorageAsyncStatementExecution.cpp |   6 +-
 storage/src/mozStorageBindingParams.cpp       |  10 +-
 storage/src/mozStorageBindingParams.h         |   5 +
 storage/src/mozStorageBindingParamsArray.h    |  19 +-
 storage/src/mozStorageConnection.cpp          |  64 ++----
 storage/src/mozStorageStatement.cpp           | 189 ++++++++++++++++--
 storage/src/mozStorageStatement.h             |  34 ++++
 storage/src/mozStorageStatementData.h         |  34 +++-
 .../test/unit/test_statement_executeAsync.js  |   8 +-
 storage/test/unit/test_storage_connection.js  |  20 ++
 11 files changed, 308 insertions(+), 91 deletions(-)

diff --git a/storage/src/Variant.h b/storage/src/Variant.h
index 58d3929e81e..f5544db8d8e 100644
--- a/storage/src/Variant.h
+++ b/storage/src/Variant.h
@@ -289,7 +289,15 @@ struct variant_blob_traits<PRUint8[]>
                                  PRUint32 *_size,
                                  void **_result)
   {
-    // Copy the array
+    // For empty blobs, we return nsnull.
+    if (aData.Length() == 0) {
+      *_result = nsnull;
+      *_type = nsIDataType::VTYPE_UINT8;
+      *_size = 0;
+      return NS_OK;
+    }
+
+    // Otherwise, we copy the array.
     *_result = nsMemory::Clone(aData.Elements(), aData.Length() * sizeof(PRUint8));
     NS_ENSURE_TRUE(*_result, NS_ERROR_OUT_OF_MEMORY);
 
diff --git a/storage/src/mozStorageAsyncStatementExecution.cpp b/storage/src/mozStorageAsyncStatementExecution.cpp
index 5b4bdf9621d..37df29f50de 100644
--- a/storage/src/mozStorageAsyncStatementExecution.cpp
+++ b/storage/src/mozStorageAsyncStatementExecution.cpp
@@ -566,9 +566,9 @@ AsyncExecuteStatements::Run()
   // If there is more than one statement, run it in a transaction.  We assume
   // that we have been given write statements since getting a batch of read
   // statements doesn't make a whole lot of sense.
-  // Additionally, if we have only one statement and it has parameters to be
-  // bound, we assume that the consumer would want a transaction as well.
-  if (mStatements.Length() > 1 || mStatements[0].hasParametersToBeBound()) {
+  // Additionally, if we have only one statement and it needs a transaction, we
+  // will wrap it in one.
+  if (mStatements.Length() > 1 || mStatements[0].needsTransaction()) {
     // We don't error if this failed because it's not terrible if it does.
     mTransactionManager = new mozStorageTransaction(mConnection, PR_FALSE,
                                                     mozIStorageConnection::TRANSACTION_IMMEDIATE);
diff --git a/storage/src/mozStorageBindingParams.cpp b/storage/src/mozStorageBindingParams.cpp
index 82326e14cc3..f1019161a85 100644
--- a/storage/src/mozStorageBindingParams.cpp
+++ b/storage/src/mozStorageBindingParams.cpp
@@ -136,6 +136,7 @@ BindingParams::BindingParams(BindingParamsArray *aOwningArray,
 , mLocked(false)
 {
   (void)mOwningStatement->GetParameterCount(&mParamCount);
+  (void)mParameters.SetCapacity(mParamCount);
 }
 
 void
@@ -151,6 +152,13 @@ BindingParams::lock()
   mOwningArray = nsnull;
 }
 
+void
+BindingParams::unlock()
+{
+  NS_ASSERTION(mLocked == true, "Parameters were not yet locked!");
+  mLocked = false;
+}
+
 const BindingParamsArray *
 BindingParams::getOwner() const
 {
@@ -285,7 +293,7 @@ BindingParams::BindByIndex(PRUint32 aIndex,
   ENSURE_INDEX_VALUE(aIndex, mParamCount);
 
   // Store the variant for later use.
-  NS_ENSURE_TRUE(mParameters.InsertObjectAt(aValue, aIndex),
+  NS_ENSURE_TRUE(mParameters.ReplaceObjectAt(aValue, aIndex),
                  NS_ERROR_OUT_OF_MEMORY);
   return NS_OK;
 }
diff --git a/storage/src/mozStorageBindingParams.h b/storage/src/mozStorageBindingParams.h
index f1e9450e847..fd175954131 100644
--- a/storage/src/mozStorageBindingParams.h
+++ b/storage/src/mozStorageBindingParams.h
@@ -66,6 +66,11 @@ public:
    */
   void lock();
 
+  /**
+   * Unlocks the parameters and allows modification to it again.
+   */
+  void unlock();
+
   /**
    * @returns the pointer to the owning BindingParamsArray.
    */
diff --git a/storage/src/mozStorageBindingParamsArray.h b/storage/src/mozStorageBindingParamsArray.h
index 27ce1dd6630..0ce35ca93b5 100644
--- a/storage/src/mozStorageBindingParamsArray.h
+++ b/storage/src/mozStorageBindingParamsArray.h
@@ -59,6 +59,8 @@ public:
 
   BindingParamsArray(Statement *aOwningStatement);
 
+  typedef nsTArray_base::size_type size_type;
+
   /**
    * Locks the array and prevents further modification to it (such as adding
    * more elements to it).
@@ -66,10 +68,15 @@ public:
   void lock();
 
   /**
-   * @returns the pointer to the owning BindingParamsArray.
+   * @return the pointer to the owning BindingParamsArray.
    */
   const Statement *getOwner() const;
 
+  /**
+   * @return the number of elemets the array contains.
+   */
+  const size_type length() const { return mArray.Length(); }
+
   class iterator {
   public:
     iterator(BindingParamsArray *aArray,
@@ -95,7 +102,7 @@ public:
     }
     BindingParams *operator*()
     {
-      NS_ASSERTION(mIndex < mArray->mArray.Length(),
+      NS_ASSERTION(mIndex < mArray->length(),
                    "Dereferenceing an invalid value!");
       return mArray->mArray[mIndex].get();
     }
@@ -110,7 +117,8 @@ public:
    */
   inline iterator begin()
   {
-    NS_ASSERTION(mLocked, "Obtaining an iterator when we are not locked!");
+    NS_ASSERTION(length() != 0,
+                 "Obtaining an iterator to the beginning with no elements!");
     return iterator(this, 0);
   }
 
@@ -119,8 +127,9 @@ public:
    */
   inline iterator end()
   {
-    NS_ASSERTION(mLocked, "Obtaining an iterator when we are not locked!");
-    return iterator(this, mArray.Length());
+    NS_ASSERTION(mLocked,
+                 "Obtaining an iterator to the end when we are not locked!");
+    return iterator(this, length());
   }
 private:
   nsRefPtr<Statement> mOwningStatement;
diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp
index 29c3e23d055..83e7db3905e 100644
--- a/storage/src/mozStorageConnection.cpp
+++ b/storage/src/mozStorageConnection.cpp
@@ -639,64 +639,24 @@ Connection::ExecuteAsync(mozIStorageStatement **aStatements,
                          mozIStorageStatementCallback *aCallback,
                          mozIStoragePendingStatement **_handle)
 {
-  int rc = SQLITE_OK;
   nsTArray<StatementData> stmts(aNumStatements);
-  for (PRUint32 i = 0; i < aNumStatements && rc == SQLITE_OK; i++) {
-    sqlite3_stmt *old_stmt =
-        static_cast<Statement *>(aStatements[i])->nativeStatement();
-    if (!old_stmt) {
-      rc = SQLITE_MISUSE;
-      break;
-    }
-    NS_ASSERTION(::sqlite3_db_handle(old_stmt) == mDBConn,
+  for (PRUint32 i = 0; i < aNumStatements; i++) {
+    Statement *stmt = static_cast<Statement *>(aStatements[i]);
+
+    // Obtain our StatementData.
+    StatementData data;
+    nsresult rv = stmt->getAsynchronousStatementData(data);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    NS_ASSERTION(::sqlite3_db_handle(stmt->nativeStatement()) == mDBConn,
                  "Statement must be from this database connection!");
 
-    // Clone this statement.  We only need a sqlite3_stmt object, so we can
-    // avoid all the extra work that making a new Statement would normally
-    // involve and use the SQLite API.
-    sqlite3_stmt *new_stmt;
-    rc = ::sqlite3_prepare_v2(mDBConn, ::sqlite3_sql(old_stmt), -1, &new_stmt,
-                              NULL);
-    if (rc != SQLITE_OK)
-      break;
-
-#ifdef PR_LOGGING
-    PR_LOG(gStorageLog, PR_LOG_NOTICE,
-           ("Cloned statement 0x%p to 0x%p", old_stmt, new_stmt));
-#endif
-
-    // Transfer the bindings
-    rc = sqlite3_transfer_bindings(old_stmt, new_stmt);
-    if (rc != SQLITE_OK)
-      break;
-
-    Statement *storageStmt = static_cast<Statement *>(aStatements[i]);
-    StatementData data(new_stmt, storageStmt->bindingParamsArray());
-    if (!stmts.AppendElement(data)) {
-      rc = SQLITE_NOMEM;
-      break;
-    }
+    // Now append it to our array.
+    NS_ENSURE_TRUE(stmts.AppendElement(data), NS_ERROR_OUT_OF_MEMORY);
   }
 
   // Dispatch to the background
-  nsresult rv = NS_OK;
-  if (rc == SQLITE_OK)
-    rv = AsyncExecuteStatements::execute(stmts, this, aCallback, _handle);
-
-  // We had a failure, so we need to clean up...
-  if (rc != SQLITE_OK || NS_FAILED(rv)) {
-    for (PRUint32 i = 0; i < stmts.Length(); i++)
-      (void)::sqlite3_finalize(stmts[i]);
-
-    if (rc != SQLITE_OK)
-      rv = convertResultCode(rc);
-  }
-
-  // Always reset all the statements
-  for (PRUint32 i = 0; i < aNumStatements; i++)
-    (void)aStatements[i]->Reset();
-
-  return rv;
+  return AsyncExecuteStatements::execute(stmts, this, aCallback, _handle);
 }
 
 NS_IMETHODIMP
diff --git a/storage/src/mozStorageStatement.cpp b/storage/src/mozStorageStatement.cpp
index 971eb4fbfa2..ec8750775bb 100644
--- a/storage/src/mozStorageStatement.cpp
+++ b/storage/src/mozStorageStatement.cpp
@@ -43,9 +43,13 @@
 
 #include "nsError.h"
 #include "nsMemory.h"
+#include "nsThreadUtils.h"
 #include "nsIClassInfoImpl.h"
 #include "nsIProgrammingLanguage.h"
 
+#include "mozIStorageError.h"
+
+#include "mozStorageBindingParams.h"
 #include "mozStorageConnection.h"
 #include "mozStorageStatementJSHelper.h"
 #include "mozStoragePrivateHelpers.h"
@@ -62,6 +66,33 @@ extern PRLogModuleInfo* gStorageLog;
 namespace mozilla {
 namespace storage {
 
+////////////////////////////////////////////////////////////////////////////////
+//// Local Classes
+
+namespace {
+
+/**
+ * Used to finalize an asynchronous statement on the background thread.
+ */
+class AsyncStatementFinalizer : public nsRunnable
+{
+public:
+  AsyncStatementFinalizer(sqlite3_stmt *aStatement)
+  : mStatement(aStatement)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    (void)::sqlite3_finalize(mStatement);
+    return NS_OK;
+  }
+private:
+  sqlite3_stmt *mStatement;
+};
+
+} // anonymous namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 //// nsIClassInfo
 
@@ -151,6 +182,7 @@ Statement::Statement()
 , mDBStatement(NULL)
 , mColumnNames()
 , mExecuting(false)
+, mCachedAsyncStatement(NULL)
 {
 }
 
@@ -231,6 +263,82 @@ Statement::initialize(Connection *aDBConnection,
   return NS_OK;
 }
 
+nsresult
+Statement::getAsynchronousStatementData(StatementData &_data)
+{
+  if (!mDBStatement)
+    return NS_ERROR_UNEXPECTED;
+
+  sqlite3_stmt *stmt;
+  int rc = getAsyncStatement(&stmt);
+  if (rc != SQLITE_OK)
+    return convertResultCode(rc);
+
+  _data = StatementData(stmt, bindingParamsArray(), this);
+
+  return NS_OK;
+}
+
+int
+Statement::getAsyncStatement(sqlite3_stmt **_stmt)
+{
+  // If we have no statement, we shouldn't be calling this method!
+  NS_ASSERTION(mDBStatement != NULL, "We have no statement to clone!");
+
+  // If we do not yet have a cached async statement, clone our statement now.
+  if (!mCachedAsyncStatement) {
+    int rc = ::sqlite3_prepare_v2(mDBConnection->GetNativeConnection(),
+                                  ::sqlite3_sql(mDBStatement), -1,
+                                  &mCachedAsyncStatement, NULL);
+    if (rc != SQLITE_OK)
+      return rc;
+
+#ifdef PR_LOGGING
+    PR_LOG(gStorageLog, PR_LOG_NOTICE,
+           ("Cloned statement 0x%p to 0x%p", mDBStatement,
+            mCachedAsyncStatement));
+#endif
+  }
+
+  *_stmt = mCachedAsyncStatement;
+  return SQLITE_OK;
+}
+
+BindingParams *
+Statement::getParams()
+{
+  nsresult rv;
+
+  // If we do not have an array object yet, make it.
+  if (!mParamsArray) {
+    nsCOMPtr<mozIStorageBindingParamsArray> array;
+    rv = NewBindingParamsArray(getter_AddRefs(array));
+    NS_ENSURE_SUCCESS(rv, nsnull);
+
+    mParamsArray = static_cast<BindingParamsArray *>(array.get());
+  }
+
+  // If there isn't already any rows added, we'll have to add one to use.
+  if (mParamsArray->length() == 0) {
+    nsRefPtr<BindingParams> params(new BindingParams(mParamsArray, this));
+    NS_ENSURE_TRUE(params, nsnull);
+
+    rv = mParamsArray->AddParams(params);
+    NS_ENSURE_SUCCESS(rv, nsnull);
+
+    // We have to unlock our params because AddParams locks them.  This is safe
+    // because no reference to the params object was, or ever will be given out.
+    params->unlock();
+
+    // We also want to lock our array at this point - we don't want anything to
+    // be added to it.  Nothing has, or will ever get a reference to it, but we
+    // will get additional safety checks via assertions by doing this.
+    mParamsArray->lock();
+  }
+
+  return *mParamsArray->begin();
+}
+
 Statement::~Statement()
 {
   (void)Finalize();
@@ -280,6 +388,20 @@ Statement::Finalize()
   int srv = ::sqlite3_finalize(mDBStatement);
   mDBStatement = NULL;
 
+  // We need to finalize our async statement too, but want to make sure that any
+  // queued up statements run first.  Dispatch an event to the background thread
+  // that will do this for us.
+  if (mCachedAsyncStatement) {
+    nsCOMPtr<nsIRunnable> event =
+      new AsyncStatementFinalizer(mCachedAsyncStatement);
+    NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY);
+
+    nsCOMPtr<nsIEventTarget> target = mDBConnection->getAsyncExecutionTarget();
+    nsresult rv = target->Dispatch(event, NS_DISPATCH_NORMAL);
+    NS_ENSURE_SUCCESS(rv, rv);
+    mCachedAsyncStatement = NULL;
+  }
+
   // We are considered dead at this point, so any wrappers for row or params
   // need to lose their reference to us.
   if (mStatementParamsHolder) {
@@ -415,6 +537,7 @@ Statement::Reset()
   checkAndLogStatementPerformance(mDBStatement);
 #endif
 
+  mParamsArray = nsnull;
   (void)sqlite3_reset(mDBStatement);
   (void)sqlite3_clear_bindings(mDBStatement);
 
@@ -430,10 +553,10 @@ Statement::BindUTF8StringParameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_text(mDBStatement, aParamIndex + 1,
-                                PromiseFlatCString(aValue).get(),
-                                aValue.Length(), SQLITE_TRANSIENT);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindUTF8StringByIndex(aParamIndex, aValue);
 }
 
 NS_IMETHODIMP
@@ -443,10 +566,10 @@ Statement::BindStringParameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_text16(mDBStatement, aParamIndex + 1,
-                                  PromiseFlatString(aValue).get(),
-                                  aValue.Length() * 2, SQLITE_TRANSIENT);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindStringByIndex(aParamIndex, aValue);
 }
 
 NS_IMETHODIMP
@@ -456,8 +579,10 @@ Statement::BindDoubleParameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_double(mDBStatement, aParamIndex + 1, aValue);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindDoubleByIndex(aParamIndex, aValue);
 }
 
 NS_IMETHODIMP
@@ -467,8 +592,10 @@ Statement::BindInt32Parameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_int(mDBStatement, aParamIndex + 1, aValue);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindInt32ByIndex(aParamIndex, aValue);
 }
 
 NS_IMETHODIMP
@@ -478,8 +605,10 @@ Statement::BindInt64Parameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_int64(mDBStatement, aParamIndex + 1, aValue);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindInt64ByIndex(aParamIndex, aValue);
 }
 
 NS_IMETHODIMP
@@ -488,8 +617,10 @@ Statement::BindNullParameter(PRUint32 aParamIndex)
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_null(mDBStatement, aParamIndex + 1);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindNullByIndex(aParamIndex);
 }
 
 NS_IMETHODIMP
@@ -500,9 +631,10 @@ Statement::BindBlobParameter(PRUint32 aParamIndex,
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
-  int srv = ::sqlite3_bind_blob(mDBStatement, aParamIndex + 1, aValue,
-                                aValueSize, SQLITE_TRANSIENT);
-  return convertResultCode(srv);
+  BindingParams *params = getParams();
+  NS_ENSURE_TRUE(params, NS_ERROR_OUT_OF_MEMORY);
+
+  return params->BindBlobByIndex(aParamIndex, aValue, aValueSize);
 }
 
 NS_IMETHODIMP
@@ -551,6 +683,25 @@ Statement::ExecuteStep(PRBool *_moreResults)
   if (!mDBStatement)
     return NS_ERROR_NOT_INITIALIZED;
 
+  // Bind any parameters first before executing.
+  if (mParamsArray) {
+    // If we have more than one row of parameters to bind, they shouldn't be
+    // calling this method (and instead use executeAsync).
+    if (mParamsArray->length() != 1)
+      return NS_ERROR_UNEXPECTED;
+
+    BindingParamsArray::iterator row = mParamsArray->begin();
+    nsCOMPtr<mozIStorageError> error;
+    error = (*row)->bind(mDBStatement);
+    if (error) {
+      PRInt32 srv;
+      (void)error->GetResult(&srv);
+      return convertResultCode(srv);
+    }
+
+    // We have bound, so now we can clear our array.
+    mParamsArray = nsnull;
+  }
   int srv = ::sqlite3_step(mDBStatement);
 
 #ifdef PR_LOGGING
diff --git a/storage/src/mozStorageStatement.h b/storage/src/mozStorageStatement.h
index 62fcd420577..c3dfe7908b9 100644
--- a/storage/src/mozStorageStatement.h
+++ b/storage/src/mozStorageStatement.h
@@ -46,6 +46,7 @@
 #include "nsTArray.h"
 
 #include "mozStorageBindingParamsArray.h"
+#include "mozStorageStatementData.h"
 #include "mozIStorageStatement.h"
 
 class nsIXPConnectJSObjectHolder;
@@ -55,6 +56,7 @@ namespace mozilla {
 namespace storage {
 class StatementJSHelper;
 class Connection;
+class BindingParams;
 
 class Statement : public mozIStorageStatement
 {
@@ -92,6 +94,16 @@ public:
     return mParamsArray.forget();
   }
 
+  /**
+   * Obtains the StatementData needed for asynchronous execution.
+   *
+   * @param _data
+   *        A reference to a StatementData object that will be populated upon
+   *        successful execution of this method.
+   * @return an nsresult indicating success or failure.
+   */
+  nsresult getAsynchronousStatementData(StatementData &_data);
+
 private:
     ~Statement();
 
@@ -102,12 +114,34 @@ private:
     nsTArray<nsCString> mColumnNames;
     bool mExecuting;
 
+    /**
+     * @return a pointer to the BindingParams object to use with our Bind*
+     *         method.
+     */
+    BindingParams *getParams();
+
     /**
      * Holds the array of parameters to bind to this statement when we execute
      * it asynchronously.
      */
     nsRefPtr<BindingParamsArray> mParamsArray;
 
+    /**
+     * Holds a copy of mDBStatement that we can use asynchronously.  Access to
+     * this is serialized on the asynchronous thread, so it does not need to be
+     * protected.  We will finalize this statement in our destructor.
+     */
+    sqlite3_stmt *mCachedAsyncStatement;
+
+    /**
+     * Obtains the statement to use on the background thread.
+     *
+     * @param _stmt
+     *        An outparm where the new statement should be placed.
+     * @return a SQLite result code indicating success or failure.
+     */
+    int getAsyncStatement(sqlite3_stmt **_stmt);
+
     /**
      * The following two members are only used with the JS helper.  They cache
      * the row and params objects.
diff --git a/storage/src/mozStorageStatementData.h b/storage/src/mozStorageStatementData.h
index ff1270a4d33..1ad80bd88b6 100644
--- a/storage/src/mozStorageStatementData.h
+++ b/storage/src/mozStorageStatementData.h
@@ -40,6 +40,8 @@
 #ifndef _mozStorageStatementData_h_
 #define _mozStorageStatementData_h_
 
+#include "sqlite3.h"
+
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 
@@ -54,14 +56,17 @@ class StatementData
 {
 public:
   StatementData(sqlite3_stmt *aStatement,
-                already_AddRefed<BindingParamsArray> aParamsArray)
+                already_AddRefed<BindingParamsArray> aParamsArray,
+                nsISupports *aStatementOwner)
   : mStatement(aStatement)
   , mParamsArray(aParamsArray)
+  , mStatementOwner(aStatementOwner)
   {
   }
   StatementData(const StatementData &aSource)
   : mStatement(aSource.mStatement)
   , mParamsArray(aSource.mParamsArray)
+  , mStatementOwner(aSource.mStatementOwner)
   {
   }
   StatementData()
@@ -76,28 +81,45 @@ public:
   operator BindingParamsArray *() const { return mParamsArray; }
 
   /**
-   * Finalizes and NULLs out our sqlite3_stmt.  Also releases our parameter
-   * array since we'll no longer need it.
+   * NULLs out our sqlite3_stmt (it is held by the owner) after reseting it and
+   * clear all bindings to it.  Then, NULL out the rest of our data.
    */
   inline void finalize()
   {
-    (void)::sqlite3_finalize(mStatement);
+    (void)::sqlite3_reset(mStatement);
+    (void)::sqlite3_clear_bindings(mStatement);
     mStatement = NULL;
     mParamsArray = nsnull;
+    mStatementOwner = nsnull;
   }
 
   /**
    * Indicates if this statement has parameters to be bound before it is
    * executed.
    *
-   * @returns true if the statement has parameters to bind against, false
-   *          otherwise.
+   * @return true if the statement has parameters to bind against, false
+   *         otherwise.
    */
   inline bool hasParametersToBeBound() const { return mParamsArray != nsnull; }
+  /**
+   * Indicates if this statement needs a transaction for execution.
+   *
+   * @return true if the statement needs a transaction, false otherwise.
+   */
+  inline bool needsTransaction() const
+  {
+    return mParamsArray != nsnull && mParamsArray->length() > 1;
+  }
 
 private:
   sqlite3_stmt *mStatement;
   nsRefPtr<BindingParamsArray> mParamsArray;
+
+  /**
+   * We hold onto a reference of the statement's owner so it doesn't get
+   * destroyed out from under us.
+   */
+  nsCOMPtr<nsISupports> mStatementOwner;
 };
 
 } // namespace storage
diff --git a/storage/test/unit/test_statement_executeAsync.js b/storage/test/unit/test_statement_executeAsync.js
index 64aad197ef5..6c2fa58aadc 100644
--- a/storage/test/unit/test_statement_executeAsync.js
+++ b/storage/test/unit/test_statement_executeAsync.js
@@ -96,11 +96,11 @@ function test_add_data()
     "INSERT INTO test (id, string, number, nuller, blober) " +
     "VALUES (?, ?, ?, ?, ?)"
   );
-  stmt.bindInt32Parameter(0, INTEGER);
-  stmt.bindStringParameter(1, TEXT);
-  stmt.bindDoubleParameter(2, REAL);
-  stmt.bindNullParameter(3);
   stmt.bindBlobParameter(4, BLOB, BLOB.length);
+  stmt.bindNullParameter(3);
+  stmt.bindDoubleParameter(2, REAL);
+  stmt.bindStringParameter(1, TEXT);
+  stmt.bindInt32Parameter(0, INTEGER);
 
   stmt.executeAsync({
     handleResult: function(aResultSet)
diff --git a/storage/test/unit/test_storage_connection.js b/storage/test/unit/test_storage_connection.js
index a715b77b514..cef154339e4 100644
--- a/storage/test/unit/test_storage_connection.js
+++ b/storage/test/unit/test_storage_connection.js
@@ -37,6 +37,9 @@
 
 // This file tests the functions of mozIStorageConnection
 
+////////////////////////////////////////////////////////////////////////////////
+//// Test Functions
+
 function test_connectionReady_open()
 {
   // there doesn't seem to be a way for the connection to not be ready (unless
@@ -211,6 +214,22 @@ function test_defaultSynchronousAtNormal()
   }
 }
 
+function test_close_succeeds_with_finalized_async_statement()
+{
+  // We want to make sure we create a cached async statement to make sure that
+  // when we finalize our statement, we end up finalizing the async one too so
+  // close will succeed.
+  let stmt = createStatement("SELECT * FROM test");
+  stmt.executeAsync();
+  stmt.finalize();
+
+  // Cleanup calls close, as well as removes the database file.
+  cleanup();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// Test Runner
+
 var tests = [
   test_connectionReady_open,
   test_connectionReady_closed,
@@ -231,6 +250,7 @@ var tests = [
   test_set_schemaVersion_negative,
   test_createTable,
   test_defaultSynchronousAtNormal,
+  test_close_succeeds_with_finalized_async_statement,
 ];
 
 function run_test()

From 8cb8c40acd86f22b94997b0e1f3cf1d37568095e Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.org>
Date: Tue, 28 Jul 2009 13:18:50 -0700
Subject: [PATCH 037/175] Bug 475654: Allow workaround for NSPR installations
 with no nspr-config script. a=wes, r=jimb

---
 build/autoconf/nspr.m4        | 31 +++++++++++++++++++++++++------
 js/src/build/autoconf/nspr.m4 | 31 +++++++++++++++++++++++++------
 js/src/configure.in           |  5 +++++
 3 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/build/autoconf/nspr.m4 b/build/autoconf/nspr.m4
index d21df69783e..fa3564ce3b3 100644
--- a/build/autoconf/nspr.m4
+++ b/build/autoconf/nspr.m4
@@ -5,6 +5,18 @@
 
 dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
+dnl
+dnl If the nspr-config script is available, use it to find the
+dnl appropriate CFLAGS and LIBS, and to check for the required
+dnl version, and run ACTION-IF-FOUND.
+dnl
+dnl Otherwise, if NO_NSPR_CONFIG_SYSTEM_VERSION is set, we use it,
+dnl NO_NSPR_CONFIG_SYSTEM_CFLAGS, and NO_NSPR_CONFIG_SYSTEM_LIBS to
+dnl provide default values, and run ACTION-IF-FOUND.  (Some systems
+dnl ship NSPR without nspr-config, but can glean the appropriate flags
+dnl and version.)
+dnl
+dnl Otherwise, run ACTION-IF-NOT-FOUND.
 AC_DEFUN([AM_PATH_NSPR],
 [dnl
 
@@ -38,17 +50,24 @@ AC_ARG_WITH(nspr-exec-prefix,
 	AC_MSG_CHECKING(for NSPR - version >= $min_nspr_version)
 
 	no_nspr=""
-	if test "$NSPR_CONFIG" = "no"; then
-		no_nspr="yes"
-	else
+	if test "$NSPR_CONFIG" != "no"; then
 		NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
 		NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
+		NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version`	
+	elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then
+	    NSPR_CFLAGS="${NO_NSPR_CONFIG_SYSTEM_CFLAGS}"
+		NSPR_LIBS="${NO_NSPR_CONFIG_SYSTEM_LDFLAGS}"
+		NSPR_VERSION_STRING="$NO_NSPR_CONFIG_SYSTEM_VERSION"
+	else
+	    no_nspr="yes"
+	fi
 
-		nspr_config_major_version=`$NSPR_CONFIG $nspr_config_args --version | \
+	if test -z "$no_nspr"; then
+		nspr_config_major_version=`echo $NSPR_VERSION_STRING | \
 			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-		nspr_config_minor_version=`$NSPR_CONFIG $nspr_config_args --version | \
+		nspr_config_minor_version=`echo $NSPR_VERSION_STRING | \
 			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-		nspr_config_micro_version=`$NSPR_CONFIG $nspr_config_args --version | \
+		nspr_config_micro_version=`echo $NSPR_VERSION_STRING | \
 			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 		min_nspr_major_version=`echo $min_nspr_version | \
 			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
diff --git a/js/src/build/autoconf/nspr.m4 b/js/src/build/autoconf/nspr.m4
index d21df69783e..fa3564ce3b3 100644
--- a/js/src/build/autoconf/nspr.m4
+++ b/js/src/build/autoconf/nspr.m4
@@ -5,6 +5,18 @@
 
 dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
+dnl
+dnl If the nspr-config script is available, use it to find the
+dnl appropriate CFLAGS and LIBS, and to check for the required
+dnl version, and run ACTION-IF-FOUND.
+dnl
+dnl Otherwise, if NO_NSPR_CONFIG_SYSTEM_VERSION is set, we use it,
+dnl NO_NSPR_CONFIG_SYSTEM_CFLAGS, and NO_NSPR_CONFIG_SYSTEM_LIBS to
+dnl provide default values, and run ACTION-IF-FOUND.  (Some systems
+dnl ship NSPR without nspr-config, but can glean the appropriate flags
+dnl and version.)
+dnl
+dnl Otherwise, run ACTION-IF-NOT-FOUND.
 AC_DEFUN([AM_PATH_NSPR],
 [dnl
 
@@ -38,17 +50,24 @@ AC_ARG_WITH(nspr-exec-prefix,
 	AC_MSG_CHECKING(for NSPR - version >= $min_nspr_version)
 
 	no_nspr=""
-	if test "$NSPR_CONFIG" = "no"; then
-		no_nspr="yes"
-	else
+	if test "$NSPR_CONFIG" != "no"; then
 		NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
 		NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
+		NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version`	
+	elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then
+	    NSPR_CFLAGS="${NO_NSPR_CONFIG_SYSTEM_CFLAGS}"
+		NSPR_LIBS="${NO_NSPR_CONFIG_SYSTEM_LDFLAGS}"
+		NSPR_VERSION_STRING="$NO_NSPR_CONFIG_SYSTEM_VERSION"
+	else
+	    no_nspr="yes"
+	fi
 
-		nspr_config_major_version=`$NSPR_CONFIG $nspr_config_args --version | \
+	if test -z "$no_nspr"; then
+		nspr_config_major_version=`echo $NSPR_VERSION_STRING | \
 			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-		nspr_config_minor_version=`$NSPR_CONFIG $nspr_config_args --version | \
+		nspr_config_minor_version=`echo $NSPR_VERSION_STRING | \
 			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-		nspr_config_micro_version=`$NSPR_CONFIG $nspr_config_args --version | \
+		nspr_config_micro_version=`echo $NSPR_VERSION_STRING | \
 			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 		min_nspr_major_version=`echo $min_nspr_version | \
 			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
diff --git a/js/src/configure.in b/js/src/configure.in
index 4d28a3fbd7c..69d8e1e40b6 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2293,6 +2293,11 @@ dnl the qsort routine under solaris is faulty
 *-solaris*) 
     AC_DEFINE(SOLARIS)
     TARGET_NSPR_MDCPUCFG='\"md/_solaris.cfg\"'
+    if test -z "$CROSS_COMPILE" && pkginfo -q SUNWpr && pkginfo -q SUNWprd; then
+       NO_NSPR_CONFIG_SYSTEM_LDFLAGS="-L/usr/lib/mps -R/usr/lib/mps -lnspr4"
+       NO_NSPR_CONFIG_SYSTEM_CFLAGS="-I/usr/include/mps"
+       NO_NSPR_CONFIG_SYSTEM_VERSION=["`pkgparam SUNWpr SUNW_PRODVERS | sed -e 's/^[1-9][0-9]*\.[0-9][0-9]*$/&.0/'`"]
+    fi
     SYSTEM_MAKEDEPEND=
     # $ORIGIN/.. is for shared libraries under components/ to locate shared
     # libraries one level up (e.g. libnspr4.so)

From b0e3a62e7a7aee219f66bdc8aeeee67b17f62474 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Tue, 28 Jul 2009 23:26:26 +0200
Subject: [PATCH 038/175] Bug 427715 - nsCryptoHash apparently being called
 while NSS is in shutdown state [@ NSSRWLock_LockRead_Util], r=kaie

---
 security/manager/ssl/src/nsNSSComponent.cpp | 63 +++++++++++++++++++--
 security/manager/ssl/src/nsNSSComponent.h   | 12 +++-
 2 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 6e3756e0745..abaf64b2f6a 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -280,7 +280,7 @@ nsTokenEventRunnable::Run()
 PRBool EnsureNSSInitialized(EnsureNSSOperator op)
 {
   static PRBool loading = PR_FALSE;
-  static PRBool haveLoaded = PR_FALSE;
+  static PRInt32 haveLoaded = 0;
 
   switch (op)
   {
@@ -296,7 +296,7 @@ PRBool EnsureNSSInitialized(EnsureNSSOperator op)
   case nssInitSucceeded:
     NS_ASSERTION(loading, "Bad call to EnsureNSSInitialized(nssInitSucceeded)");
     loading = PR_FALSE;
-    haveLoaded = PR_TRUE;
+    PR_AtomicSet(&haveLoaded, 1);
     return PR_TRUE;
 
   case nssInitFailed:
@@ -305,7 +305,7 @@ PRBool EnsureNSSInitialized(EnsureNSSOperator op)
     // no break
 
   case nssShutdown:
-    haveLoaded = PR_FALSE;
+    PR_AtomicSet(&haveLoaded, 0);
     return PR_FALSE;
 
     // In this case we are called from a component to ensure nss initilization.
@@ -313,7 +313,7 @@ PRBool EnsureNSSInitialized(EnsureNSSOperator op)
     // call do_GetService for nss component to ensure it.
   case nssEnsure:
     // We are reentered during nss component creation or nss component is already up
-    if (haveLoaded || loading)
+    if (PR_AtomicAdd(&haveLoaded, 0) || loading)
       return PR_TRUE;
 
     {
@@ -1751,6 +1751,7 @@ nsNSSComponent::ShutdownNSS()
     CleanupIdentityInfo();
     PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("evaporating psm resources\n"));
     mShutdownObjectList->evaporateAllNSSResources();
+    EnsureNSSInitialized(nssShutdown);
     if (SECSuccess != ::NSS_Shutdown()) {
       PR_LOG(gPIPNSSLog, PR_LOG_ALWAYS, ("NSS SHUTDOWN FAILURE\n"));
       rv = NS_ERROR_FAILURE;
@@ -2556,8 +2557,28 @@ nsCryptoHash::nsCryptoHash()
 
 nsCryptoHash::~nsCryptoHash()
 {
+  nsNSSShutDownPreventionLock locker;
+
+  if (isAlreadyShutDown())
+    return;
+
+  destructorSafeDestroyNSSReference();
+  shutdown(calledFromObject);
+}
+
+void nsCryptoHash::virtualDestroyNSSReference()
+{
+  destructorSafeDestroyNSSReference();
+}
+
+void nsCryptoHash::destructorSafeDestroyNSSReference()
+{
+  if (isAlreadyShutDown())
+    return;
+
   if (mHashContext)
     HASH_Destroy(mHashContext);
+  mHashContext = nsnull;
 }
 
 NS_IMPL_ISUPPORTS1(nsCryptoHash, nsICryptoHash)
@@ -2565,6 +2586,8 @@ NS_IMPL_ISUPPORTS1(nsCryptoHash, nsICryptoHash)
 NS_IMETHODIMP 
 nsCryptoHash::Init(PRUint32 algorithm)
 {
+  nsNSSShutDownPreventionLock locker;
+
   HASH_HashType hashType = (HASH_HashType)algorithm;
   if (mHashContext)
   {
@@ -2617,6 +2640,8 @@ nsCryptoHash::InitWithString(const nsACString & aAlgorithm)
 NS_IMETHODIMP
 nsCryptoHash::Update(const PRUint8 *data, PRUint32 len)
 {
+  nsNSSShutDownPreventionLock locker;
+  
   if (!mInitialized)
     return NS_ERROR_NOT_INITIALIZED;
 
@@ -2675,6 +2700,8 @@ nsCryptoHash::UpdateFromStream(nsIInputStream *data, PRUint32 len)
 NS_IMETHODIMP
 nsCryptoHash::Finish(PRBool ascii, nsACString & _retval)
 {
+  nsNSSShutDownPreventionLock locker;
+  
   if (!mInitialized)
     return NS_ERROR_NOT_INITIALIZED;
   
@@ -2715,13 +2742,35 @@ nsCryptoHMAC::nsCryptoHMAC()
 
 nsCryptoHMAC::~nsCryptoHMAC()
 {
+  nsNSSShutDownPreventionLock locker;
+
+  if (isAlreadyShutDown())
+    return;
+
+  destructorSafeDestroyNSSReference();
+  shutdown(calledFromObject);
+}
+
+void nsCryptoHMAC::virtualDestroyNSSReference()
+{
+  destructorSafeDestroyNSSReference();
+}
+
+void nsCryptoHMAC::destructorSafeDestroyNSSReference()
+{
+  if (isAlreadyShutDown())
+    return;
+
   if (mHMACContext)
     PK11_DestroyContext(mHMACContext, PR_TRUE);
+  mHMACContext = nsnull;
 }
 
 /* void init (in unsigned long aAlgorithm, in nsIKeyObject aKeyObject); */
 NS_IMETHODIMP nsCryptoHMAC::Init(PRUint32 aAlgorithm, nsIKeyObject *aKeyObject)
 {
+  nsNSSShutDownPreventionLock locker;
+
   if (mHMACContext)
   {
     PK11_DestroyContext(mHMACContext, PR_TRUE);
@@ -2778,6 +2827,8 @@ NS_IMETHODIMP nsCryptoHMAC::Init(PRUint32 aAlgorithm, nsIKeyObject *aKeyObject)
 /* void update ([array, size_is (aLen), const] in octet aData, in unsigned long aLen); */
 NS_IMETHODIMP nsCryptoHMAC::Update(const PRUint8 *aData, PRUint32 aLen)
 {
+  nsNSSShutDownPreventionLock locker;
+
   if (!mHMACContext)
     return NS_ERROR_NOT_INITIALIZED;
 
@@ -2843,6 +2894,8 @@ NS_IMETHODIMP nsCryptoHMAC::UpdateFromStream(nsIInputStream *aStream, PRUint32 a
 /* ACString finish (in PRBool aASCII); */
 NS_IMETHODIMP nsCryptoHMAC::Finish(PRBool aASCII, nsACString & _retval)
 {
+  nsNSSShutDownPreventionLock locker;
+
   if (!mHMACContext)
     return NS_ERROR_NOT_INITIALIZED;
   
@@ -2870,6 +2923,8 @@ NS_IMETHODIMP nsCryptoHMAC::Finish(PRBool aASCII, nsACString & _retval)
 /* void reset (); */
 NS_IMETHODIMP nsCryptoHMAC::Reset()
 {
+  nsNSSShutDownPreventionLock locker;
+
   SECStatus ss = PK11_DigestBegin(mHMACContext);
   NS_ENSURE_TRUE(ss == SECSuccess, NS_ERROR_FAILURE);
 
diff --git a/security/manager/ssl/src/nsNSSComponent.h b/security/manager/ssl/src/nsNSSComponent.h
index 4ff716236c3..ff457d5df7f 100644
--- a/security/manager/ssl/src/nsNSSComponent.h
+++ b/security/manager/ssl/src/nsNSSComponent.h
@@ -67,6 +67,7 @@
 #include "nsICryptoHMAC.h"
 #include "hasht.h"
 #include "nsNSSCallbacks.h"
+#include "nsNSSShutDown.h"
 
 #include "nsNSSHelper.h"
 #include "nsClientAuthRemember.h"
@@ -192,7 +193,7 @@ class NS_NO_VTABLE nsINSSComponent : public nsISupports {
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsINSSComponent, NS_INSSCOMPONENT_IID)
 
-class nsCryptoHash : public nsICryptoHash
+class nsCryptoHash : public nsICryptoHash, public nsNSSShutDownObject
 {
 public:
   NS_DECL_ISUPPORTS
@@ -205,9 +206,12 @@ private:
 
   HASHContext* mHashContext;
   PRBool mInitialized;
+
+  virtual void virtualDestroyNSSReference();
+  void destructorSafeDestroyNSSReference();
 };
 
-class nsCryptoHMAC : public nsICryptoHMAC
+class nsCryptoHMAC : public nsICryptoHMAC, public nsNSSShutDownObject
 {
 public:
   NS_DECL_ISUPPORTS
@@ -217,8 +221,10 @@ public:
 
 private:
   ~nsCryptoHMAC();
-
   PK11Context* mHMACContext;
+
+  virtual void virtualDestroyNSSReference();
+  void destructorSafeDestroyNSSReference();
 };
 
 struct PRLock;

From 25bee23cf5c17d039e3d0ab9128b6a39e5b35ee7 Mon Sep 17 00:00:00 2001
From: Rob Arnold <tellrob@gmail.com>
Date: Tue, 28 Jul 2009 11:52:31 -0700
Subject: [PATCH 039/175] Bug 502715 - Enable the canvas 2d context to function
 without an actual canvas element r=vlad

--HG--
extra : rebase_source : ac4f5e0038dd5d4ccb055ae2324b17867106d827
---
 .../nsICanvasRenderingContextInternal.h       |   2 +
 .../canvas/src/nsCanvasRenderingContext2D.cpp | 127 +++++++++++-------
 2 files changed, 78 insertions(+), 51 deletions(-)

diff --git a/content/canvas/public/nsICanvasRenderingContextInternal.h b/content/canvas/public/nsICanvasRenderingContextInternal.h
index a6fdfe7880d..0351c91f6ac 100644
--- a/content/canvas/public/nsICanvasRenderingContextInternal.h
+++ b/content/canvas/public/nsICanvasRenderingContextInternal.h
@@ -62,6 +62,8 @@ public:
   // whenever the size of the element changes.
   NS_IMETHOD SetDimensions(PRInt32 width, PRInt32 height) = 0;
 
+  NS_IMETHOD InitializeWithSurface(nsIDocShell *docShell, gfxASurface *surface, PRInt32 width, PRInt32 height) = 0;
+
   // Render the canvas at the origin of the given gfxContext
   NS_IMETHOD Render(gfxContext *ctx, gfxPattern::GraphicsFilter aFilter) = 0;
 
diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index d23931f1539..6171aba7c38 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Rob Arnold <tellrob@gmail.com>
  *   Eric Butler <zantifon@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
@@ -316,6 +317,7 @@ public:
     // nsICanvasRenderingContextInternal
     NS_IMETHOD SetCanvasElement(nsICanvasElement* aParentCanvas);
     NS_IMETHOD SetDimensions(PRInt32 width, PRInt32 height);
+    NS_IMETHOD InitializeWithSurface(nsIDocShell *shell, gfxASurface *surface, PRInt32 width, PRInt32 height);
     NS_IMETHOD Render(gfxContext *ctx, gfxPattern::GraphicsFilter aFilter);
     NS_IMETHOD GetInputStream(const char* aMimeType,
                               const PRUnichar* aEncoderOptions,
@@ -361,6 +363,9 @@ protected:
     // so these are not nsCOMPtrs
     nsICanvasElement* mCanvasElement;
 
+    // If mCanvasElement is not provided, then a docshell is
+    nsCOMPtr<nsIDocShell> mDocShell;
+
     // our CSS parser, for colors and whatnot
     nsCOMPtr<nsICSSParser> mCSSParser;
 
@@ -479,6 +484,20 @@ protected:
      */
     nsresult DrawRect(const gfxRect& rect, Style style);
 
+    /**
+     * Gets the pres shell from either the canvas element or the doc shell
+     */
+    nsIPresShell *GetPresShell() {
+      nsIPresShell *presShell = nsnull;
+      nsCOMPtr<nsIContent> content = do_QueryInterface(mCanvasElement);
+      if (content) {
+          presShell = content->GetCurrentDoc()->GetPrimaryShell();
+      } else if (mDocShell) {
+          mDocShell->GetPresShell(&presShell);
+      }
+      return presShell;
+    }
+
     // text
     enum TextAlign {
         TEXT_ALIGN_START,
@@ -613,17 +632,14 @@ protected:
         PRUint32 devPixel = 60;
         PRUint32 cssPixel = 60;
 
-        nsCOMPtr<nsINode> elem = do_QueryInterface(mCanvasElement);
-        if (elem) {
-            nsIDocument *doc = elem->GetOwnerDoc();
-            if (!doc) goto FINISH;
-            nsIPresShell *ps = doc->GetPrimaryShell();
-            if (!ps) goto FINISH;
-            nsPresContext *pc = ps->GetPresContext();
-            if (!pc) goto FINISH;
-            devPixel = pc->AppUnitsPerDevPixel();
-            cssPixel = pc->AppUnitsPerCSSPixel();
-        }
+        nsIPresShell *ps = GetPresShell();
+        nsPresContext *pc;
+
+        if (!ps) goto FINISH;
+        pc = ps->GetPresContext();
+        if (!pc) goto FINISH;
+        devPixel = pc->AppUnitsPerDevPixel();
+        cssPixel = pc->AppUnitsPerCSSPixel();
 
       FINISH:
         if (perDevPixel)
@@ -795,12 +811,10 @@ nsCanvasRenderingContext2D::ApplyStyle(Style aWhichStyle,
 
     nsCanvasPattern* pattern = CurrentState().patternStyles[aWhichStyle];
     if (pattern) {
-        if (!mCanvasElement)
-            return;
-
-        CanvasUtils::DoDrawImageSecurityCheck(mCanvasElement,
-                                              pattern->Principal(),
-                                              pattern->GetForceWriteOnly());
+        if (mCanvasElement)
+            CanvasUtils::DoDrawImageSecurityCheck(mCanvasElement,
+                                                  pattern->Principal(),
+                                                  pattern->GetForceWriteOnly());
 
         gfxPattern* gpat = pattern->GetPattern();
 
@@ -859,8 +873,7 @@ nsCanvasRenderingContext2D::SetDimensions(PRInt32 width, PRInt32 height)
 {
     Destroy();
 
-    mWidth = width;
-    mHeight = height;
+    nsRefPtr<gfxASurface> surface;
 
     // Check that the dimensions are sane
     if (gfxASurface::CheckSurfaceSize(gfxIntSize(width, height), 0xffff)) {
@@ -868,13 +881,28 @@ nsCanvasRenderingContext2D::SetDimensions(PRInt32 width, PRInt32 height)
         if (mOpaque)
             format = gfxASurface::ImageFormatRGB24;
 
-        mSurface = gfxPlatform::GetPlatform()->CreateOffscreenSurface
+        surface = gfxPlatform::GetPlatform()->CreateOffscreenSurface
             (gfxIntSize(width, height), format);
 
-        if (mSurface->CairoStatus() == 0) {
-            mThebes = new gfxContext(mSurface);
+        if (surface->CairoStatus() != 0) {
+          surface = NULL;
         }
     }
+    return InitializeWithSurface(NULL, surface, width, height);
+}
+
+NS_IMETHODIMP
+nsCanvasRenderingContext2D::InitializeWithSurface(nsIDocShell *docShell, gfxASurface *surface, PRInt32 width, PRInt32 height) {
+    Destroy();
+
+    NS_ASSERTION(!docShell ^ !mCanvasElement, "Cannot set both docshell and canvas element");
+    mDocShell = docShell;
+
+    mWidth = width;
+    mHeight = height;
+
+    mSurface = surface;
+    mThebes = new gfxContext(mSurface);
 
     /* Create dummy surfaces here */
     if (mSurface == nsnull || mSurface->CairoStatus() != 0 ||
@@ -886,6 +914,11 @@ nsCanvasRenderingContext2D::SetDimensions(PRInt32 width, PRInt32 height)
         mValid = PR_TRUE;
     }
 
+    // set up our css parser, if necessary
+    if (!mCSSParser) {
+        mCSSParser = do_CreateInstance("@mozilla.org/content/css-parser;1");
+    }
+
     // set up the initial canvas defaults
     mStyleStack.Clear();
     mSaveCount = 0;
@@ -1032,11 +1065,6 @@ nsCanvasRenderingContext2D::SetCanvasElement(nsICanvasElement* aCanvasElement)
     // don't hold a ref to this!
     mCanvasElement = aCanvasElement;
 
-    // set up our css parser, if necessary
-    if (!mCSSParser) {
-        mCSSParser = do_CreateInstance("@mozilla.org/content/css-parser;1");
-    }
-
     return NS_OK;
 }
 
@@ -1870,16 +1898,15 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
      */
 
     nsCOMPtr<nsIContent> content = do_QueryInterface(mCanvasElement);
-    if (!content) {
-        NS_WARNING("Canvas element must be an nsIContent and non-null");
+    if (!content && !mDocShell) {
+        NS_WARNING("Canvas element must be an nsIContent and non-null or a docshell must be provided");
         return NS_ERROR_FAILURE;
     }
 
-    nsIDocument* document = content->GetOwnerDoc();
-
-    nsIPresShell* presShell = document->GetPrimaryShell();
+    nsIPresShell* presShell = GetPresShell();
     if (!presShell)
-        return NS_ERROR_FAILURE;
+      return NS_ERROR_FAILURE;
+    nsIDocument* document = presShell->GetDocument();
 
     nsCString langGroup;
     presShell->GetPresContext()->GetLangGroup()->ToUTF8String(langGroup);
@@ -1887,7 +1914,7 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
     nsCOMArray<nsIStyleRule> rules;
 
     nsCOMPtr<nsICSSStyleRule> rule;
-    rv = CreateFontStyleRule(font, mCSSParser.get(), content.get(), getter_AddRefs(rule));
+    rv = CreateFontStyleRule(font, mCSSParser.get(), document, getter_AddRefs(rule));
     if (NS_FAILED(rv))
         return rv;
 
@@ -1899,7 +1926,7 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
     // values (2em, bolder, etc.)
     nsRefPtr<nsStyleContext> parentContext;
 
-    if (content->IsInDoc()) {
+    if (content && content->IsInDoc()) {
         // inherit from the canvas element
         parentContext = nsInspectorCSSUtils::GetStyleContextForContent(
                 content,
@@ -1910,7 +1937,7 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
         nsCOMPtr<nsICSSStyleRule> parentRule;
         rv = CreateFontStyleRule(NS_LITERAL_STRING("10px sans-serif"),
                                  mCSSParser.get(),
-                                 content.get(),
+                                 document,
                                  getter_AddRefs(parentRule));
         if (NS_FAILED(rv))
             return rv;
@@ -2219,17 +2246,17 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
         return NS_ERROR_INVALID_ARG;
 
     nsCOMPtr<nsIContent> content = do_QueryInterface(mCanvasElement);
-    if (!content) {
-        NS_WARNING("Canvas element must be an nsIContent and non-null");
+    if (!content && !mDocShell) {
+        NS_WARNING("Canvas element must be an nsIContent and non-null or a docshell must be provided");
         return NS_ERROR_FAILURE;
     }
 
-    nsIDocument* document = content->GetOwnerDoc();
-
-    nsIPresShell* presShell = document->GetPrimaryShell();
+    nsIPresShell* presShell = GetPresShell();
     if (!presShell)
         return NS_ERROR_FAILURE;
 
+    nsIDocument* document = presShell->GetDocument();
+
     nsBidiPresUtils* bidiUtils = presShell->GetPresContext()->GetBidiUtils();
     if (!bidiUtils)
         return NS_ERROR_FAILURE;
@@ -2241,7 +2268,7 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
     // for now, default to ltr if not in doc
     PRBool isRTL = PR_FALSE;
 
-    if (content->IsInDoc()) {
+    if (content && content->IsInDoc()) {
         // try to find the closest context
         nsRefPtr<nsStyleContext> canvasStyle =
             nsInspectorCSSUtils::GetStyleContextForContent(content,
@@ -2251,6 +2278,8 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
             return NS_ERROR_FAILURE;
         isRTL = canvasStyle->GetStyleVisibility()->mDirection ==
             NS_STYLE_DIRECTION_RTL;
+    } else {
+      isRTL = GET_BIDI_OPTION_DIRECTION(document->GetBidiOptions()) == IBMBIDI_TEXTDIRECTION_RTL;
     }
 
     // don't need to take care of these with stroke since Stroke() does that
@@ -2896,11 +2925,6 @@ nsCanvasRenderingContext2D::DrawImage()
     nsresult rv;
     gfxRect dirty;
 
-    // we can't do a security check without a canvas element, so
-    // just skip this entirely
-    if (!mCanvasElement)
-        return NS_ERROR_FAILURE;
-
     nsAXPCNativeCallContext *ncc = nsnull;
     rv = nsContentUtils::XPConnect()->
         GetCurrentNativeCallContext(&ncc);
@@ -2959,7 +2983,8 @@ nsCanvasRenderingContext2D::DrawImage()
     gfxIntSize imgSize = res.mSize;
     PRBool forceWriteOnly = res.mIsWriteOnly;
 
-    CanvasUtils::DoDrawImageSecurityCheck(mCanvasElement, principal, forceWriteOnly);
+    if (mCanvasElement)
+        CanvasUtils::DoDrawImageSecurityCheck(mCanvasElement, principal, forceWriteOnly);
 
     gfxContextPathAutoSaveRestore pathSR(mThebes, PR_FALSE);
 
@@ -3369,10 +3394,10 @@ nsCanvasRenderingContext2D::DrawWindow(nsIDOMWindow* aWindow, float aX, float aY
 NS_IMETHODIMP
 nsCanvasRenderingContext2D::GetImageData()
 {
-    if (!mValid || !mCanvasElement)
+    if (!mValid)
         return NS_ERROR_FAILURE;
 
-    if (mCanvasElement->IsWriteOnly() && !nsContentUtils::IsCallerTrustedForRead()) {
+    if (mCanvasElement && mCanvasElement->IsWriteOnly() && !nsContentUtils::IsCallerTrustedForRead()) {
         // XXX ERRMSG we need to report an error to developers here! (bug 329026)
         return NS_ERROR_DOM_SECURITY_ERR;
     }
@@ -3727,7 +3752,7 @@ nsCanvasRenderingContext2D::GetThebesSurface(gfxASurface **surface)
 NS_IMETHODIMP
 nsCanvasRenderingContext2D::CreateImageData()
 {
-    if (!mValid || !mCanvasElement)
+    if (!mValid)
         return NS_ERROR_FAILURE;
 
     nsAXPCNativeCallContext *ncc = nsnull;

From 7e7f6f7017f1451736283cd11d9a782fdc4baf1c Mon Sep 17 00:00:00 2001
From: Rob Arnold <tellrob@gmail.com>
Date: Tue, 28 Jul 2009 11:52:40 -0700
Subject: [PATCH 040/175] Bug 502710 - Refactor the widget icon creation code
 r=jimm

--HG--
extra : rebase_source : 2f145f67bdc7d9f630970786a498fb5a411ad7d0
---
 widget/src/windows/nsWindow.cpp    | 177 ++------------------------
 widget/src/windows/nsWindow.h      |   7 -
 widget/src/windows/nsWindowGfx.cpp | 197 +++++++++++++++++++++++++++++
 widget/src/windows/nsWindowGfx.h   |  13 +-
 4 files changed, 219 insertions(+), 175 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 9864ad0f2d1..1bad616d74a 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -1869,142 +1869,6 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
   return NS_OK;
 }
 
-// Adjust cursor image data
-PRUint8* nsWindow::Data32BitTo1Bit(PRUint8* aImageData,
-                                   PRUint32 aWidth, PRUint32 aHeight)
-{
-  // We need (aWidth + 7) / 8 bytes plus zero-padding up to a multiple of
-  // 4 bytes for each row (HBITMAP requirement). Bug 353553.
-  PRUint32 outBpr = ((aWidth + 31) / 8) & ~3;
-
-  // Allocate and clear mask buffer
-  PRUint8* outData = (PRUint8*)PR_Calloc(outBpr, aHeight);
-  if (!outData)
-    return NULL;
-
-  PRInt32 *imageRow = (PRInt32*)aImageData;
-  for (PRUint32 curRow = 0; curRow < aHeight; curRow++) {
-    PRUint8 *outRow = outData + curRow * outBpr;
-    PRUint8 mask = 0x80;
-    for (PRUint32 curCol = 0; curCol < aWidth; curCol++) {
-      // Use sign bit to test for transparency, as alpha byte is highest byte
-      if (*imageRow++ < 0)
-        *outRow |= mask;
-
-      mask >>= 1;
-      if (!mask) {
-        outRow ++;
-        mask = 0x80;
-      }
-    }
-  }
-
-  return outData;
-}
-
-PRBool nsWindow::IsCursorTranslucencySupported()
-{
-#ifdef WINCE
-  return PR_FALSE;
-#else
-  static PRBool didCheck = PR_FALSE;
-  static PRBool isSupported = PR_FALSE;
-  if (!didCheck) {
-    didCheck = PR_TRUE;
-    // Cursor translucency is supported on Windows XP and newer
-    isSupported = nsWindow::GetWindowsVersion() >= 0x501;
-  }
-
-  return isSupported;
-#endif
-}
-
-/**
- * Convert the given image data to a HBITMAP. If the requested depth is
- * 32 bit and the OS supports translucency, a bitmap with an alpha channel
- * will be returned.
- *
- * @param aImageData The image data to convert. Must use the format accepted
- *                   by CreateDIBitmap.
- * @param aWidth     With of the bitmap, in pixels.
- * @param aHeight    Height of the image, in pixels.
- * @param aDepth     Image depth, in bits. Should be one of 1, 24 and 32.
- *
- * @return The HBITMAP representing the image. Caller should call
- *         DeleteObject when done with the bitmap.
- *         On failure, NULL will be returned.
- */
-HBITMAP nsWindow::DataToBitmap(PRUint8* aImageData,
-                               PRUint32 aWidth,
-                               PRUint32 aHeight,
-                               PRUint32 aDepth)
-{
-#ifndef WINCE
-  HDC dc = ::GetDC(NULL);
-
-  if (aDepth == 32 && IsCursorTranslucencySupported()) {
-    // Alpha channel. We need the new header.
-    BITMAPV4HEADER head = { 0 };
-    head.bV4Size = sizeof(head);
-    head.bV4Width = aWidth;
-    head.bV4Height = aHeight;
-    head.bV4Planes = 1;
-    head.bV4BitCount = aDepth;
-    head.bV4V4Compression = BI_BITFIELDS;
-    head.bV4SizeImage = 0; // Uncompressed
-    head.bV4XPelsPerMeter = 0;
-    head.bV4YPelsPerMeter = 0;
-    head.bV4ClrUsed = 0;
-    head.bV4ClrImportant = 0;
-
-    head.bV4RedMask   = 0x00FF0000;
-    head.bV4GreenMask = 0x0000FF00;
-    head.bV4BlueMask  = 0x000000FF;
-    head.bV4AlphaMask = 0xFF000000;
-
-    HBITMAP bmp = ::CreateDIBitmap(dc,
-                                   reinterpret_cast<CONST BITMAPINFOHEADER*>(&head),
-                                   CBM_INIT,
-                                   aImageData,
-                                   reinterpret_cast<CONST BITMAPINFO*>(&head),
-                                   DIB_RGB_COLORS);
-    ::ReleaseDC(NULL, dc);
-    return bmp;
-  }
-
-  char reserved_space[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 2];
-  BITMAPINFOHEADER& head = *(BITMAPINFOHEADER*)reserved_space;
-
-  head.biSize = sizeof(BITMAPINFOHEADER);
-  head.biWidth = aWidth;
-  head.biHeight = aHeight;
-  head.biPlanes = 1;
-  head.biBitCount = (WORD)aDepth;
-  head.biCompression = BI_RGB;
-  head.biSizeImage = 0; // Uncompressed
-  head.biXPelsPerMeter = 0;
-  head.biYPelsPerMeter = 0;
-  head.biClrUsed = 0;
-  head.biClrImportant = 0;
-  
-  BITMAPINFO& bi = *(BITMAPINFO*)reserved_space;
-
-  if (aDepth == 1) {
-    RGBQUAD black = { 0, 0, 0, 0 };
-    RGBQUAD white = { 255, 255, 255, 0 };
-
-    bi.bmiColors[0] = white;
-    bi.bmiColors[1] = black;
-  }
-
-  HBITMAP bmp = ::CreateDIBitmap(dc, &head, CBM_INIT, aImageData, &bi, DIB_RGB_COLORS);
-  ::ReleaseDC(NULL, dc);
-  return bmp;
-#else
-  return nsnull;
-#endif
-}
-
 // Setting the actual cursor
 NS_IMETHODIMP nsWindow::SetCursor(imgIContainer* aCursor,
                                   PRUint32 aHotspotX, PRUint32 aHotspotY)
@@ -2014,14 +1878,14 @@ NS_IMETHODIMP nsWindow::SetCursor(imgIContainer* aCursor,
     return NS_OK;
   }
 
-  // Get the image data
-  nsRefPtr<gfxImageSurface> frame;
-  aCursor->CopyCurrentFrame(getter_AddRefs(frame));
-  if (!frame)
-    return NS_ERROR_NOT_AVAILABLE;
+  PRInt32 width;
+  PRInt32 height;
 
-  PRInt32 width = frame->Width();
-  PRInt32 height = frame->Height();
+  nsresult rv;
+  rv = aCursor->GetWidth(&width);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = aCursor->GetHeight(&height);
+  NS_ENSURE_SUCCESS(rv, rv);
 
   // Reject cursors greater than 128 pixels in either direction, to prevent
   // spoofing.
@@ -2030,30 +1894,9 @@ NS_IMETHODIMP nsWindow::SetCursor(imgIContainer* aCursor,
   if (width > 128 || height > 128)
     return NS_ERROR_NOT_AVAILABLE;
 
-  PRUint8 *data = frame->Data();
-
-  HBITMAP bmp = DataToBitmap(data, width, -height, 32);
-  PRUint8* a1data = Data32BitTo1Bit(data, width, height);
-  if (!a1data) {
-    return NS_ERROR_FAILURE;
-  }
-
-  HBITMAP mbmp = DataToBitmap(a1data, width, -height, 1);
-  PR_Free(a1data);
-
-  ICONINFO info = {0};
-  info.fIcon = FALSE;
-  info.xHotspot = aHotspotX;
-  info.yHotspot = aHotspotY;
-  info.hbmMask = mbmp;
-  info.hbmColor = bmp;
-  
-  HCURSOR cursor = ::CreateIconIndirect(&info);
-  ::DeleteObject(mbmp);
-  ::DeleteObject(bmp);
-  if (cursor == NULL) {
-    return NS_ERROR_FAILURE;
-  }
+  HCURSOR cursor;
+  rv = nsWindowGfx::CreateIcon(aCursor, PR_TRUE, aHotspotX, aHotspotY, &cursor);
+  NS_ENSURE_SUCCESS(rv, rv);
 
   mCursor = nsCursor(-1);
   ::SetCursor(cursor);
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index 62819e61449..2c3a9cc69c6 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -374,13 +374,6 @@ private:
 protected:
 #endif // MOZ_XUL
 
-  /**
-   * Cursor helpers
-   */
-  static PRUint8*         Data32BitTo1Bit(PRUint8* aImageData, PRUint32 aWidth, PRUint32 aHeight);
-  static PRBool           IsCursorTranslucencySupported();
-  static HBITMAP          DataToBitmap(PRUint8* aImageData, PRUint32 aWidth, PRUint32 aHeight, PRUint32 aDepth);
-
   /**
    * Misc.
    */
diff --git a/widget/src/windows/nsWindowGfx.cpp b/widget/src/windows/nsWindowGfx.cpp
index df47df8f9a8..866a5ffa78d 100644
--- a/widget/src/windows/nsWindowGfx.cpp
+++ b/widget/src/windows/nsWindowGfx.cpp
@@ -63,6 +63,7 @@
 #include "gfxContext.h"
 #include "nsIRenderingContext.h"
 #include "nsIDeviceContext.h"
+#include "prmem.h"
 
 #ifndef WINCE
 #include "nsUXThemeData.h"
@@ -643,6 +644,202 @@ DDRAW_FAILED:
   return result;
 }
 
+nsresult nsWindowGfx::CreateIcon(imgIContainer *aContainer,
+                                  PRBool aIsCursor,
+                                  PRUint32 aHotspotX,
+                                  PRUint32 aHotspotY,
+                                  HICON *aIcon) {
+
+  nsresult rv;
+  PRInt32 maxWidth = GetSystemMetrics(SM_CXICON);
+  PRInt32 maxHeight = GetSystemMetrics(SM_CYICON);
+
+  if (!maxWidth || !maxHeight)
+    return NS_ERROR_UNEXPECTED;
+
+  PRUint32 nFrames;
+  rv = aContainer->GetNumFrames(&nFrames);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!nFrames)
+    return NS_ERROR_INVALID_ARG;
+
+  // Get the image data
+  nsRefPtr<gfxImageSurface> frame;
+  aContainer->CopyCurrentFrame(getter_AddRefs(frame));
+  if (!frame)
+    return NS_ERROR_NOT_AVAILABLE;
+
+  PRUint8 *data = frame->Data();
+
+  PRInt32 width = frame->Width();
+  PRInt32 height = frame->Height();
+
+  if (width > maxWidth || height > maxHeight)
+    return NS_ERROR_INVALID_ARG;
+
+  HBITMAP bmp = DataToBitmap(data, width, -height, 32);
+  PRUint8* a1data = Data32BitTo1Bit(data, width, height);
+  if (!a1data) {
+    return NS_ERROR_FAILURE;
+  }
+
+  HBITMAP mbmp = DataToBitmap(a1data, width, -height, 1);
+  PR_Free(a1data);
+
+  ICONINFO info = {0};
+  info.fIcon = !aIsCursor;
+  info.xHotspot = aHotspotX;
+  info.yHotspot = aHotspotY;
+  info.hbmMask = mbmp;
+  info.hbmColor = bmp;
+  
+  HCURSOR icon = ::CreateIconIndirect(&info);
+  ::DeleteObject(mbmp);
+  ::DeleteObject(bmp);
+  if (!icon)
+    return NS_ERROR_FAILURE;
+  *aIcon = icon;
+  return NS_OK;
+}
+
+// Adjust cursor image data
+PRUint8* nsWindowGfx::Data32BitTo1Bit(PRUint8* aImageData,
+                                      PRUint32 aWidth, PRUint32 aHeight)
+{
+  // We need (aWidth + 7) / 8 bytes plus zero-padding up to a multiple of
+  // 4 bytes for each row (HBITMAP requirement). Bug 353553.
+  PRUint32 outBpr = ((aWidth + 31) / 8) & ~3;
+
+  // Allocate and clear mask buffer
+  PRUint8* outData = (PRUint8*)PR_Calloc(outBpr, aHeight);
+  if (!outData)
+    return NULL;
+
+  PRInt32 *imageRow = (PRInt32*)aImageData;
+  for (PRUint32 curRow = 0; curRow < aHeight; curRow++) {
+    PRUint8 *outRow = outData + curRow * outBpr;
+    PRUint8 mask = 0x80;
+    for (PRUint32 curCol = 0; curCol < aWidth; curCol++) {
+      // Use sign bit to test for transparency, as alpha byte is highest byte
+      if (*imageRow++ < 0)
+        *outRow |= mask;
+
+      mask >>= 1;
+      if (!mask) {
+        outRow ++;
+        mask = 0x80;
+      }
+    }
+  }
+
+  return outData;
+}
+
+PRBool nsWindowGfx::IsCursorTranslucencySupported()
+{
+#ifdef WINCE
+  return PR_FALSE;
+#else
+  static PRBool didCheck = PR_FALSE;
+  static PRBool isSupported = PR_FALSE;
+  if (!didCheck) {
+    didCheck = PR_TRUE;
+    // Cursor translucency is supported on Windows XP and newer
+    isSupported = nsWindow::GetWindowsVersion() >= 0x501;
+  }
+
+  return isSupported;
+#endif
+}
+
+/**
+ * Convert the given image data to a HBITMAP. If the requested depth is
+ * 32 bit and the OS supports translucency, a bitmap with an alpha channel
+ * will be returned.
+ *
+ * @param aImageData The image data to convert. Must use the format accepted
+ *                   by CreateDIBitmap.
+ * @param aWidth     With of the bitmap, in pixels.
+ * @param aHeight    Height of the image, in pixels.
+ * @param aDepth     Image depth, in bits. Should be one of 1, 24 and 32.
+ *
+ * @return The HBITMAP representing the image. Caller should call
+ *         DeleteObject when done with the bitmap.
+ *         On failure, NULL will be returned.
+ */
+HBITMAP nsWindowGfx::DataToBitmap(PRUint8* aImageData,
+                                  PRUint32 aWidth,
+                                  PRUint32 aHeight,
+                                  PRUint32 aDepth)
+{
+#ifndef WINCE
+  HDC dc = ::GetDC(NULL);
+
+  if (aDepth == 32 && IsCursorTranslucencySupported()) {
+    // Alpha channel. We need the new header.
+    BITMAPV4HEADER head = { 0 };
+    head.bV4Size = sizeof(head);
+    head.bV4Width = aWidth;
+    head.bV4Height = aHeight;
+    head.bV4Planes = 1;
+    head.bV4BitCount = aDepth;
+    head.bV4V4Compression = BI_BITFIELDS;
+    head.bV4SizeImage = 0; // Uncompressed
+    head.bV4XPelsPerMeter = 0;
+    head.bV4YPelsPerMeter = 0;
+    head.bV4ClrUsed = 0;
+    head.bV4ClrImportant = 0;
+
+    head.bV4RedMask   = 0x00FF0000;
+    head.bV4GreenMask = 0x0000FF00;
+    head.bV4BlueMask  = 0x000000FF;
+    head.bV4AlphaMask = 0xFF000000;
+
+    HBITMAP bmp = ::CreateDIBitmap(dc,
+                                   reinterpret_cast<CONST BITMAPINFOHEADER*>(&head),
+                                   CBM_INIT,
+                                   aImageData,
+                                   reinterpret_cast<CONST BITMAPINFO*>(&head),
+                                   DIB_RGB_COLORS);
+    ::ReleaseDC(NULL, dc);
+    return bmp;
+  }
+
+  char reserved_space[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 2];
+  BITMAPINFOHEADER& head = *(BITMAPINFOHEADER*)reserved_space;
+
+  head.biSize = sizeof(BITMAPINFOHEADER);
+  head.biWidth = aWidth;
+  head.biHeight = aHeight;
+  head.biPlanes = 1;
+  head.biBitCount = (WORD)aDepth;
+  head.biCompression = BI_RGB;
+  head.biSizeImage = 0; // Uncompressed
+  head.biXPelsPerMeter = 0;
+  head.biYPelsPerMeter = 0;
+  head.biClrUsed = 0;
+  head.biClrImportant = 0;
+  
+  BITMAPINFO& bi = *(BITMAPINFO*)reserved_space;
+
+  if (aDepth == 1) {
+    RGBQUAD black = { 0, 0, 0, 0 };
+    RGBQUAD white = { 255, 255, 255, 0 };
+
+    bi.bmiColors[0] = white;
+    bi.bmiColors[1] = black;
+  }
+
+  HBITMAP bmp = ::CreateDIBitmap(dc, &head, CBM_INIT, aImageData, &bi, DIB_RGB_COLORS);
+  ::ReleaseDC(NULL, dc);
+  return bmp;
+#else
+  return nsnull;
+#endif
+}
+
+
 // Windows Mobile Special image/direct draw painting fun
 #if defined(CAIRO_HAS_DDRAW_SURFACE)
 PRBool nsWindow::OnPaintImageDDraw16()
diff --git a/widget/src/windows/nsWindowGfx.h b/widget/src/windows/nsWindowGfx.h
index e9ffe0cb7d4..18e28f817fb 100644
--- a/widget/src/windows/nsWindowGfx.h
+++ b/widget/src/windows/nsWindowGfx.h
@@ -43,6 +43,7 @@
  */
 
 #include "nsWindow.h"
+#include <imgIContainer.h>
 
 // This isn't ideal, we should figure out how to export
 // the #defines here; need this to figure out if we have
@@ -62,6 +63,16 @@ public:
 #if defined(CAIRO_HAS_DDRAW_SURFACE)
   static PRBool InitDDraw();
 #endif // defined(CAIRO_HAS_DDRAW_SURFACE)
+
+  static nsresult CreateIcon(imgIContainer *aContainer, PRBool aIsCursor, PRUint32 aHotspotX, PRUint32 aHotspotY, HICON *aIcon);
+
+private:
+  /**
+   * Cursor helpers
+   */
+  static PRUint8*         Data32BitTo1Bit(PRUint8* aImageData, PRUint32 aWidth, PRUint32 aHeight);
+  static PRBool           IsCursorTranslucencySupported();
+  static HBITMAP          DataToBitmap(PRUint8* aImageData, PRUint32 aWidth, PRUint32 aHeight, PRUint32 aDepth);
 };
 
-#endif // WindowGfx_h__
\ No newline at end of file
+#endif // WindowGfx_h__

From 2e3b0f1356f0203437411014be1970e8f2e720ee Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Tue, 28 Jul 2009 13:18:10 -0700
Subject: [PATCH 041/175] Bug 506959 - AsyncExecuteStatements assumes ms, but
 calls functions that assume microseconds This fixes the code to use functions
 that expect milliseconds instead of microseconds, and updates to use the new
 TimeStamp and TimeDuration class. r=asuth

---
 storage/src/mozStorageAsyncStatementExecution.cpp | 12 ++++++------
 storage/src/mozStorageAsyncStatementExecution.h   |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/storage/src/mozStorageAsyncStatementExecution.cpp b/storage/src/mozStorageAsyncStatementExecution.cpp
index 37df29f50de..2e1b2d51a7f 100644
--- a/storage/src/mozStorageAsyncStatementExecution.cpp
+++ b/storage/src/mozStorageAsyncStatementExecution.cpp
@@ -67,7 +67,7 @@ namespace storage {
  * periods of time, and dispatching many small events to the calling thread will
  * end up blocking it.
  */
-#define MAX_MILLISECONDS_BETWEEN_RESULTS 100
+#define MAX_MILLISECONDS_BETWEEN_RESULTS 75
 #define MAX_ROWS_PER_RESULT 15
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -202,8 +202,8 @@ AsyncExecuteStatements::AsyncExecuteStatements(StatementDataArray &aStatements,
 , mTransactionManager(nsnull)
 , mCallback(aCallback)
 , mCallingThread(::do_GetCurrentThread())
-, mMaxIntervalWait(::PR_MicrosecondsToInterval(MAX_MILLISECONDS_BETWEEN_RESULTS))
-, mIntervalStart(::PR_IntervalNow())
+, mMaxWait(TimeDuration::FromMilliseconds(MAX_MILLISECONDS_BETWEEN_RESULTS))
+, mIntervalStart(TimeStamp::Now())
 , mState(PENDING)
 , mCancelRequested(PR_FALSE)
 , mMutex(aConnection->sharedAsyncExecutionMutex)
@@ -399,9 +399,9 @@ AsyncExecuteStatements::buildAndNotifyResults(sqlite3_stmt *aStatement)
   // If we have hit our maximum number of allowed results, or if we have hit
   // the maximum amount of time we want to wait for results, notify the
   // calling thread about it.
-  PRIntervalTime now = ::PR_IntervalNow();
-  PRIntervalTime delta = now - mIntervalStart;
-  if (mResultSet->rows() >= MAX_ROWS_PER_RESULT || delta > mMaxIntervalWait) {
+  TimeStamp now = TimeStamp::Now();
+  TimeDuration delta = now - mIntervalStart;
+  if (mResultSet->rows() >= MAX_ROWS_PER_RESULT || delta > mMaxWait) {
     // Notify the caller
     rv = notifyResults();
     if (NS_FAILED(rv))
diff --git a/storage/src/mozStorageAsyncStatementExecution.h b/storage/src/mozStorageAsyncStatementExecution.h
index 5293415c0d4..0afa365026e 100644
--- a/storage/src/mozStorageAsyncStatementExecution.h
+++ b/storage/src/mozStorageAsyncStatementExecution.h
@@ -45,6 +45,7 @@
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/TimeStamp.h"
 
 #include "mozIStoragePendingStatement.h"
 #include "mozIStorageStatementCallback.h"
@@ -207,12 +208,12 @@ private:
    * The maximum amount of time we want to wait between results.  Defined by
    * MAX_MILLISECONDS_BETWEEN_RESULTS and set at construction.
    */
-  const PRIntervalTime mMaxIntervalWait;
+  const TimeDuration mMaxWait;
 
   /**
    * The start time since our last set of results.
    */
-  PRIntervalTime mIntervalStart;
+  TimeStamp mIntervalStart;
 
   /**
    * Indicates our state of execution.

From 00afd35f6b172bb3d09454aa9a346b0e1e5e27c2 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Tue, 28 Jul 2009 13:18:10 -0700
Subject: [PATCH 042/175] Bug 506959 - AsyncExecuteStatements assumes ms, but
 calls functions that assume microseconds This fixes the code to use functions
 that expect milliseconds instead of microseconds, and updates to use the new
 TimeStamp and TimeDuration class. r=asuth

--HG--
extra : rebase_source : 6109fd10a8cf8ca985d51137f5628ca20ccee157
---
 storage/src/mozStorageAsyncStatementExecution.cpp | 12 ++++++------
 storage/src/mozStorageAsyncStatementExecution.h   |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/storage/src/mozStorageAsyncStatementExecution.cpp b/storage/src/mozStorageAsyncStatementExecution.cpp
index 37df29f50de..2e1b2d51a7f 100644
--- a/storage/src/mozStorageAsyncStatementExecution.cpp
+++ b/storage/src/mozStorageAsyncStatementExecution.cpp
@@ -67,7 +67,7 @@ namespace storage {
  * periods of time, and dispatching many small events to the calling thread will
  * end up blocking it.
  */
-#define MAX_MILLISECONDS_BETWEEN_RESULTS 100
+#define MAX_MILLISECONDS_BETWEEN_RESULTS 75
 #define MAX_ROWS_PER_RESULT 15
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -202,8 +202,8 @@ AsyncExecuteStatements::AsyncExecuteStatements(StatementDataArray &aStatements,
 , mTransactionManager(nsnull)
 , mCallback(aCallback)
 , mCallingThread(::do_GetCurrentThread())
-, mMaxIntervalWait(::PR_MicrosecondsToInterval(MAX_MILLISECONDS_BETWEEN_RESULTS))
-, mIntervalStart(::PR_IntervalNow())
+, mMaxWait(TimeDuration::FromMilliseconds(MAX_MILLISECONDS_BETWEEN_RESULTS))
+, mIntervalStart(TimeStamp::Now())
 , mState(PENDING)
 , mCancelRequested(PR_FALSE)
 , mMutex(aConnection->sharedAsyncExecutionMutex)
@@ -399,9 +399,9 @@ AsyncExecuteStatements::buildAndNotifyResults(sqlite3_stmt *aStatement)
   // If we have hit our maximum number of allowed results, or if we have hit
   // the maximum amount of time we want to wait for results, notify the
   // calling thread about it.
-  PRIntervalTime now = ::PR_IntervalNow();
-  PRIntervalTime delta = now - mIntervalStart;
-  if (mResultSet->rows() >= MAX_ROWS_PER_RESULT || delta > mMaxIntervalWait) {
+  TimeStamp now = TimeStamp::Now();
+  TimeDuration delta = now - mIntervalStart;
+  if (mResultSet->rows() >= MAX_ROWS_PER_RESULT || delta > mMaxWait) {
     // Notify the caller
     rv = notifyResults();
     if (NS_FAILED(rv))
diff --git a/storage/src/mozStorageAsyncStatementExecution.h b/storage/src/mozStorageAsyncStatementExecution.h
index 5293415c0d4..0afa365026e 100644
--- a/storage/src/mozStorageAsyncStatementExecution.h
+++ b/storage/src/mozStorageAsyncStatementExecution.h
@@ -45,6 +45,7 @@
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/TimeStamp.h"
 
 #include "mozIStoragePendingStatement.h"
 #include "mozIStorageStatementCallback.h"
@@ -207,12 +208,12 @@ private:
    * The maximum amount of time we want to wait between results.  Defined by
    * MAX_MILLISECONDS_BETWEEN_RESULTS and set at construction.
    */
-  const PRIntervalTime mMaxIntervalWait;
+  const TimeDuration mMaxWait;
 
   /**
    * The start time since our last set of results.
    */
-  PRIntervalTime mIntervalStart;
+  TimeStamp mIntervalStart;
 
   /**
    * Indicates our state of execution.

From c50e1c1686bcba2c20dc135ac419fb43c3511941 Mon Sep 17 00:00:00 2001
From: Peter Weilbacher <mozilla@weilbacher.org>
Date: Wed, 29 Jul 2009 02:05:05 +0300
Subject: [PATCH 043/175] [OS/2] Bug 506869: remove obsolete file, r=wuno@lsvw

---
 jpeg/jpegOS2.def | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 jpeg/jpegOS2.def

diff --git a/jpeg/jpegOS2.def b/jpeg/jpegOS2.def
deleted file mode 100644
index e9a4849d700..00000000000
--- a/jpeg/jpegOS2.def
+++ /dev/null
@@ -1,34 +0,0 @@
-LIBRARY JPEG3240 INITINSTANCE TERMINSTANCE
-PROTMODE
-
-DESCRIPTION "Netscape Java JPEG OS/2 Runtime Dynamic Link Library"
-
-CODE    LOADONCALL MOVEABLE DISCARDABLE
-DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED
-
-EXPORTS
-
-    jpeg_calc_output_dimensions
-    jpeg_consume_input         
-    jpeg_create_compress       
-    jpeg_create_decompress     
-    jpeg_destroy_compress      
-    jpeg_destroy_decompress    
-    jpeg_finish_compress       
-    jpeg_finish_decompress     
-    jpeg_finish_output         
-    jpeg_has_multiple_scans    
-    jpeg_read_header           
-    jpeg_read_scanlines        
-    jpeg_resync_to_restart     
-    jpeg_set_defaults          
-    jpeg_set_marker_processor  
-    jpeg_set_quality           
-    jpeg_start_compress        
-    jpeg_start_decompress      
-    jpeg_start_output          
-    jpeg_std_error             
-    jpeg_stdio_dest            
-    jpeg_write_scanlines       
-
-

From 86555a247881f20cf0f90a6ed2d7803dd73917dd Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <wtc@google.com>
Date: Tue, 28 Jul 2009 17:01:39 -0700
Subject: [PATCH 044/175] Bug 504080: Update NSS from
 NSS_3_12_4_FIPS1_WITH_CKBI_1_75 to NSS_3_12_4_FIPS4 in mozilla-central. 
 r=kaie.

---
 dbm/include/mcom_db.h                         |   5 +-
 dbm/src/db.c                                  |   4 -
 dbm/src/hash.c                                |   2 +-
 dbm/src/mktemp.c                              |   2 +
 security/coreconf/HP-UX.mk                    |   6 +-
 security/coreconf/Linux.mk                    |  61 +-
 security/coreconf/Linux2.1.mk                 |   2 +-
 security/coreconf/Linux2.2.mk                 |   2 +-
 security/coreconf/Linux2.4.mk                 |   2 +-
 security/coreconf/Linux2.5.mk                 |   2 +-
 security/coreconf/Linux2.6.mk                 |   2 +-
 security/coreconf/OS2.mk                      |   2 +-
 security/coreconf/OpenVMS.mk                  |  75 ---
 security/coreconf/OpenVMSV7.1-2.mk            |  42 --
 security/coreconf/SunOS5.mk                   |  14 +-
 security/coreconf/WINCE.mk                    |   4 +-
 security/coreconf/arch.mk                     |   5 -
 security/coreconf/config.mk                   |   2 +-
 security/coreconf/coreconf.dep                |   1 +
 security/coreconf/nsinstall/nsinstall.c       |  19 +-
 security/coreconf/rules.mk                    |   6 +-
 security/coreconf/ruleset.mk                  |   8 +-
 security/nss/cmd/bltest/blapitest.c           |   2 +-
 security/nss/cmd/certutil/certext.c           |   2 +-
 security/nss/cmd/certutil/keystuff.c          |  15 +-
 security/nss/cmd/fipstest/fipstest.c          |  37 +-
 security/nss/cmd/lib/config.mk                |   4 +
 security/nss/cmd/lib/secpwd.c                 |   4 +-
 security/nss/cmd/lib/secutil.c                |  57 +-
 security/nss/cmd/lib/wincemain.c              |  65 ++
 security/nss/cmd/pk11mode/pk11mode.c          |   2 +-
 security/nss/cmd/pk12util/pk12util.c          |  18 +-
 security/nss/cmd/platlibs.mk                  |  12 +-
 security/nss/cmd/sdrtest/sdrtest.c            |  12 +-
 security/nss/cmd/shlibsign/sign.sh            |  18 -
 security/nss/cmd/tests/baddbdir.c             |  68 ++
 security/nss/cmd/tests/manifest.mn            |   1 +
 security/nss/cmd/zlib/README                  |   2 +-
 security/nss/cmd/zlib/example.c               |   4 +-
 security/nss/cmd/zlib/minigzip.c              |   6 +-
 security/nss/cmd/zlib/zconf.h                 |  10 +-
 security/nss/cmd/zlib/zutil.h                 |   7 +-
 security/nss/lib/certdb/cert.h                |  12 +-
 security/nss/lib/certdb/certdb.c              |   6 +-
 security/nss/lib/certdb/certdb.h              |   2 +-
 security/nss/lib/certdb/certt.h               |  15 +-
 security/nss/lib/certdb/crl.c                 |  11 +-
 security/nss/lib/certdb/stanpcertdb.c         |   2 +-
 security/nss/lib/certhigh/certvfypkix.c       |   6 +-
 security/nss/lib/certhigh/ocsp.c              |   4 +-
 security/nss/lib/ckfw/Makefile                |   4 +-
 security/nss/lib/ckfw/builtins/config.mk      |  16 +-
 security/nss/lib/ckfw/capi/config.mk          |   8 +-
 security/nss/lib/ckfw/sessobj.c               |  13 +-
 security/nss/lib/cryptohi/seckey.c            |  14 +-
 security/nss/lib/freebl/Makefile              |  11 +-
 security/nss/lib/freebl/des.c                 |   5 +
 security/nss/lib/freebl/drbg.c                |   9 +-
 security/nss/lib/freebl/mpi/mpi_x86_os2.s     | 573 +++++++++++++++++
 security/nss/lib/freebl/nsslowhash.c          |  22 +-
 security/nss/lib/freebl/nsslowhash.h          |   1 +
 security/nss/lib/freebl/stubs.c               |  18 +-
 security/nss/lib/freebl/unix_rand.c           | 100 ---
 security/nss/lib/freebl/win_rand.c            |  72 ++-
 security/nss/lib/jar/jarver.c                 |  81 ++-
 .../lib/libpkix/include/pkix_errorstrings.h   |   2 +-
 .../pkix_pl_nss/module/pkix_pl_aiamgr.c       |   2 +
 .../libpkix/pkix_pl_nss/pki/pkix_pl_crldp.c   |   4 +-
 security/nss/lib/nss/config.mk                |  23 -
 security/nss/lib/nss/nss.h                    |   4 +-
 security/nss/lib/nss/nssinit.c                |   9 +-
 security/nss/lib/pk11wrap/pk11auth.c          |   3 +-
 security/nss/lib/pk11wrap/pk11sdr.h           |   3 +-
 security/nss/lib/pk11wrap/pk11skey.c          | 155 +++--
 security/nss/lib/pk11wrap/pk11slot.c          |  60 +-
 security/nss/lib/pk11wrap/pk11util.c          |  52 +-
 security/nss/lib/pkcs12/p12d.c                |   5 +-
 security/nss/lib/smime/config.mk              |  15 -
 security/nss/lib/softoken/config.mk           |  12 -
 security/nss/lib/softoken/fipstest.c          | 588 ++++++++++--------
 security/nss/lib/softoken/legacydb/config.mk  |  12 -
 security/nss/lib/softoken/pk11pars.h          |   2 +-
 security/nss/lib/softoken/pkcs11.c            |   2 -
 security/nss/lib/softoken/pkcs11u.c           |   2 +-
 security/nss/lib/softoken/sdb.c               |   9 +-
 security/nss/lib/softoken/sftkdb.c            |  20 +-
 security/nss/lib/softoken/sftkmod.c           |  10 +-
 security/nss/lib/softoken/sftkpars.c          |   2 +-
 security/nss/lib/softoken/sftkpwd.c           |   8 +-
 security/nss/lib/softoken/softkver.h          |   2 +-
 security/nss/lib/sqlite/config.mk             |  11 -
 security/nss/lib/ssl/config.mk                |  15 -
 security/nss/lib/ssl/sslmutex.c               |   4 +-
 security/nss/lib/ssl/sslmutex.h               |   4 +-
 security/nss/lib/ssl/sslsnce.c                |   4 +-
 security/nss/lib/util/config.mk               |  22 -
 security/nss/lib/util/nssutil.h               |   2 +-
 security/nss/pkg/solaris/SUNWtlsd/prototype   |   3 +-
 security/nss/tests/chains/chains.sh           | 119 +++-
 security/nss/tests/dbtests/dbtests.sh         |   4 +-
 .../nss/tests/libpkix/certs/PayPalEE.cert     | Bin 1488 -> 1483 bytes
 .../nss/tests/libpkix/certs/PayPalICA.cert    | Bin 1550 -> 1512 bytes
 102 files changed, 1824 insertions(+), 989 deletions(-)
 delete mode 100755 security/coreconf/OpenVMS.mk
 delete mode 100755 security/coreconf/OpenVMSV7.1-2.mk
 create mode 100644 security/nss/cmd/lib/wincemain.c
 create mode 100644 security/nss/cmd/tests/baddbdir.c
 create mode 100644 security/nss/lib/freebl/mpi/mpi_x86_os2.s

diff --git a/dbm/include/mcom_db.h b/dbm/include/mcom_db.h
index 45cff2dd783..629cb0f715b 100644
--- a/dbm/include/mcom_db.h
+++ b/dbm/include/mcom_db.h
@@ -392,11 +392,8 @@ typedef struct {
 #endif
 
 PR_BEGIN_EXTERN_C
-#if defined(__WATCOMC__) || defined(__WATCOM_CPLUSPLUS__)
+
 extern DB *
-#else
-PR_EXTERN(DB *)
-#endif
 dbopen (const char *, int, int, DBTYPE, const void *);
 
 /* set or unset a global lock flag to disable the
diff --git a/dbm/src/db.c b/dbm/src/db.c
index 851295233af..264e9fac70d 100644
--- a/dbm/src/db.c
+++ b/dbm/src/db.c
@@ -64,11 +64,7 @@ dbSetOrClearDBLock(DBLockFlagEnum type)
 		all_databases_locked_closed = 0;
 }
 
-#if defined(__WATCOMC__) || defined(__WATCOM_CPLUSPLUS__)
 DB *
-#else
-PR_IMPLEMENT(DB *)
-#endif
 dbopen(const char *fname, int flags,int mode, DBTYPE type, const void *openinfo)
 {
 
diff --git a/dbm/src/hash.c b/dbm/src/hash.c
index e98aa430144..c7b1d18133c 100644
--- a/dbm/src/hash.c
+++ b/dbm/src/hash.c
@@ -339,7 +339,7 @@ init_hash(HTAB *hashp, const char *file, HASHINFO *info)
 		if (stat(file, &statbuf))
 			return (NULL);
 
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(VMS) && !defined(XP_OS2)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2)
 #if defined(__QNX__) && !defined(__QNXNTO__)
 		hashp->BSIZE = 512; /* preferred blk size on qnx4 */
 #else
diff --git a/dbm/src/mktemp.c b/dbm/src/mktemp.c
index c70e2f57c18..d93da9f5b94 100644
--- a/dbm/src/mktemp.c
+++ b/dbm/src/mktemp.c
@@ -78,11 +78,13 @@ mkstempflags(char *path, int extraFlags)
 	return (_gettemp(path, &fd, extraFlags) ? fd : -1);
 }
 
+#ifdef WINCE /* otherwise, use the one in libc */
 char *
 mktemp(char *path)
 {
 	return(_gettemp(path, (int *)NULL, 0) ? path : (char *)NULL);
 }
+#endif
 
 /* NB: This routine modifies its input string, and does not always restore it.
 ** returns 1 on success, 0 on failure.
diff --git a/security/coreconf/HP-UX.mk b/security/coreconf/HP-UX.mk
index ef895337ddc..5355339144f 100644
--- a/security/coreconf/HP-UX.mk
+++ b/security/coreconf/HP-UX.mk
@@ -76,7 +76,7 @@ endif
 
 LDFLAGS			= -z -Wl,+s
 
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
+MKSHLIB			= $(LD) $(DSO_LDOPTS) $(RPATH)
 ifdef MAPFILE
 MKSHLIB += -c $(MAPFILE)
 endif
@@ -84,8 +84,8 @@ PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
          sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,+e ,' > $@
 
 DSO_LDOPTS		= -b +h $(notdir $@)
-ifeq ($(OS_TEST),ia64)
-	DSO_LDOPTS	+= +b '$$ORIGIN'
+ifeq ($(USE_64), 1)
+RPATH   = +b '$$ORIGIN'
 endif
 DSO_LDFLAGS		=
 
diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk
index 7725a97cc4b..f6239085e80 100644
--- a/security/coreconf/Linux.mk
+++ b/security/coreconf/Linux.mk
@@ -52,10 +52,6 @@ RANLIB			= ranlib
 
 DEFAULT_COMPILER = gcc
 
-ifeq ($(OS_TEST),m68k)
-	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH	= m68k
-else
 ifeq ($(OS_TEST),ppc64)
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= ppc
@@ -63,18 +59,10 @@ ifeq ($(USE_64),1)
 	ARCHFLAG	= -m64
 endif
 else
-ifeq ($(OS_TEST),ppc)
-	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH	= ppc
-else
 ifeq ($(OS_TEST),alpha)
         OS_REL_CFLAGS   = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= alpha
 else
-ifeq ($(OS_TEST),ia64)
-	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH	= ia64
-else
 ifeq ($(OS_TEST),x86_64)
 ifeq ($(USE_64),1)
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
@@ -85,10 +73,6 @@ else
 	ARCHFLAG	= -m32
 endif
 else
-ifeq ($(OS_TEST),sparc)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = sparc
-else
 ifeq ($(OS_TEST),sparc64)
 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH        = sparc
@@ -97,30 +81,19 @@ ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH        = arm
 else
-ifeq ($(OS_TEST),parisc)
+ifeq (,$(filter-out parisc%,$(OS_TEST)))
 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH        = hppa
 else
-ifeq ($(OS_TEST),parisc64)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = hppa
-else
-ifeq ($(OS_TEST),s390)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = s390
-else
-ifeq ($(OS_TEST),s390x)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = s390x
-else
-ifeq ($(OS_TEST),mips)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = mips
-else
 ifeq (,$(filter-out i%86,$(OS_TEST)))
 	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
 	CPU_ARCH	= x86
 else
+ifeq ($(OS_TEST),sh4a)
+	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
+	CPU_ARCH        = sh4
+else
+# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4
 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= $(OS_TEST)
 endif
@@ -131,20 +104,13 @@ endif
 endif
 endif
 endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
 
 
 LIBC_TAG		= _glibc
 
 ifeq ($(OS_RELEASE),2.0)
 	OS_REL_CFLAGS	+= -DLINUX2_0
-	MKSHLIB		= $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+	MKSHLIB		= $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
 	ifdef MAPFILE
 		MKSHLIB += -Wl,--version-script,$(MAPFILE)
 	endif
@@ -182,9 +148,20 @@ LDFLAGS			+= $(ARCHFLAG)
 G++INCLUDES		= -I/usr/include/g++
 
 #
-# Always set CPU_TAG on Linux, OpenVMS, WINCE.
+# Always set CPU_TAG on Linux, WINCE.
 #
 CPU_TAG = _$(CPU_ARCH)
 
 USE_SYSTEM_ZLIB = 1
 ZLIB_LIBS = -lz
+
+# The -rpath '$$ORIGIN' linker option instructs this library to search for its
+# dependencies in the same directory where it resides.
+ifeq ($(BUILD_SUN_PKG), 1)
+ifeq ($(USE_64), 1)
+RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib64:/opt/sun/private/lib'
+else
+RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib'
+endif
+endif
+
diff --git a/security/coreconf/Linux2.1.mk b/security/coreconf/Linux2.1.mk
index 7569e1b1004..e92503aab3c 100644
--- a/security/coreconf/Linux2.1.mk
+++ b/security/coreconf/Linux2.1.mk
@@ -38,7 +38,7 @@
 include $(CORE_DEPTH)/coreconf/Linux.mk
 ifeq ($(OS_RELEASE),2.1)
         OS_REL_CFLAGS   += -DLINUX2_1
-        MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+        MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
 	ifdef MAPFILE
 		MKSHLIB += -Wl,--version-script,$(MAPFILE)
 	endif
diff --git a/security/coreconf/Linux2.2.mk b/security/coreconf/Linux2.2.mk
index 86bffef75fe..4a6cc1e6ca1 100644
--- a/security/coreconf/Linux2.2.mk
+++ b/security/coreconf/Linux2.2.mk
@@ -38,7 +38,7 @@
 include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
 
 ifdef MAPFILE
 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
diff --git a/security/coreconf/Linux2.4.mk b/security/coreconf/Linux2.4.mk
index 86bffef75fe..4a6cc1e6ca1 100644
--- a/security/coreconf/Linux2.4.mk
+++ b/security/coreconf/Linux2.4.mk
@@ -38,7 +38,7 @@
 include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
 
 ifdef MAPFILE
 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
diff --git a/security/coreconf/Linux2.5.mk b/security/coreconf/Linux2.5.mk
index 86bffef75fe..4a6cc1e6ca1 100644
--- a/security/coreconf/Linux2.5.mk
+++ b/security/coreconf/Linux2.5.mk
@@ -38,7 +38,7 @@
 include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
 
 ifdef MAPFILE
 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
diff --git a/security/coreconf/Linux2.6.mk b/security/coreconf/Linux2.6.mk
index 86bffef75fe..4a6cc1e6ca1 100644
--- a/security/coreconf/Linux2.6.mk
+++ b/security/coreconf/Linux2.6.mk
@@ -38,7 +38,7 @@
 include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
 
 ifdef MAPFILE
 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk
index 73c223110e2..4dd01a0f9ad 100644
--- a/security/coreconf/OS2.mk
+++ b/security/coreconf/OS2.mk
@@ -97,7 +97,7 @@ PROCESS_MAP_FILE = \
 
 endif   #NO_SHARED_LIB
 
-OS_CFLAGS          = -Wall -W -Wno-unused -Wpointer-arith -Wcast-align -Wno-switch -Zomf -DDEBUG -DTRACING -g
+OS_CFLAGS          = -Wall -Wno-unused -Wpointer-arith -Wcast-align -Wno-switch -Zomf -DDEBUG -DTRACING -g
 
 ifdef BUILD_OPT
 ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
diff --git a/security/coreconf/OpenVMS.mk b/security/coreconf/OpenVMS.mk
deleted file mode 100755
index 6d9b0168b1a..00000000000
--- a/security/coreconf/OpenVMS.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# Config stuff for Compaq OpenVMS
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-CC			= cc
-CCC			= cxx
-
-RANLIB			= /gnu/bin/true
-
-CPU_ARCH		:= $(shell uname -Wh)
-
-OS_CFLAGS		= -DVMS
-OS_CXXFLAGS		= -DVMS
-
-#
-# XCFLAGS are the only CFLAGS that are used during a link operation. Defining
-# OPTIMIZER in XCFLAGS means that each compilation line gets OPTIMIZER
-# included twice, but at least we get OPTIMIZER included in the link
-# operations; and OpenVMS needs it!
-#
-XCFLAGS                        += $(OPTIMIZER)
-
-DSO_LDOPTS	= -shared -auto_symvec
-MKSHLIB		= $(CC) $(OPTIMIZER) $(LDFLAGS) $(DSO_LDOPTS)
-
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $< $@
-
-
-#
-# Always set CPU_TAG on Linux, OpenVMS, WINCE.
-#
-CPU_TAG = _$(CPU_ARCH)
diff --git a/security/coreconf/OpenVMSV7.1-2.mk b/security/coreconf/OpenVMSV7.1-2.mk
deleted file mode 100755
index 5e99888a1e9..00000000000
--- a/security/coreconf/OpenVMSV7.1-2.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# Config stuff for Compaq OpenVMS
-#
-
-include $(CORE_DEPTH)/coreconf/OpenVMS.mk
diff --git a/security/coreconf/SunOS5.mk b/security/coreconf/SunOS5.mk
index 549e110f582..c3f8e182533 100644
--- a/security/coreconf/SunOS5.mk
+++ b/security/coreconf/SunOS5.mk
@@ -113,7 +113,7 @@ OS_DEFINES += -DSVR4 -DSYSV -D__svr4 -D__svr4__ -DSOLARIS -D_REENTRANT
 # Purify doesn't like -MDupdate
 NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)
 
-MKSHLIB  = $(CC) $(DSO_LDOPTS)
+MKSHLIB  = $(CC) $(DSO_LDOPTS) $(RPATH)
 ifdef NS_USE_GCC
 ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1)))
 	GCC_USE_GNU_LD = 1
@@ -166,3 +166,15 @@ endif
 
 NOSUCHFILE   = /solaris-rm-f-sucks
 
+ifeq ($(BUILD_SUN_PKG), 1)
+# The -R '$ORIGIN' linker option instructs this library to search for its
+# dependencies in the same directory where it resides.
+ifeq ($(USE_64), 1)
+RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
+else
+RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
+endif
+else
+RPATH = -R '$$ORIGIN'
+endif
+
diff --git a/security/coreconf/WINCE.mk b/security/coreconf/WINCE.mk
index c931258461f..af23a8ee0d4 100644
--- a/security/coreconf/WINCE.mk
+++ b/security/coreconf/WINCE.mk
@@ -83,6 +83,8 @@ LIB_SUFFIX   = lib
 DLL_SUFFIX   = dll
 OS_DLLFLAGS  += -DLL
 
+EXTRA_EXE_LD_FLAGS += -ENTRY:mainWCRTStartup
+
 ifdef BUILD_OPT
 #   OS_CFLAGS  += -MD
     OPTIMIZER  += -O2
@@ -206,7 +208,7 @@ endif
 
 
 #
-# Always set CPU_TAG on Linux, OpenVMS, WINCE.
+# Always set CPU_TAG on Linux, WINCE.
 #
 CPU_TAG = _$(CPU_ARCH)
 
diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk
index 4381dc850aa..bd3c02cc34f 100644
--- a/security/coreconf/arch.mk
+++ b/security/coreconf/arch.mk
@@ -165,11 +165,6 @@ ifeq ($(OS_ARCH),OS_2)
     OS_RELEASE := $(shell uname -v)
 endif
 
-ifneq (,$(findstring OpenVMS,$(OS_ARCH)))
-    OS_ARCH = OpenVMS
-    OS_RELEASE := $(shell uname -v)
-endif
-
 #######################################################################
 # Master "Core Components" macros for getting the OS target           #
 #######################################################################
diff --git a/security/coreconf/config.mk b/security/coreconf/config.mk
index a45eb8ca9e9..5b560fbbc18 100644
--- a/security/coreconf/config.mk
+++ b/security/coreconf/config.mk
@@ -63,7 +63,7 @@ endif
 #######################################################################
 
 TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
-              OpenVMS AIX RISCOS WINNT WIN95 WINCE
+              AIX RISCOS WINNT WIN95 WINCE
 
 ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/security/coreconf/coreconf.dep b/security/coreconf/coreconf.dep
index 831d1c16ee5..6ceac377349 100644
--- a/security/coreconf/coreconf.dep
+++ b/security/coreconf/coreconf.dep
@@ -44,3 +44,4 @@
 #error "Do not include this header file."
 
 /* NSS 3.12.4 Beta */
+
diff --git a/security/coreconf/nsinstall/nsinstall.c b/security/coreconf/nsinstall/nsinstall.c
index 67850411d5f..647f1111d4f 100644
--- a/security/coreconf/nsinstall/nsinstall.c
+++ b/security/coreconf/nsinstall/nsinstall.c
@@ -58,7 +58,7 @@ typedef unsigned int mode_t;
 
 #define HAVE_LCHOWN
 
-#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(VMS) || defined(NTO) || defined(DARWIN) || defined(BEOS) || defined(__riscos__)
+#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(NTO) || defined(DARWIN) || defined(BEOS) || defined(__riscos__)
 #undef HAVE_LCHOWN
 #endif
 
@@ -407,11 +407,6 @@ retry:
 
 	    if (ftruncate(tofd, sb.st_size) < 0)
 		fail("cannot truncate %s", toname);
-	    /*
-	    ** On OpenVMS we can't chmod() until the file is closed, and we
-	    ** have to utime() last since fchown/chmod alter the timestamps.
-	    */
-#ifndef VMS
 	    if (dotimes) {
 		utb.actime = sb.st_atime;
 		utb.modtime = sb.st_mtime;
@@ -424,7 +419,7 @@ retry:
 	    if (chmod(toname, mode) < 0)
 #endif
 		fail("cannot change mode of %s", toname);
-#endif
+
 	    if ((owner || group) && fchown(tofd, uid, gid) < 0)
 		fail("cannot change owner of %s", toname);
 
@@ -432,16 +427,6 @@ retry:
 	    if (close(tofd) < 0)
 		fail("close reports write error on %s", toname);
 	    close(fromfd);
-#ifdef VMS
-	    if (chmod(toname, mode) < 0)
-		fail("cannot change mode of %s", toname);
-	    if (dotimes) {
-		utb.actime = sb.st_atime;
-		utb.modtime = sb.st_mtime;
-		if (utime(toname, &utb) < 0)
-		    fail("cannot set times of %s", toname);
-	    }
-#endif
 	}
 
 	free(toname);
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk
index 0f347b5aa9e..d3738c43ad6 100644
--- a/security/coreconf/rules.mk
+++ b/security/coreconf/rules.mk
@@ -273,7 +273,7 @@ alltags:
 $(PROGRAM): $(OBJS) $(EXTRA_LIBS)
 	@$(MAKE_OBJDIR)
 ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
-	$(MKPROG) $(subst /,\\,$(OBJS)) -Fe$@ -link $(LDFLAGS) $(subst /,\\,$(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS))
+	$(MKPROG) $(subst /,\\,$(OBJS)) -Fe$@ -link $(LDFLAGS) $(subst /,\\,$(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)) $(EXTRA_EXE_LD_FLAGS)
 ifdef MT
 	if test -f $@.manifest; then \
 		$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
@@ -373,7 +373,7 @@ $(OBJDIR)/$(PROG_PREFIX)%$(PROG_SUFFIX): $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX)
 	@$(MAKE_OBJDIR)
 ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
 	$(MKPROG) $< -Fe$@ -link \
-	$(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+	$(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(EXTRA_EXE_LD_FLAGS)
 ifdef MT
 	if test -f $@.manifest; then \
 		$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
@@ -878,7 +878,7 @@ endif
 
 -include $(DEPENDENCIES)
 
-ifneq (,$(filter-out OpenVMS OS2 WIN%,$(OS_TARGET)))
+ifneq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
 # Can't use sed because of its 4000-char line length limit, so resort to perl
 PERL_DEPENDENCIES_PROGRAM =                                                   \
 	    open(MD, "< $(DEPENDENCIES)");                                    \
diff --git a/security/coreconf/ruleset.mk b/security/coreconf/ruleset.mk
index f9b594433bf..c083378a6fc 100644
--- a/security/coreconf/ruleset.mk
+++ b/security/coreconf/ruleset.mk
@@ -210,12 +210,8 @@ endif
 
 endif #NS_USE_JDK
 
-#
-# If this is an "official" build, try to build everything.
-# I.e., don't exit on errors.
-#
-
-ifdef BUILD_OFFICIAL
+ifdef NSS_BUILD_CONTINUE_ON_ERROR
+# Try to build everything. I.e., don't exit on errors.
     EXIT_ON_ERROR		= +e
     CLICK_STOPWATCH		= date
 else
diff --git a/security/nss/cmd/bltest/blapitest.c b/security/nss/cmd/bltest/blapitest.c
index 0b156d71605..051ea7c43df 100644
--- a/security/nss/cmd/bltest/blapitest.c
+++ b/security/nss/cmd/bltest/blapitest.c
@@ -3246,7 +3246,7 @@ int main(int argc, char **argv)
 
     double              totalTime;
     PRIntervalTime      time1, time2;
-    PRFileDesc          *outfile;           
+    PRFileDesc          *outfile = NULL;
     bltestCipherInfo    *cipherInfoListHead, *cipherInfo;
     bltestIOMode        ioMode;
     int                 bufsize, exponent, curThrdNum;
diff --git a/security/nss/cmd/certutil/certext.c b/security/nss/cmd/certutil/certext.c
index ee7b00ddc94..97399c7503c 100644
--- a/security/nss/cmd/certutil/certext.c
+++ b/security/nss/cmd/certutil/certext.c
@@ -1730,7 +1730,7 @@ AddExtensions(void *extHandle, const char *emailAddrs, const char *dnsNames,
         }
 
         if (extList[ext_NSCertType].activated) {
-            rv = AddNscpCertType(extHandle, extList[ext_extKeyUsage].arg);
+            rv = AddNscpCertType(extHandle, extList[ext_NSCertType].arg);
             if (rv) {
 		errstring = "NSCertType";
                 break;
diff --git a/security/nss/cmd/certutil/keystuff.c b/security/nss/cmd/certutil/keystuff.c
index ae4003141bc..1b1852d2737 100644
--- a/security/nss/cmd/certutil/keystuff.c
+++ b/security/nss/cmd/certutil/keystuff.c
@@ -47,8 +47,10 @@
 
 #if defined(XP_WIN) || defined (XP_PC)
 #include <time.h>
+#ifndef WINCE
 #include <conio.h>
 #endif
+#endif
 
 #if defined(__sun) && !defined(SVR4)
 extern int fclose(FILE*);
@@ -112,7 +114,7 @@ UpdateRNG(void)
     /* turn off echo on stdin & return on 1 char instead of NL */
     fd = fileno(stdin);
 
-#if defined(XP_UNIX) && !defined(VMS)
+#if defined(XP_UNIX)
     tcgetattr(fd, &tio);
     orig_lflag = tio.c_lflag;
     orig_cc_min = tio.c_cc[VMIN];
@@ -127,9 +129,7 @@ UpdateRNG(void)
     /* Get random noise from keyboard strokes */
     count = 0;
     while (count < sizeof randbuf) {
-#ifdef VMS
-	c = GENERIC_GETCHAR_NOECHO();
-#elif XP_UNIX
+#if defined(XP_UNIX) || defined(WINCE)
 	c = getc(stdin);
 #else
 	c = getch();
@@ -149,20 +149,15 @@ UpdateRNG(void)
 
     FPS "\n\n");
     FPS "Finished.  Press enter to continue: ");
-#if defined(VMS)
-    while((c = GENERIC_GETCHAR_NO_ECHO()) != '\r' && c != EOF)
-	;
-#else
     while ((c = getc(stdin)) != '\n' && c != EOF)
 	;
-#endif
     if (c == EOF) 
 	rv = -1;
     FPS "\n");
 
 #undef FPS
 
-#if defined(XP_UNIX) && !defined(VMS)
+#if defined(XP_UNIX)
     /* set back termio the way it was */
     tio.c_lflag = orig_lflag;
     tio.c_cc[VMIN] = orig_cc_min;
diff --git a/security/nss/cmd/fipstest/fipstest.c b/security/nss/cmd/fipstest/fipstest.c
index 85bb8cfc6ce..cec04bcce59 100644
--- a/security/nss/cmd/fipstest/fipstest.c
+++ b/security/nss/cmd/fipstest/fipstest.c
@@ -3519,16 +3519,21 @@ hmac_calc(unsigned char *hmac_computed,
 void hmac_test(char *reqfn) 
 {
     unsigned int i, j;
-    size_t bufSize =      288;    /* MAX buffer size */
+    size_t bufSize =      400;    /* MAX buffer size */
     char *buf = NULL;  /* holds one line from the input REQUEST file.*/
     unsigned int keyLen;          /* Key Length */  
-    unsigned char key[140];       /* key MAX size = 140 */
+    unsigned char key[200];       /* key MAX size = 184 */
     unsigned int msgLen = 128;    /* the length of the input  */
                                   /*  Message is always 128 Bytes */
     unsigned char *msg = NULL;    /* holds the message to digest.*/
     unsigned int HMACLen;         /* the length of the HMAC Bytes  */
+    unsigned int TLen;            /* the length of the requested */
+                                  /* truncated HMAC Bytes */
     unsigned char HMAC[HASH_LENGTH_MAX];  /* computed HMAC */
+    unsigned char expectedHMAC[HASH_LENGTH_MAX]; /* for .fax files that have */ 
+                                                 /* supplied known answer */
     HASH_HashType hash_alg;       /* HMAC type */
+    
 
     FILE *req = NULL;  /* input stream from the REQUEST file */
     FILE *resp;        /* output stream to the RESPONSE file */
@@ -3546,6 +3551,28 @@ void hmac_test(char *reqfn)
     req = fopen(reqfn, "r");
     resp = stdout;
     while (fgets(buf, bufSize, req) != NULL) {
+        if (strncmp(buf, "Mac", 3) == 0) {
+            i = 3;
+            while (isspace(buf[i]) || buf[i] == '=') {
+                i++;
+            }
+            memset(expectedHMAC, 0, HASH_LENGTH_MAX);
+            for (j=0; isxdigit(buf[i]); i+=2,j++) { 
+                hex_to_byteval(&buf[i], &expectedHMAC[j]);
+            }
+            if (memcmp(HMAC, expectedHMAC, TLen) != 0) {
+                fprintf(stderr, "Generate failed:\n");
+                fputs(  "   expected=", stderr);
+                to_hex_str(buf, expectedHMAC, 
+                           TLen);
+                fputs(buf, stderr);
+                fputs("\n   generated=", stderr);
+                to_hex_str(buf, HMAC, 
+                           TLen);
+                fputs(buf, stderr);
+                fputc('\n', stderr);
+            }
+        }
 
         /* a comment or blank line */
         if (buf[0] == '#' || buf[0] == '\n') {
@@ -3583,7 +3610,7 @@ void hmac_test(char *reqfn)
             fputs(buf, resp);
             /* zeroize the variables for the test with this data set */
             keyLen = 0; 
-            HMACLen = 0;
+            TLen = 0;
             memset(key, 0, sizeof key);     
             memset(msg, 0, sizeof msg);  
             memset(HMAC, 0, sizeof HMAC);
@@ -3616,7 +3643,7 @@ void hmac_test(char *reqfn)
             while (isspace(buf[i]) || buf[i] == '=') {
                 i++;
             }
-            HMACLen = atoi(&buf[i]); /* in bytes */
+            TLen = atoi(&buf[i]); /* in bytes */
             fputs(buf, resp);
             continue;
         }
@@ -3636,7 +3663,7 @@ void hmac_test(char *reqfn)
                goto loser;
            }
            fputs("MAC = ", resp);
-           to_hex_str(buf, HMAC, HMACLen);
+           to_hex_str(buf, HMAC, TLen);
            fputs(buf, resp);
            fputc('\n', resp);
            continue;
diff --git a/security/nss/cmd/lib/config.mk b/security/nss/cmd/lib/config.mk
index 665828c6320..1c82d648728 100644
--- a/security/nss/cmd/lib/config.mk
+++ b/security/nss/cmd/lib/config.mk
@@ -45,3 +45,7 @@ SHARED_LIBRARY =
 IMPORT_LIBRARY =
 PROGRAM        =
 
+ifeq (WINCE,$(OS_ARCH))
+CSRCS += wincemain.c
+endif
+
diff --git a/security/nss/cmd/lib/secpwd.c b/security/nss/cmd/lib/secpwd.c
index ea4bc31d733..422fc0a41c8 100644
--- a/security/nss/cmd/lib/secpwd.c
+++ b/security/nss/cmd/lib/secpwd.c
@@ -63,7 +63,7 @@ static char * quiet_fgets (char *buf, int length, FILE *input);
 
 static void echoOff(int fd)
 {
-#if defined(XP_UNIX) && !defined(VMS)
+#if defined(XP_UNIX)
     if (isatty(fd)) {
 	struct termios tio;
 	tcgetattr(fd, &tio);
@@ -75,7 +75,7 @@ static void echoOff(int fd)
 
 static void echoOn(int fd)
 {
-#if defined(XP_UNIX) && !defined(VMS)
+#if defined(XP_UNIX)
     if (isatty(fd)) {
 	struct termios tio;
 	tcgetattr(fd, &tio);
diff --git a/security/nss/cmd/lib/secutil.c b/security/nss/cmd/lib/secutil.c
index 7a53723e8c6..e9059b44cf2 100644
--- a/security/nss/cmd/lib/secutil.c
+++ b/security/nss/cmd/lib/secutil.c
@@ -73,11 +73,7 @@
 
 static char consoleName[] =  {
 #ifdef XP_UNIX
-#ifdef VMS
-    "TT"
-#else
     "/dev/tty"
-#endif
 #else
 #ifdef XP_OS2
     "\\DEV\\CON"
@@ -3315,6 +3311,56 @@ SEC_PrintCertificateAndTrust(CERTCertificate *cert,
     return(SECSuccess);
 }
 
+#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
+/* Returns true iff a[i].flag has a duplicate in a[i+1 : count-1]  */
+static PRBool HasShortDuplicate(int i, secuCommandFlag *a, int count)
+{
+	char target = a[i].flag;
+	int j;
+
+	/* duplicate '\0' flags are okay, they are used with long forms */
+	for (j = i+1; j < count; j++) {
+		if (a[j].flag && a[j].flag == target) {
+			return PR_TRUE;
+		}
+	}
+	return PR_FALSE;
+}
+
+/* Returns true iff a[i].longform has a duplicate in a[i+1 : count-1] */
+static PRBool HasLongDuplicate(int i, secuCommandFlag *a, int count)
+{
+	int j;	
+	char *target = a[i].longform;
+
+	if (!target)
+		return PR_FALSE;
+
+	for (j = i+1; j < count; j++) {
+		if (a[j].longform && strcmp(a[j].longform, target) == 0) {
+			return PR_TRUE;
+		}
+	}
+	return PR_FALSE;
+}
+
+/* Returns true iff a has no short or long form duplicates
+ */
+PRBool HasNoDuplicates(secuCommandFlag *a, int count)
+{
+    int i;
+
+	for (i = 0; i < count; i++) {
+		if (a[i].flag && HasShortDuplicate(i, a, count)) {
+			return PR_FALSE;
+		}
+		if (a[i].longform && HasLongDuplicate(i, a, count)) {
+			return PR_FALSE;
+		}
+	}
+	return PR_TRUE;
+}
+#endif
 
 SECStatus
 SECU_ParseCommandLine(int argc, char **argv, char *progName,
@@ -3328,6 +3374,9 @@ SECU_ParseCommandLine(int argc, char **argv, char *progName,
     int i, j;
     int lcmd = 0, lopt = 0;
 
+    PR_ASSERT(HasNoDuplicates(cmd->commands, cmd->numCommands));
+    PR_ASSERT(HasNoDuplicates(cmd->options, cmd->numOptions));
+
     optstring = (char *)PORT_Alloc(cmd->numCommands + 2*cmd->numOptions+1);
     if (optstring == NULL)
         return SECFailure;
diff --git a/security/nss/cmd/lib/wincemain.c b/security/nss/cmd/lib/wincemain.c
new file mode 100644
index 00000000000..8bb4ca34cce
--- /dev/null
+++ b/security/nss/cmd/lib/wincemain.c
@@ -0,0 +1,65 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifdef WINCE
+#include <windows.h>
+
+int
+wmain(int argc, WCHAR **wargv)
+{
+    char **argv;
+    int i, ret;
+
+    argv = malloc(argc * sizeof(char*));
+
+    for (i = 0; i < argc; i++) {
+        int len = WideCharToMultiByte(CP_ACP, 0, wargv[i], -1, NULL, 0, 0, 0);
+        argv[i] = malloc(len * sizeof(char));
+        WideCharToMultiByte(CP_ACP, 0, wargv[i], -1, argv[i], len, 0, 0);
+    }
+
+    ret = main(argc, argv);
+
+    for (i = 0; i < argc; i++) {
+        free(argv[i]);
+    }
+    free(argv);
+
+    return ret;
+}
+
+#endif
+
diff --git a/security/nss/cmd/pk11mode/pk11mode.c b/security/nss/cmd/pk11mode/pk11mode.c
index 623c6672370..710e7d01e19 100644
--- a/security/nss/cmd/pk11mode/pk11mode.c
+++ b/security/nss/cmd/pk11mode/pk11mode.c
@@ -780,7 +780,7 @@ cleanup:
         free(dbPrefix);
     }
     if (moduleSpec) {
-        free(moduleSpec);
+        PR_smprintf_free(moduleSpec);
     }
 
 #ifdef _WIN32
diff --git a/security/nss/cmd/pk12util/pk12util.c b/security/nss/cmd/pk12util/pk12util.c
index d1b6e8c4298..dc08a60098e 100644
--- a/security/nss/cmd/pk12util/pk12util.c
+++ b/security/nss/cmd/pk12util/pk12util.c
@@ -57,18 +57,22 @@ static void
 Usage(char *progName)
 {
 #define FPS PR_fprintf(PR_STDERR,
-    FPS "Usage:	 %s -i importfile [-d certdir] [-P dbprefix] [-h tokenname] [-v]\n",
+    FPS "Usage:	 %s -i importfile [-d certdir] [-P dbprefix] [-h tokenname]\n",
 				 progName);
     FPS "\t\t [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]\n");
+    FPS "\t\t [-v]\n");
 
-    FPS "Usage:	 %s -l listfile [-d certdir] [-P dbprefix] [-h tokenname] [-r]\n",
+    FPS "Usage:	 %s -l listfile [-d certdir] [-P dbprefix] [-h tokenname]\n",
 				 progName);
     FPS "\t\t [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]\n");
+    FPS "\t\t [-v]\n");
 
-    FPS "Usage:	 %s -o exportfile -n certname [-d certdir] [-P dbprefix] [-v]\n", 
-        progName);
-    FPS "\t\t [-c key_cipher] [-C cert_cipher] [-m | --key_len keyLen] [-n | --cert_key_len certKeyLen]\n");
-    FPS "\t\t [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filefilepw]\n");
+    FPS "Usage:	 %s -o exportfile -n certname [-d certdir] [-P dbprefix]\n",
+		progName);
+    FPS "\t\t [-c key_cipher] [-C cert_cipher]\n"
+        "\t\t [-m | --key_len keyLen] [--cert_key_len certKeyLen] [-v]\n");
+    FPS "\t\t [-k slotpwfile | -K slotpw]\n"
+		"\t\t [-w p12filepwfile | -W p12filefilepw]\n");
 
     exit(PK12UERR_USAGE);
 }
@@ -955,7 +959,7 @@ static secuCommandFlag pk12util_options[] =
     { /* opt_Cipher	       */ 'c', PR_TRUE,  0, PR_FALSE },
     { /* opt_CertCipher	       */ 'C', PR_TRUE,  0, PR_FALSE },
     { /* opt_KeyLength         */ 'm', PR_TRUE,  0, PR_FALSE, "key_len" },
-    { /* opt_CertKeyLength     */ 'n', PR_TRUE,  0, PR_FALSE, "cert_key_len" }
+    { /* opt_CertKeyLength     */ 0, PR_TRUE,  0, PR_FALSE, "cert_key_len" }
 };
 
 int
diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk
index 18b480e438a..ab8024386bd 100644
--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -51,12 +51,20 @@ endif
 endif
 
 ifeq ($(OS_ARCH), Linux)
+ifeq ($(BUILD_SUN_PKG), 1)
+ifeq ($(USE_64), 1)
+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
+else
+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
+endif
+else
 ifeq ($(USE_64), 1)
 EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
 else
 EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
 endif
 endif
+endif
 
 ifeq ($(OS_ARCH), HP-UX) 
 ifeq ($(OS_TEST), ia64)
@@ -83,7 +91,7 @@ endif
 ifdef USE_STATIC_LIBS
 
 # can't do this in manifest.mn because OS_ARCH isn't defined there.
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) 
 
 DEFINES += -DNSS_USE_STATIC_LIBS
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
@@ -203,7 +211,7 @@ endif
 
 else # USE_STATIC_LIBS
 # can't do this in manifest.mn because OS_ARCH isn't defined there.
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) 
 
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 EXTRA_LIBS += \
diff --git a/security/nss/cmd/sdrtest/sdrtest.c b/security/nss/cmd/sdrtest/sdrtest.c
index 35199dadb3c..abdbab418fb 100644
--- a/security/nss/cmd/sdrtest/sdrtest.c
+++ b/security/nss/cmd/sdrtest/sdrtest.c
@@ -37,7 +37,7 @@
 /*
  * Test program for SDR (Secret Decoder Ring) functions.
  *
- * $Id: sdrtest.c,v 1.14 2008/03/10 20:16:44 rrelyea%redhat.com Exp $
+ * $Id: sdrtest.c,v 1.16 2009/07/08 21:37:43 julien.pierre.boogz%sun.com Exp $
  */
 
 #include "nspr.h"
@@ -113,7 +113,7 @@ readStdin(SECItem * result)
   result->data = NULL;
   do {
     if (bufsize < wanted) {
-      unsigned char * tmpData = (unsigned char *)realloc(result->data, wanted);
+      unsigned char * tmpData = (unsigned char *)PR_Realloc(result->data, wanted);
       if (!tmpData) {
 	if (verbose) PR_fprintf(pr_stderr, "Allocation of buffer failed\n");
 	return -1;
@@ -153,7 +153,7 @@ readInputFile(const char * filename, SECItem * result)
   }
 
   result->len = info.size;
-  result->data = (unsigned char *)malloc(result->len);
+  result->data = (unsigned char *)PR_Malloc(result->len);
   if (!result->data) {
     if (verbose) PR_fprintf(pr_stderr, "Allocation of buffer failed\n");
     goto file_loser;
@@ -313,7 +313,7 @@ main (int argc, char **argv)
 	  retval = -1;
 	  goto loser;
 	}
-	free(result.data);
+	SECITEM_ZfreeItem(&result, PR_FALSE);
 	result = *ok;
       }
     }
@@ -436,8 +436,8 @@ main (int argc, char **argv)
     }
 
 loser:
-    if (text.data) free(text.data);
-    if (result.data) free(result.data);
+    if (text.data) SECITEM_ZfreeItem(&text, PR_FALSE);
+    if (result.data) SECITEM_ZfreeItem(&result, PR_FALSE);
     if (NSS_Shutdown() != SECSuccess) {
        exit(1);
     }
diff --git a/security/nss/cmd/shlibsign/sign.sh b/security/nss/cmd/shlibsign/sign.sh
index 764012d7b8c..26cc73ad341 100644
--- a/security/nss/cmd/shlibsign/sign.sh
+++ b/security/nss/cmd/shlibsign/sign.sh
@@ -21,24 +21,6 @@ WIN*)
     echo ${2}/shlibsign -v -i ${5}
     ${2}/shlibsign -v -i ${5}
     ;;
-OpenVMS)
-    temp="tmp$$.tmp"
-    temp2="tmp$$.tmp2"
-    cd ${1}/lib
-    vmsdir=`dcl show default`
-    ls *.so > $temp
-    sed -e "s/\([^\.]*\)\.so/\$ define\/job \1 ${vmsdir}\1.so/" $temp > $temp2
-    echo '$ define/job getipnodebyname xxx' >> $temp2
-    echo '$ define/job vms_null_dl_name sys$share:decc$shr' >> $temp2
-    dcl @$temp2
-    echo ${2}/shlibsign -v -i ${5}
-    ${2}/shlibsign -v -i ${5}
-    sed -e "s/\([^\.]*\)\.so/\$ deass\/job \1/" $temp > $temp2
-    echo '$ deass/job getipnodebyname' >> $temp2
-    echo '$ deass/job vms_null_dl_name' >> $temp2
-    dcl @$temp2
-    rm $temp $temp2
-    ;;
 *)
     LIBPATH=`(cd ${1}/lib; pwd)`:`(cd ${4}; pwd)`:$LIBPATH
     export LIBPATH
diff --git a/security/nss/cmd/tests/baddbdir.c b/security/nss/cmd/tests/baddbdir.c
new file mode 100644
index 00000000000..c676a7f59bc
--- /dev/null
+++ b/security/nss/cmd/tests/baddbdir.c
@@ -0,0 +1,68 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "nss.h"
+#include "secerr.h"
+
+/*
+ * Regression test for bug 495097.
+ *
+ * NSS_InitReadWrite("sql:<dbdir>") should fail with SEC_ERROR_BAD_DATABASE
+ * if the directory <dbdir> doesn't exist.
+ */
+
+int main()
+{
+    SECStatus status;
+    int error;
+
+    status = NSS_InitReadWrite("sql:/no/such/db/dir");
+    if (status == SECSuccess) {
+        fprintf(stderr, "NSS_InitReadWrite succeeded unexpectedly\n");
+        exit(1);
+    }
+    error = PORT_GetError();
+    if (error != SEC_ERROR_BAD_DATABASE) {
+        fprintf(stderr, "NSS_InitReadWrite failed with the wrong error code: "
+                "%d\n", error);
+        exit(1);
+    }
+    printf("PASS\n");
+    return 0;
+}
diff --git a/security/nss/cmd/tests/manifest.mn b/security/nss/cmd/tests/manifest.mn
index 1418d08f346..e53c06c281f 100644
--- a/security/nss/cmd/tests/manifest.mn
+++ b/security/nss/cmd/tests/manifest.mn
@@ -41,6 +41,7 @@ CORE_DEPTH = ../../..
 MODULE = nss
 
 CSRCS = \
+	baddbdir.c \
 	conflict.c \
 	nonspr10.c \
 	remtest.c \
diff --git a/security/nss/cmd/zlib/README b/security/nss/cmd/zlib/README
index 758cc50020d..92639fcea00 100644
--- a/security/nss/cmd/zlib/README
+++ b/security/nss/cmd/zlib/README
@@ -17,7 +17,7 @@ minigzip.c.
 To compile all files and run the test program, follow the instructions given at
 the top of Makefile. In short "make test; make install" should work for most
 machines. For Unix: "./configure; make test; make install". For MSDOS, use one
-of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.
+of the special makefiles such as Makefile.msc. 
 
 Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
 <info@winimage.com> for the Windows DLL version. The zlib home page is
diff --git a/security/nss/cmd/zlib/example.c b/security/nss/cmd/zlib/example.c
index 60af6555d25..7a0dd53d6b5 100644
--- a/security/nss/cmd/zlib/example.c
+++ b/security/nss/cmd/zlib/example.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: example.c,v 1.5 2005/07/20 20:32:42 wtchang%redhat.com Exp $ */
+/* @(#) $Id: example.c,v 1.6 2009/06/05 02:22:16 nelson%bolyard.com Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
@@ -13,7 +13,7 @@
 #  include <stdlib.h>
 #endif
 
-#if defined(VMS) || defined(RISCOS)
+#if defined(RISCOS)
 #  define TESTFILE "foo-gz"
 #else
 #  define TESTFILE "foo.gz"
diff --git a/security/nss/cmd/zlib/minigzip.c b/security/nss/cmd/zlib/minigzip.c
index 1ba90511b9e..6a2cb1e348b 100644
--- a/security/nss/cmd/zlib/minigzip.c
+++ b/security/nss/cmd/zlib/minigzip.c
@@ -13,7 +13,7 @@
  * or in pipe mode.
  */
 
-/* @(#) $Id: minigzip.c,v 1.5 2005/07/20 20:32:42 wtchang%redhat.com Exp $ */
+/* @(#) $Id: minigzip.c,v 1.6 2009/06/05 02:22:16 nelson%bolyard.com Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
@@ -37,10 +37,6 @@
 #  define SET_BINARY_MODE(file)
 #endif
 
-#ifdef VMS
-#  define unlink delete
-#  define GZ_SUFFIX "-gz"
-#endif
 #ifdef RISCOS
 #  define unlink remove
 #  define GZ_SUFFIX "-gz"
diff --git a/security/nss/cmd/zlib/zconf.h b/security/nss/cmd/zlib/zconf.h
index 8bd43a0bdde..b82426c68fc 100644
--- a/security/nss/cmd/zlib/zconf.h
+++ b/security/nss/cmd/zlib/zconf.h
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: zconf.h,v 1.6 2005/07/20 20:32:42 wtchang%redhat.com Exp $ */
+/* @(#) $Id: zconf.h,v 1.7 2009/06/05 02:22:17 nelson%bolyard.com Exp $ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
@@ -284,14 +284,6 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t off_t
-#endif
 #ifndef SEEK_SET
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
diff --git a/security/nss/cmd/zlib/zutil.h b/security/nss/cmd/zlib/zutil.h
index 1129e1db544..1f700ada4e6 100644
--- a/security/nss/cmd/zlib/zutil.h
+++ b/security/nss/cmd/zlib/zutil.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: zutil.h,v 1.7 2007/12/01 02:16:10 julien.pierre.boogz%sun.com Exp $ */
+/* @(#) $Id: zutil.h,v 1.8 2009/06/05 02:22:17 nelson%bolyard.com Exp $ */
 
 #ifndef ZUTIL_H
 #define ZUTIL_H
@@ -105,7 +105,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define OS_CODE  0x01
 #endif
 
-#if defined(VAXC) || defined(VMS)
+#if defined(VAXC)
 #  define OS_CODE  0x02
 #  define F_OPEN(name, mode) \
      fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
@@ -205,9 +205,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    define NO_vsnprintf
 #  endif
 #endif
-#ifdef VMS
-#  define NO_vsnprintf
-#endif
 
 #if defined(pyr)
 #  define NO_MEMCPY
diff --git a/security/nss/lib/certdb/cert.h b/security/nss/lib/certdb/cert.h
index 0e934a57f4e..9152583ca16 100644
--- a/security/nss/lib/certdb/cert.h
+++ b/security/nss/lib/certdb/cert.h
@@ -37,7 +37,7 @@
 /*
  * cert.h - public data structures and prototypes for the certificate library
  *
- * $Id: cert.h,v 1.77 2009/04/17 22:46:27 julien.pierre.boogz%sun.com Exp $
+ * $Id: cert.h,v 1.78 2009/05/14 01:33:36 julien.pierre.boogz%sun.com Exp $
  */
 
 #ifndef _CERT_H_
@@ -1610,25 +1610,25 @@ CERT_EncodeNoticeReference(PLArenaPool *arena,
  * Returns a pointer to a static structure.
  */
 extern const CERTRevocationFlags*
-CERT_GetPKIXVerifyNistRevocationPolicy();
+CERT_GetPKIXVerifyNistRevocationPolicy(void);
 
 /*
  * Returns a pointer to a static structure.
  */
 extern const CERTRevocationFlags*
-CERT_GetClassicOCSPEnabledSoftFailurePolicy();
+CERT_GetClassicOCSPEnabledSoftFailurePolicy(void);
 
 /*
  * Returns a pointer to a static structure.
  */
 extern const CERTRevocationFlags*
-CERT_GetClassicOCSPEnabledHardFailurePolicy();
+CERT_GetClassicOCSPEnabledHardFailurePolicy(void);
 
 /*
  * Returns a pointer to a static structure.
  */
 extern const CERTRevocationFlags*
-CERT_GetClassicOCSPDisabledPolicy();
+CERT_GetClassicOCSPDisabledPolicy(void);
 
 /*
  * Verify a Cert with libpkix
@@ -1662,7 +1662,7 @@ SECStatus CERT_SetUsePKIXForValidation(PRBool enable);
 
 /* The function return PR_TRUE if cert validation should use
  * libpkix cert validation engine. */
-PRBool CERT_GetUsePKIXForValidation();
+PRBool CERT_GetUsePKIXForValidation(void);
 
 SEC_END_PROTOS
 
diff --git a/security/nss/lib/certdb/certdb.c b/security/nss/lib/certdb/certdb.c
index 54b6420b283..481b64bd71e 100644
--- a/security/nss/lib/certdb/certdb.c
+++ b/security/nss/lib/certdb/certdb.c
@@ -39,7 +39,7 @@
 /*
  * Certificate handling code
  *
- * $Id: certdb.c,v 1.100 2009/03/23 02:18:19 nelson%bolyard.com Exp $
+ * $Id: certdb.c,v 1.101 2009/05/18 21:33:25 nelson%bolyard.com Exp $
  */
 
 #include "nssilock.h"
@@ -1739,7 +1739,7 @@ cert_GetDNSPatternsFromGeneralNames(CERTGeneralName *firstName,
               return SECFailure;
             PORT_Memcpy(cn, currentInput->name.other.data, 
                             currentInput->name.other.len);
-            cn[currentInput->name.other.len + 1] = 0;
+            cn[currentInput->name.other.len] = 0;
             break;
         case certIPAddress:
             if (currentInput->name.other.len == 4) {
@@ -1751,7 +1751,7 @@ cert_GetDNSPatternsFromGeneralNames(CERTGeneralName *firstName,
               memcpy(&addr.ipv6.ip, currentInput->name.other.data, 
                                     currentInput->name.other.len);
             }
-            if (PR_NetAddrToString(&addr, ipbuf, sizeof(ipbuf) == PR_FAILURE))
+            if (PR_NetAddrToString(&addr, ipbuf, sizeof(ipbuf)) == PR_FAILURE)
               return SECFailure;
             cn = PORT_ArenaStrdup(nickNames->arena, ipbuf);
             if (!cn)
diff --git a/security/nss/lib/certdb/certdb.h b/security/nss/lib/certdb/certdb.h
index 966d665f3e6..c489b0f89ee 100644
--- a/security/nss/lib/certdb/certdb.h
+++ b/security/nss/lib/certdb/certdb.h
@@ -63,7 +63,7 @@ CERTSignedCrl *
 SEC_FindCrlByDERCert(CERTCertDBHandle *handle, SECItem *derCrl, int type);
 
 PRBool
-SEC_CertNicknameConflict(char *nickname, SECItem *derSubject,
+SEC_CertNicknameConflict(const char *nickname, SECItem *derSubject,
 			 CERTCertDBHandle *handle);
 CERTSignedCrl *
 SEC_NewCrl(CERTCertDBHandle *handle, char *url, SECItem *derCrl, int type);
diff --git a/security/nss/lib/certdb/certt.h b/security/nss/lib/certdb/certt.h
index b75d76872b1..64cbb8757dc 100644
--- a/security/nss/lib/certdb/certt.h
+++ b/security/nss/lib/certdb/certt.h
@@ -36,7 +36,7 @@
 /*
  * certt.h - public data structures for the certificate library
  *
- * $Id: certt.h,v 1.50 2009/04/24 19:18:32 nelson%bolyard.com Exp $
+ * $Id: certt.h,v 1.52 2009/05/29 18:10:38 alexei.volkov.bugs%sun.com Exp $
  */
 #ifndef _CERTT_H_
 #define _CERTT_H_
@@ -940,12 +940,17 @@ typedef enum {
    cert_pi_certStores      = 10,/* Bitmask of Cert Store flags (see below)
 				 * Set in value.scalar.ui */
    cert_pi_trustAnchors    = 11,/* Specify the list of trusted roots to 
-				 * validate against. If the list in NULL all
-				 * default trusted roots are used.
+				 * validate against. 
+				 * The default set of trusted roots, these are
+				 * root CA certs from libnssckbi.so or CA
+				 * certs trusted by user, are used in any of
+				 * the following cases:
+				 *      * when the parameter is not set.
+				 *      * when the list of trust anchors is empty.
 				 * Specified in value.pointer.chain */
    cert_pi_useAIACertFetch = 12, /* Enables cert fetching using AIA extension.
-				 * Default is off.
-                                     * Value is in value.scalar.b */
+				 * In NSS 3.12.1 or later. Default is off.
+				 * Value is in value.scalar.b */
    cert_pi_max                  /* SPECIAL: signifies maximum allowed value,
 				 *  can increase in future releases */
 } CERTValParamInType;
diff --git a/security/nss/lib/certdb/crl.c b/security/nss/lib/certdb/crl.c
index 4f52bc7c1bd..f79b913d9d7 100644
--- a/security/nss/lib/certdb/crl.c
+++ b/security/nss/lib/certdb/crl.c
@@ -37,7 +37,7 @@
 /*
  * Moved from secpkcs7.c
  *
- * $Id: crl.c,v 1.66 2009/04/21 22:53:58 julien.pierre.boogz%sun.com Exp $
+ * $Id: crl.c,v 1.67 2009/05/13 22:47:28 julien.pierre.boogz%sun.com Exp $
  */
  
 #include "cert.h"
@@ -3136,6 +3136,7 @@ static SECStatus addCRLToCache(CERTCertDBHandle* dbhandle, SECItem* crl,
         rv = SECFailure;
         /* no need to keep unused CRL around */
         SECITEM_ZfreeItem(entry->crl, PR_TRUE);
+        entry->crl = NULL;
     }
     return rv;
 }
@@ -3206,6 +3207,10 @@ SECStatus cert_CacheCRLByGeneralName(CERTCertDBHandle* dbhandle, SECItem* crl,
             if (!removed)
             {
                 rv = SECFailure;
+		/* leak old entry since we couldn't remove it from the hash table */
+            }
+            else
+            {
                 rv2 = NamedCRLCacheEntry_Destroy(oldEntry);
                 PORT_Assert(SECSuccess == rv2);
             }
@@ -3249,7 +3254,11 @@ SECStatus cert_CacheCRLByGeneralName(CERTCertDBHandle* dbhandle, SECItem* crl,
                 PORT_Assert(removed);
                 if (!removed)
                 {
+		    /* leak old entry since we couldn't remove it from the hash table */
                     rv = SECFailure;
+                }
+                else
+                {
                     rv2 = NamedCRLCacheEntry_Destroy(oldEntry);
                     PORT_Assert(SECSuccess == rv2);
                 }
diff --git a/security/nss/lib/certdb/stanpcertdb.c b/security/nss/lib/certdb/stanpcertdb.c
index 6dde1b1bd68..da0d7bc0371 100644
--- a/security/nss/lib/certdb/stanpcertdb.c
+++ b/security/nss/lib/certdb/stanpcertdb.c
@@ -63,7 +63,7 @@
 #include "dev.h"
 
 PRBool
-SEC_CertNicknameConflict(char *nickname, SECItem *derSubject,
+SEC_CertNicknameConflict(const char *nickname, SECItem *derSubject,
 			 CERTCertDBHandle *handle)
 {
     CERTCertificate *cert;
diff --git a/security/nss/lib/certhigh/certvfypkix.c b/security/nss/lib/certhigh/certvfypkix.c
index 45065c07426..e437953eee3 100644
--- a/security/nss/lib/certhigh/certvfypkix.c
+++ b/security/nss/lib/certhigh/certvfypkix.c
@@ -1690,7 +1690,11 @@ cert_pkixSetParam(PKIX_ProcessingParams *procParams,
 
         case cert_pi_trustAnchors:
             certList = param->value.pointer.chain;
-
+            if (!certList) {
+                PORT_SetError(errCode);
+                r = SECFailure;
+                break;
+            }
             error = PKIX_List_Create(&certListPkix, plContext);
             if (error != NULL) {
                 break;
diff --git a/security/nss/lib/certhigh/ocsp.c b/security/nss/lib/certhigh/ocsp.c
index 76a571767fb..1516b1bdf50 100644
--- a/security/nss/lib/certhigh/ocsp.c
+++ b/security/nss/lib/certhigh/ocsp.c
@@ -39,7 +39,7 @@
  * Implementation of OCSP services, for both client and server.
  * (XXX, really, mostly just for client right now, but intended to do both.)
  *
- * $Id: ocsp.c,v 1.58 2009/03/21 01:40:35 nelson%bolyard.com Exp $
+ * $Id: ocsp.c,v 1.59 2009/06/10 22:59:09 julien.pierre.boogz%sun.com Exp $
  */
 
 #include "prerror.h"
@@ -730,7 +730,7 @@ ocsp_FreshenCacheItemNextFetchAttemptTime(OCSPCacheItem *cacheItem)
     }
   
     if (cacheItem->haveNextUpdate) {
-        OCSP_TRACE_TIME("have nextUpdate:", cacheItem->thisUpdate);
+        OCSP_TRACE_TIME("have nextUpdate:", cacheItem->nextUpdate);
     }
   
     if (cacheItem->haveNextUpdate &&
diff --git a/security/nss/lib/ckfw/Makefile b/security/nss/lib/ckfw/Makefile
index cf42da56583..f686f59f73f 100644
--- a/security/nss/lib/ckfw/Makefile
+++ b/security/nss/lib/ckfw/Makefile
@@ -34,14 +34,14 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.16 $ $Date: 2008/12/03 18:44:24 $"
+MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.17 $ $Date: 2009/05/22 01:03:30 $"
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
 include config.mk
 include $(CORE_DEPTH)/coreconf/rules.mk
 
-ifdef MOZILLA_CLIENT
+ifdef NOTDEF # was ifdef MOZILLA_CLIENT
 NSS_BUILD_CAPI = 1
 endif
 
diff --git a/security/nss/lib/ckfw/builtins/config.mk b/security/nss/lib/ckfw/builtins/config.mk
index c28c02b1c1a..fc7779a61e3 100644
--- a/security/nss/lib/ckfw/builtins/config.mk
+++ b/security/nss/lib/ckfw/builtins/config.mk
@@ -34,7 +34,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.13 $ $Date: 2009/03/20 07:19:36 $"
+CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.14 $ $Date: 2009/06/11 00:55:34 $"
 
 #
 #  Override TARGETS variable so that only shared libraries
@@ -65,17 +65,3 @@ DSO_LDOPTS = -bundle
 endif
 endif
 
-ifeq ($(OS_TARGET),SunOS)
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
-endif
-
-ifeq ($(OS_ARCH), HP-UX) 
-ifneq ($(OS_TEST), ia64)
-# pa-risc
-ifeq ($(USE_64), 1)
-MKSHLIB += +b '$$ORIGIN'
-endif
-endif
-endif
diff --git a/security/nss/lib/ckfw/capi/config.mk b/security/nss/lib/ckfw/capi/config.mk
index 589b4a39356..b9ae8038d52 100644
--- a/security/nss/lib/ckfw/capi/config.mk
+++ b/security/nss/lib/ckfw/capi/config.mk
@@ -34,7 +34,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.2 $ $Date: 2009/03/20 07:19:45 $"
+CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.3 $ $Date: 2009/06/11 00:55:42 $"
 
 #
 #  Override TARGETS variable so that only shared libraries
@@ -65,9 +65,3 @@ DSO_LDOPTS = -bundle
 endif
 endif
 
-ifeq ($(OS_TARGET),SunOS)
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
-endif
-
diff --git a/security/nss/lib/ckfw/sessobj.c b/security/nss/lib/ckfw/sessobj.c
index 206f3d4f036..66a16d2dbf4 100644
--- a/security/nss/lib/ckfw/sessobj.c
+++ b/security/nss/lib/ckfw/sessobj.c
@@ -35,7 +35,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: sessobj.c,v $ $Revision: 1.14 $ $Date: 2009/02/09 07:55:53 $";
+static const char CVS_ID[] = "@(#) $RCSfile: sessobj.c,v $ $Revision: 1.15 $ $Date: 2009/06/05 00:22:04 $";
 #endif /* DEBUG */
 
 /*
@@ -706,18 +706,15 @@ nss_ckmdSessionObject_SetAttribute
     nss_ZFreeIf(n.data);
     return CKR_HOST_MEMORY;
   }
+  obj->attributes = ra;
 
-  rt = (CK_ATTRIBUTE_TYPE_PTR)nss_ZRealloc(obj->types, (obj->n + 1));
-  if( (CK_ATTRIBUTE_TYPE_PTR)NULL == rt ) {
+  rt = (CK_ATTRIBUTE_TYPE_PTR)nss_ZRealloc(obj->types, 
+                                      sizeof(CK_ATTRIBUTE_TYPE) * (obj->n + 1));
+  if (!rt) {
     nss_ZFreeIf(n.data);
-    obj->attributes = (NSSItem *)nss_ZRealloc(ra, sizeof(NSSItem) * obj->n);
-    if (!obj->attributes) {
-      return CKR_GENERAL_ERROR;
-    }
     return CKR_HOST_MEMORY;
   }
 
-  obj->attributes = ra;
   obj->types = rt;
   obj->attributes[obj->n] = n;
   obj->types[obj->n] = attribute;
diff --git a/security/nss/lib/cryptohi/seckey.c b/security/nss/lib/cryptohi/seckey.c
index 963b985de5d..b1ddf93d960 100644
--- a/security/nss/lib/cryptohi/seckey.c
+++ b/security/nss/lib/cryptohi/seckey.c
@@ -258,11 +258,17 @@ SECKEY_CreateECPrivateKey(SECKEYECParams *param, SECKEYPublicKey **pubk, void *c
 	return NULL;
     }
 
-    privk = PK11_GenerateKeyPair(slot, CKM_EC_KEY_PAIR_GEN, param, 
-                                 pubk, PR_FALSE, PR_FALSE, cx);
+    privk = PK11_GenerateKeyPairWithOpFlags(slot, CKM_EC_KEY_PAIR_GEN, 
+                        param, pubk,
+                        PK11_ATTR_SESSION | PK11_ATTR_INSENSITIVE | 
+                        PK11_ATTR_PUBLIC,
+                        CKF_DERIVE, CKF_DERIVE|CKF_SIGN,cx);
     if (!privk) 
-	privk = PK11_GenerateKeyPair(slot, CKM_EC_KEY_PAIR_GEN, param, 
-	                             pubk, PR_FALSE, PR_TRUE, cx);
+        privk = PK11_GenerateKeyPairWithOpFlags(slot, CKM_EC_KEY_PAIR_GEN, 
+                        param, pubk,
+                        PK11_ATTR_SESSION | PK11_ATTR_SENSITIVE | 
+                        PK11_ATTR_PRIVATE,
+                        CKF_DERIVE, CKF_DERIVE|CKF_SIGN,cx);
 
     PK11_FreeSlot(slot);
     return(privk);
diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
index 27848ce2530..32714966bf8 100644
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -94,6 +94,14 @@ ifeq ($(OS_TARGET),OSF1)
     MPI_SRCS += mpvalpha.c
 endif
 
+ifeq (OS2,$(OS_TARGET))
+    ASFILES  = mpi_x86_os2.s
+    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
+    DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
+    DEFINES += -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
+    DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+endif
+
 ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))  #omits WINCE
 ifndef USE_64
 # 32-bit Windows
@@ -222,9 +230,6 @@ endif
 
 ifeq ($(OS_TARGET),SunOS)
 
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
 ifdef NS_USE_GCC
     ifdef GCC_USE_GNU_LD
 	MKSHLIB += -Wl,-Bsymbolic,-z,now,-z,text
diff --git a/security/nss/lib/freebl/des.c b/security/nss/lib/freebl/des.c
index 9eee162a560..a3541ba7a7a 100644
--- a/security/nss/lib/freebl/des.c
+++ b/security/nss/lib/freebl/des.c
@@ -403,6 +403,11 @@ static const HALF PC2[8][64] = {
 #if defined(__GNUC__) && defined(NSS_X86_OR_X64)
 #define BYTESWAP(word, temp) \
     __asm("bswap	%0" : "+r" (word));
+#elif (_MSC_VER >= 1300) && defined(NSS_X86_OR_X64)
+#include <stdlib.h>
+#pragma intrinsic(_byteswap_ulong)
+#define BYTESWAP(word, temp) \
+    word = _byteswap_ulong(word);
 #else
 #define BYTESWAP(word, temp) \
     word = (word >> 16) | (word << 16); \
diff --git a/security/nss/lib/freebl/drbg.c b/security/nss/lib/freebl/drbg.c
index bd933962944..fb8513386df 100644
--- a/security/nss/lib/freebl/drbg.c
+++ b/security/nss/lib/freebl/drbg.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: drbg.c,v 1.8 2009/04/01 03:37:29 wtc%google.com Exp $ */
+/* $Id: drbg.c,v 1.9 2009/06/10 03:24:01 rrelyea%redhat.com Exp $ */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
@@ -381,6 +381,9 @@ static PRStatus rng_init(void)
     PRUint8 bytes[PRNG_SEEDLEN*2]; /* entropy + nonce */
     unsigned int numBytes;
     if (globalrng == NULL) {
+	/* bytes needs to have enough space to hold
+	 * a SHA256 hash value. Blow up at compile time if this isn't true */
+	PR_STATIC_ASSERT(sizeof(bytes) >= SHA256_LENGTH);
 	/* create a new global RNG context */
 	globalrng = &theGlobalRng;
         PORT_Assert(NULL == globalrng->lock);
@@ -414,6 +417,10 @@ static PRStatus rng_init(void)
 	/* the RNG is in a valid state */
 	globalrng->isValid = PR_TRUE;
 
+	/* fetch one random value so that we can populate rng->oldV for our
+	 * continous random number test. */
+	prng_generateNewBytes(globalrng, bytes, SHA256_LENGTH, NULL, 0);
+
 	/* Fetch more entropy into the PRNG */
 	RNG_SystemInfoForRNG();
     }
diff --git a/security/nss/lib/freebl/mpi/mpi_x86_os2.s b/security/nss/lib/freebl/mpi/mpi_x86_os2.s
new file mode 100644
index 00000000000..c0fabc2b72d
--- /dev/null
+++ b/security/nss/lib/freebl/mpi/mpi_x86_os2.s
@@ -0,0 +1,573 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+#  $Id: mpi_x86_os2.s,v 1.1 2009/06/04 23:53:42 julien.pierre.boogz%sun.com Exp $
+#
+
+.data
+.align 4
+ #
+ # -1 means to call _s_mpi_is_sse to determine if we support sse 
+ #    instructions.
+ #  0 means to use x86 instructions
+ #  1 means to use sse2 instructions
+.type	is_sse,@object
+.size	is_sse,4
+is_sse: .long	-1 
+
+#
+# sigh, handle the difference between -fPIC and not PIC
+# default to pic, since this file seems to be exclusively
+# linux right now (solaris uses mpi_i86pc.s and windows uses
+# mpi_x86_asm.c)
+#
+#.ifndef NO_PIC
+#.macro GET   var,reg
+#    movl   \var@GOTOFF(%ebx),\reg
+#.endm
+#.macro PUT   reg,var
+#    movl   \reg,\var@GOTOFF(%ebx)
+#.endm
+#.else
+.macro GET   var,reg
+    movl   \var,\reg
+.endm
+.macro PUT   reg,var
+    movl   \reg,\var
+.endm
+#.endif
+
+.text
+
+
+ #  ebp - 36:	caller's esi
+ #  ebp - 32:	caller's edi
+ #  ebp - 28:	
+ #  ebp - 24:	
+ #  ebp - 20:	
+ #  ebp - 16:	
+ #  ebp - 12:	
+ #  ebp - 8:	
+ #  ebp - 4:	
+ #  ebp + 0:	caller's ebp
+ #  ebp + 4:	return address
+ #  ebp + 8:	a	argument
+ #  ebp + 12:	a_len	argument
+ #  ebp + 16:	b	argument
+ #  ebp + 20:	c	argument
+ #  registers:
+ # 	eax:
+ #	ebx:	carry
+ #	ecx:	a_len
+ #	edx:
+ #	esi:	a ptr
+ #	edi:	c ptr
+.globl	_s_mpv_mul_d
+.type	_s_mpv_mul_d,@function
+_s_mpv_mul_d:
+    GET    is_sse,%eax
+    cmp    $0,%eax
+    je     _s_mpv_mul_d_x86
+    jg     _s_mpv_mul_d_sse2
+    call   _s_mpi_is_sse2
+    PUT    %eax,is_sse
+    cmp    $0,%eax
+    jg     _s_mpv_mul_d_sse2
+_s_mpv_mul_d_x86:
+    push   %ebp
+    mov    %esp,%ebp
+    sub    $28,%esp
+    push   %edi
+    push   %esi
+    push   %ebx
+    movl   $0,%ebx		# carry = 0
+    mov    12(%ebp),%ecx	# ecx = a_len
+    mov    20(%ebp),%edi
+    cmp    $0,%ecx
+    je     2f			# jmp if a_len == 0
+    mov    8(%ebp),%esi		# esi = a
+    cld
+1:
+    lodsl			# eax = [ds:esi]; esi += 4
+    mov    16(%ebp),%edx	# edx = b
+    mull   %edx			# edx:eax = Phi:Plo = a_i * b
+
+    add    %ebx,%eax		# add carry (%ebx) to edx:eax
+    adc    $0,%edx
+    mov    %edx,%ebx		# high half of product becomes next carry
+
+    stosl			# [es:edi] = ax; edi += 4;
+    dec    %ecx			# --a_len
+    jnz    1b			# jmp if a_len != 0
+2:
+    mov    %ebx,0(%edi)		# *c = carry
+    pop    %ebx
+    pop    %esi
+    pop    %edi
+    leave  
+    ret    
+    nop
+_s_mpv_mul_d_sse2:
+    push   %ebp
+    mov    %esp,%ebp
+    push   %edi
+    push   %esi
+    psubq  %mm2,%mm2		# carry = 0
+    mov    12(%ebp),%ecx	# ecx = a_len
+    movd   16(%ebp),%mm1	# mm1 = b
+    mov    20(%ebp),%edi
+    cmp    $0,%ecx
+    je     6f			# jmp if a_len == 0
+    mov    8(%ebp),%esi		# esi = a
+    cld
+5:
+    movd   0(%esi),%mm0         # mm0 = *a++
+    add    $4,%esi
+    pmuludq %mm1,%mm0           # mm0 = b * *a++
+    paddq  %mm0,%mm2            # add the carry
+    movd   %mm2,0(%edi)         # store the 32bit result
+    add    $4,%edi
+    psrlq  $32, %mm2		# save the carry
+    dec    %ecx			# --a_len
+    jnz    5b			# jmp if a_len != 0
+6:
+    movd   %mm2,0(%edi)		# *c = carry
+    emms
+    pop    %esi
+    pop    %edi
+    leave  
+    ret    
+    nop
+
+ #  ebp - 36:	caller's esi
+ #  ebp - 32:	caller's edi
+ #  ebp - 28:	
+ #  ebp - 24:	
+ #  ebp - 20:	
+ #  ebp - 16:	
+ #  ebp - 12:	
+ #  ebp - 8:	
+ #  ebp - 4:	
+ #  ebp + 0:	caller's ebp
+ #  ebp + 4:	return address
+ #  ebp + 8:	a	argument
+ #  ebp + 12:	a_len	argument
+ #  ebp + 16:	b	argument
+ #  ebp + 20:	c	argument
+ #  registers:
+ # 	eax:
+ #	ebx:	carry
+ #	ecx:	a_len
+ #	edx:
+ #	esi:	a ptr
+ #	edi:	c ptr
+.globl	_s_mpv_mul_d_add
+.type	_s_mpv_mul_d_add,@function
+_s_mpv_mul_d_add:
+    GET    is_sse,%eax
+    cmp    $0,%eax
+    je     _s_mpv_mul_d_add_x86
+    jg     _s_mpv_mul_d_add_sse2
+    call   _s_mpi_is_sse2
+    PUT    %eax,is_sse
+    cmp    $0,%eax
+    jg     _s_mpv_mul_d_add_sse2
+_s_mpv_mul_d_add_x86:
+    push   %ebp
+    mov    %esp,%ebp
+    sub    $28,%esp
+    push   %edi
+    push   %esi
+    push   %ebx
+    movl   $0,%ebx		# carry = 0
+    mov    12(%ebp),%ecx	# ecx = a_len
+    mov    20(%ebp),%edi
+    cmp    $0,%ecx
+    je     11f			# jmp if a_len == 0
+    mov    8(%ebp),%esi		# esi = a
+    cld
+10:
+    lodsl			# eax = [ds:esi]; esi += 4
+    mov    16(%ebp),%edx	# edx = b
+    mull   %edx			# edx:eax = Phi:Plo = a_i * b
+
+    add    %ebx,%eax		# add carry (%ebx) to edx:eax
+    adc    $0,%edx
+    mov    0(%edi),%ebx		# add in current word from *c
+    add    %ebx,%eax		
+    adc    $0,%edx
+    mov    %edx,%ebx		# high half of product becomes next carry
+
+    stosl			# [es:edi] = ax; edi += 4;
+    dec    %ecx			# --a_len
+    jnz    10b			# jmp if a_len != 0
+11:
+    mov    %ebx,0(%edi)		# *c = carry
+    pop    %ebx
+    pop    %esi
+    pop    %edi
+    leave  
+    ret    
+    nop
+_s_mpv_mul_d_add_sse2:
+    push   %ebp
+    mov    %esp,%ebp
+    push   %edi
+    push   %esi
+    psubq  %mm2,%mm2		# carry = 0
+    mov    12(%ebp),%ecx	# ecx = a_len
+    movd   16(%ebp),%mm1	# mm1 = b
+    mov    20(%ebp),%edi
+    cmp    $0,%ecx
+    je     16f			# jmp if a_len == 0
+    mov    8(%ebp),%esi		# esi = a
+    cld
+15:
+    movd   0(%esi),%mm0         # mm0 = *a++
+    add    $4,%esi
+    pmuludq %mm1,%mm0           # mm0 = b * *a++
+    paddq  %mm0,%mm2            # add the carry
+    movd   0(%edi),%mm0
+    paddq  %mm0,%mm2            # add the carry
+    movd   %mm2,0(%edi)         # store the 32bit result
+    add    $4,%edi
+    psrlq  $32, %mm2		# save the carry
+    dec    %ecx			# --a_len
+    jnz    15b			# jmp if a_len != 0
+16:
+    movd   %mm2,0(%edi)		# *c = carry
+    emms
+    pop    %esi
+    pop    %edi
+    leave  
+    ret    
+    nop
+
+ #  ebp - 8:	caller's esi
+ #  ebp - 4:	caller's edi
+ #  ebp + 0:	caller's ebp
+ #  ebp + 4:	return address
+ #  ebp + 8:	a	argument
+ #  ebp + 12:	a_len	argument
+ #  ebp + 16:	b	argument
+ #  ebp + 20:	c	argument
+ #  registers:
+ # 	eax:
+ #	ebx:	carry
+ #	ecx:	a_len
+ #	edx:
+ #	esi:	a ptr
+ #	edi:	c ptr
+.globl	_s_mpv_mul_d_add_prop
+.type	_s_mpv_mul_d_add_prop,@function
+_s_mpv_mul_d_add_prop:
+    GET    is_sse,%eax
+    cmp    $0,%eax
+    je     _s_mpv_mul_d_add_prop_x86
+    jg     _s_mpv_mul_d_add_prop_sse2
+    call   _s_mpi_is_sse2
+    PUT    %eax,is_sse
+    cmp    $0,%eax
+    jg     _s_mpv_mul_d_add_prop_sse2
+_s_mpv_mul_d_add_prop_x86:
+    push   %ebp
+    mov    %esp,%ebp
+    sub    $28,%esp
+    push   %edi
+    push   %esi
+    push   %ebx
+    movl   $0,%ebx		# carry = 0
+    mov    12(%ebp),%ecx	# ecx = a_len
+    mov    20(%ebp),%edi
+    cmp    $0,%ecx
+    je     21f			# jmp if a_len == 0
+    cld
+    mov    8(%ebp),%esi		# esi = a
+20:
+    lodsl			# eax = [ds:esi]; esi += 4
+    mov    16(%ebp),%edx	# edx = b
+    mull   %edx			# edx:eax = Phi:Plo = a_i * b
+
+    add    %ebx,%eax		# add carry (%ebx) to edx:eax
+    adc    $0,%edx
+    mov    0(%edi),%ebx		# add in current word from *c
+    add    %ebx,%eax		
+    adc    $0,%edx
+    mov    %edx,%ebx		# high half of product becomes next carry
+
+    stosl			# [es:edi] = ax; edi += 4;
+    dec    %ecx			# --a_len
+    jnz    20b			# jmp if a_len != 0
+21:
+    cmp    $0,%ebx		# is carry zero?
+    jz     23f
+    mov    0(%edi),%eax		# add in current word from *c
+    add	   %ebx,%eax
+    stosl			# [es:edi] = ax; edi += 4;
+    jnc    23f
+22:
+    mov    0(%edi),%eax		# add in current word from *c
+    adc	   $0,%eax
+    stosl			# [es:edi] = ax; edi += 4;
+    jc     22b
+23:
+    pop    %ebx
+    pop    %esi
+    pop    %edi
+    leave  
+    ret    
+    nop
+_s_mpv_mul_d_add_prop_sse2:
+    push   %ebp
+    mov    %esp,%ebp
+    push   %edi
+    push   %esi
+    push   %ebx
+    psubq  %mm2,%mm2		# carry = 0
+    mov    12(%ebp),%ecx	# ecx = a_len
+    movd   16(%ebp),%mm1	# mm1 = b
+    mov    20(%ebp),%edi
+    cmp    $0,%ecx
+    je     26f			# jmp if a_len == 0
+    mov    8(%ebp),%esi		# esi = a
+    cld
+25:
+    movd   0(%esi),%mm0         # mm0 = *a++
+    movd   0(%edi),%mm3		# fetch the sum
+    add    $4,%esi
+    pmuludq %mm1,%mm0           # mm0 = b * *a++
+    paddq  %mm0,%mm2            # add the carry
+    paddq  %mm3,%mm2            # add *c++
+    movd   %mm2,0(%edi)         # store the 32bit result
+    add    $4,%edi
+    psrlq  $32, %mm2		# save the carry
+    dec    %ecx			# --a_len
+    jnz    25b			# jmp if a_len != 0
+26:
+    movd   %mm2,%ebx
+    cmp    $0,%ebx		# is carry zero?
+    jz     28f
+    mov    0(%edi),%eax
+    add    %ebx, %eax
+    stosl
+    jnc    28f
+27:
+    mov    0(%edi),%eax		# add in current word from *c
+    adc	   $0,%eax
+    stosl			# [es:edi] = ax; edi += 4;
+    jc     27b
+28:
+    emms
+    pop    %ebx
+    pop    %esi
+    pop    %edi
+    leave  
+    ret    
+    nop
+
+
+ #  ebp - 20:	caller's esi
+ #  ebp - 16:	caller's edi
+ #  ebp - 12:	
+ #  ebp - 8:	carry
+ #  ebp - 4:	a_len	local
+ #  ebp + 0:	caller's ebp
+ #  ebp + 4:	return address
+ #  ebp + 8:	pa	argument
+ #  ebp + 12:	a_len	argument
+ #  ebp + 16:	ps	argument
+ #  ebp + 20:	
+ #  registers:
+ # 	eax:
+ #	ebx:	carry
+ #	ecx:	a_len
+ #	edx:
+ #	esi:	a ptr
+ #	edi:	c ptr
+
+.globl	_s_mpv_sqr_add_prop
+.type	_s_mpv_sqr_add_prop,@function
+_s_mpv_sqr_add_prop:
+     GET   is_sse,%eax
+     cmp    $0,%eax
+     je     _s_mpv_sqr_add_prop_x86
+     jg     _s_mpv_sqr_add_prop_sse2
+     call   _s_mpi_is_sse2
+     PUT    %eax,is_sse
+     cmp    $0,%eax
+     jg     _s_mpv_sqr_add_prop_sse2
+_s_mpv_sqr_add_prop_x86:
+     push   %ebp
+     mov    %esp,%ebp
+     sub    $12,%esp
+     push   %edi
+     push   %esi
+     push   %ebx
+     movl   $0,%ebx		# carry = 0
+     mov    12(%ebp),%ecx	# a_len
+     mov    16(%ebp),%edi	# edi = ps
+     cmp    $0,%ecx
+     je     31f			# jump if a_len == 0
+     cld
+     mov    8(%ebp),%esi	# esi = pa
+30:
+     lodsl			# %eax = [ds:si]; si += 4;
+     mull   %eax
+
+     add    %ebx,%eax		# add "carry"
+     adc    $0,%edx
+     mov    0(%edi),%ebx
+     add    %ebx,%eax		# add low word from result
+     mov    4(%edi),%ebx
+     stosl			# [es:di] = %eax; di += 4;
+     adc    %ebx,%edx		# add high word from result
+     movl   $0,%ebx
+     mov    %edx,%eax
+     adc    $0,%ebx
+     stosl			# [es:di] = %eax; di += 4;
+     dec    %ecx		# --a_len
+     jnz    30b			# jmp if a_len != 0
+31:
+    cmp    $0,%ebx		# is carry zero?
+    jz     34f
+    mov    0(%edi),%eax		# add in current word from *c
+    add	   %ebx,%eax
+    stosl			# [es:edi] = ax; edi += 4;
+    jnc    34f
+32:
+    mov    0(%edi),%eax		# add in current word from *c
+    adc	   $0,%eax
+    stosl			# [es:edi] = ax; edi += 4;
+    jc     32b
+34:
+    pop    %ebx
+    pop    %esi
+    pop    %edi
+    leave  
+    ret    
+    nop
+_s_mpv_sqr_add_prop_sse2:
+    push   %ebp
+    mov    %esp,%ebp
+    push   %edi
+    push   %esi
+    push   %ebx
+    psubq  %mm2,%mm2		# carry = 0
+    mov    12(%ebp),%ecx	# ecx = a_len
+    mov    16(%ebp),%edi
+    cmp    $0,%ecx
+    je     36f			# jmp if a_len == 0
+    mov    8(%ebp),%esi		# esi = a
+    cld
+35:
+    movd   0(%esi),%mm0        # mm0 = *a
+    movd   0(%edi),%mm3	       # fetch the sum
+    add	   $4,%esi
+    pmuludq %mm0,%mm0          # mm0 = sqr(a)
+    paddq  %mm0,%mm2           # add the carry
+    paddq  %mm3,%mm2           # add the low word
+    movd   4(%edi),%mm3
+    movd   %mm2,0(%edi)        # store the 32bit result
+    psrlq  $32, %mm2	
+    paddq  %mm3,%mm2           # add the high word
+    movd   %mm2,4(%edi)        # store the 32bit result
+    psrlq  $32, %mm2	       # save the carry.
+    add    $8,%edi
+    dec    %ecx			# --a_len
+    jnz    35b			# jmp if a_len != 0
+36:
+    movd   %mm2,%ebx
+    cmp    $0,%ebx		# is carry zero?
+    jz     38f
+    mov    0(%edi),%eax
+    add    %ebx, %eax
+    stosl
+    jnc    38f
+37:
+    mov    0(%edi),%eax		# add in current word from *c
+    adc	   $0,%eax
+    stosl			# [es:edi] = ax; edi += 4;
+    jc     37b
+38:
+    emms
+    pop    %ebx
+    pop    %esi
+    pop    %edi
+    leave  
+    ret    
+    nop
+
+ #
+ # Divide 64-bit (Nhi,Nlo) by 32-bit divisor, which must be normalized
+ # so its high bit is 1.   This code is from NSPR.
+ #
+ # mp_err _s_mpv_div_2dx1d(mp_digit Nhi, mp_digit Nlo, mp_digit divisor,
+ # 		          mp_digit *qp, mp_digit *rp)
+
+ #  esp +  0:   Caller's ebx
+ #  esp +  4:	return address
+ #  esp +  8:	Nhi	argument
+ #  esp + 12:	Nlo	argument
+ #  esp + 16:	divisor	argument
+ #  esp + 20:	qp	argument
+ #  esp + 24:   rp	argument
+ #  registers:
+ # 	eax:
+ #	ebx:	carry
+ #	ecx:	a_len
+ #	edx:
+ #	esi:	a ptr
+ #	edi:	c ptr
+ # 
+
+.globl	_s_mpv_div_2dx1d
+.type	_s_mpv_div_2dx1d,@function
+_s_mpv_div_2dx1d:
+       push   %ebx
+       mov    8(%esp),%edx
+       mov    12(%esp),%eax
+       mov    16(%esp),%ebx
+       div    %ebx
+       mov    20(%esp),%ebx
+       mov    %eax,0(%ebx)
+       mov    24(%esp),%ebx
+       mov    %edx,0(%ebx)
+       xor    %eax,%eax		# return zero
+       pop    %ebx
+       ret    
+       nop
+  
diff --git a/security/nss/lib/freebl/nsslowhash.c b/security/nss/lib/freebl/nsslowhash.c
index 507237db1fa..e0a2a21c117 100644
--- a/security/nss/lib/freebl/nsslowhash.c
+++ b/security/nss/lib/freebl/nsslowhash.c
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nsslowhash.c,v 1.3 2009/04/15 21:31:55 rrelyea%redhat.com Exp $ */
+/* $Id: nsslowhash.c,v 1.4 2009/06/09 23:34:06 rrelyea%redhat.com Exp $ */
 
 #include "stubs.h"
 #include "prtypes.h"
@@ -289,6 +289,7 @@ static int nsslow_GetFIPSEnabled(void) {
 
 
 static int post = 0;
+static int post_failed = 0;
 
 static NSSLOWInitContext dummyContext = { 0 };
 
@@ -302,11 +303,16 @@ NSSLOW_Init(void)
 
     rv = FREEBL_InitStubs();
     nsprAvailable = (rv ==  SECSuccess ) ? PR_TRUE : PR_FALSE;
+
+    if (post_failed) {
+	return NULL;
+    }
 	
 
     if (!post && nsslow_GetFIPSEnabled()) {
 	crv = freebl_fipsPowerUpSelfTest();
 	if (crv != CKR_OK) {
+	    post_failed = 1;
 	    return NULL;
 	}
     }
@@ -323,12 +329,26 @@ NSSLOW_Shutdown(NSSLOWInitContext *context)
    return;
 }
 
+void
+NSSLOW_Reset(NSSLOWInitContext *context)
+{
+   PORT_Assert(context == &dummyContext);
+   post_failed = 0;
+   post = 0;
+   return;
+}
+
 NSSLOWHASHContext *
 NSSLOWHASH_NewContext(NSSLOWInitContext *initContext, 
 			HASH_HashType hashType)
 {
    NSSLOWHASHContext *context;
 
+   if (post_failed) {
+	PORT_SetError(SEC_ERROR_PKCS11_DEVICE_ERROR);
+	return NULL;
+   }
+
    if (initContext != &dummyContext) {
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	return (NULL);
diff --git a/security/nss/lib/freebl/nsslowhash.h b/security/nss/lib/freebl/nsslowhash.h
index 9d5400a77de..b8dbf2b7a69 100644
--- a/security/nss/lib/freebl/nsslowhash.h
+++ b/security/nss/lib/freebl/nsslowhash.h
@@ -45,6 +45,7 @@ typedef struct NSSLOWHASHContextStr NSSLOWHASHContext;
 
 NSSLOWInitContext *NSSLOW_Init(void);
 void NSSLOW_Shutdown(NSSLOWInitContext *context);
+void NSSLOW_Reset(NSSLOWInitContext *context);
 NSSLOWHASHContext *NSSLOWHASH_NewContext(
 			NSSLOWInitContext *initContext, 
 			HASH_HashType hashType);
diff --git a/security/nss/lib/freebl/stubs.c b/security/nss/lib/freebl/stubs.c
index bdacbee7172..e3f855baf6a 100644
--- a/security/nss/lib/freebl/stubs.c
+++ b/security/nss/lib/freebl/stubs.c
@@ -535,6 +535,14 @@ freebl_InitNSSUtil(void *lib)
 #define freebl_releaseLibrary(lib) \
     if (lib) dlclose(lib)
 
+static void * FREEBLnsprGlobalLib = NULL;
+static void * FREEBLnssutilGlobalLib = NULL;
+
+void __attribute ((destructor)) FREEBL_unload()
+{
+    freebl_releaseLibrary(FREEBLnsprGlobalLib);
+    freebl_releaseLibrary(FREEBLnssutilGlobalLib);
+}
 #endif
 
 /*
@@ -552,28 +560,30 @@ FREEBL_InitStubs()
     void *nssutil = NULL; 
 
     /* NSPR should be first */
-    if (!ptr_PR_DestroyLock) {
+    if (!FREEBLnsprGlobalLib) {
 	nspr = freebl_getLibrary(nsprLibName);
 	if (!nspr) {
 	    return SECFailure;
 	}
 	rv = freebl_InitNSPR(nspr);
-	freebl_releaseLibrary(nspr);
 	if (rv != SECSuccess) {
+	    freebl_releaseLibrary(nspr);
 	    return rv;
 	}
+	FREEBLnsprGlobalLib = nspr; /* adopt */
     }
     /* now load NSSUTIL */
-    if (!ptr_SECITEM_ZfreeItem_Util) {
+    if (!FREEBLnssutilGlobalLib) {
 	nssutil= freebl_getLibrary(nssutilLibName);
 	if (!nssutil) {
 	    return SECFailure;
 	}
 	rv = freebl_InitNSSUtil(nssutil);
-	freebl_releaseLibrary(nssutil);
 	if (rv != SECSuccess) {
+	    freebl_releaseLibrary(nssutil);
 	    return rv;
 	}
+	FREEBLnssutilGlobalLib = nssutil; /* adopt */
     }
 #endif
 
diff --git a/security/nss/lib/freebl/unix_rand.c b/security/nss/lib/freebl/unix_rand.c
index 28b523759e2..c8344b9b31b 100644
--- a/security/nss/lib/freebl/unix_rand.c
+++ b/security/nss/lib/freebl/unix_rand.c
@@ -629,44 +629,6 @@ GiveSystemInfo(void)
 }
 #endif /* sinix */
 
-#if defined(VMS)
-#include <c_asm.h>
-
-static void
-GiveSystemInfo(void)
-{
-    long si;
- 
-    /* 
-     * This is copied from the SCO/UNIXWARE etc section. And like the comment
-     * there says, what's the point? This isn't random, it generates the same
-     * stuff every time its run!
-     */
-    si = sysconf(_SC_CHILD_MAX);
-    RNG_RandomUpdate(&si, sizeof(si));
- 
-    si = sysconf(_SC_STREAM_MAX);
-    RNG_RandomUpdate(&si, sizeof(si));
- 
-    si = sysconf(_SC_OPEN_MAX);
-    RNG_RandomUpdate(&si, sizeof(si));
-}
- 
-/*
- * Use the "get the cycle counter" instruction on the alpha.
- * The low 32 bits completely turn over in less than a minute.
- * The high 32 bits are some non-counter gunk that changes sometimes.
- */
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    unsigned long t;
- 
-    t = asm("rpcc %v0");
-    return CopyLowBits(buf, maxbytes, &t, sizeof(t));
-}
- 
-#endif /* VMS */
 
 #ifdef BEOS
 #include <be/kernel/OS.h>
@@ -880,9 +842,6 @@ safe_pclose(FILE *fp)
     return status;
 }
 
-
-#if !defined(VMS)
-
 #ifdef DARWIN
 #include <crt_externs.h>
 #endif
@@ -1023,65 +982,6 @@ void RNG_SystemInfoForRNG(void)
 #endif
 
 }
-#else
-void RNG_SystemInfoForRNG(void)
-{
-    FILE *fp;
-    char buf[BUFSIZ];
-    size_t bytes;
-    int extra;
-    char **cp;
-    extern char **environ;
-    char *randfile;
- 
-    GiveSystemInfo();
- 
-    bytes = RNG_GetNoise(buf, sizeof(buf));
-    RNG_RandomUpdate(buf, bytes);
- 
-    /*
-     * Pass the C environment and the addresses of the pointers to the
-     * hash function. This makes the random number function depend on the
-     * execution environment of the user and on the platform the program
-     * is running on.
-     */
-    cp = environ;
-    while (*cp) {
-	RNG_RandomUpdate(*cp, strlen(*cp));
-	cp++;
-    }
-    RNG_RandomUpdate(environ, (char*)cp - (char*)environ);
- 
-    /* Give in system information */
-    if (gethostname(buf, sizeof(buf)) > 0) {
-	RNG_RandomUpdate(buf, strlen(buf));
-    }
-    GiveSystemInfo();
- 
-    /* If the user points us to a random file, pass it through the rng */
-    randfile = getenv("NSRANDFILE");
-    if ( ( randfile != NULL ) && ( randfile[0] != '\0') ) {
-	RNG_FileForRNG(randfile);
-    }
-
-    /*
-    ** We need to generate at least 1024 bytes of seed data. Since we don't
-    ** do the file stuff for VMS, and because the environ list is so short
-    ** on VMS, we need to make sure we generate enough. So do another 1000
-    ** bytes to be sure.
-    */
-    extra = 1000;
-    while (extra > 0) {
-        cp = environ;
-        while (*cp) {
-	    int n = strlen(*cp);
-	    RNG_RandomUpdate(*cp, n);
-	    extra -= n;
-	    cp++;
-        }
-    }
-}
-#endif
 
 #define TOTAL_FILE_LIMIT 1000000	/* one million */
 
diff --git a/security/nss/lib/freebl/win_rand.c b/security/nss/lib/freebl/win_rand.c
index 37eb1173735..184798817ec 100644
--- a/security/nss/lib/freebl/win_rand.c
+++ b/security/nss/lib/freebl/win_rand.c
@@ -58,6 +58,7 @@ static PRInt32  filesToRead;
 static DWORD    totalFileBytes;
 static DWORD    maxFileBytes	= 250000;	/* 250 thousand */
 static DWORD    dwNumFiles, dwReadEvery, dwFileToRead;
+static PRBool   usedWindowsPRNG;
 
 static BOOL
 CurrentClockTickTime(LPDWORD lpdwHigh, LPDWORD lpdwLow)
@@ -131,24 +132,25 @@ size_t RNG_GetNoise(void *buf, size_t maxbuf)
     return n;
 }
 
-typedef PRInt32 (* Handler)(const char *);
+typedef PRInt32 (* Handler)(const PRUnichar *);
 #define MAX_DEPTH 2
+#define MAX_FOLDERS 4
+#define MAX_FILES 1024
 
 static void
 EnumSystemFilesInFolder(Handler func, PRUnichar* szSysDir, int maxDepth) 
 {
     int                 iContinue;
+    unsigned int        uFolders  = 0;
+    unsigned int        uFiles    = 0;
     HANDLE              lFindHandle;
     WIN32_FIND_DATAW    fdData;
     PRUnichar           szFileName[_MAX_PATH];
-    char                narrowFileName[_MAX_PATH];
 
     if (maxDepth < 0)
     	return;
-    // tack *.* on the end so we actually look for files. this will
-    // not overflow
-    wcscpy(szFileName, szSysDir);
-    wcscat(szFileName, L"\\*.*");
+    // append *.* so we actually look for files.
+    _snwprintf(szFileName, _MAX_PATH, L"%s\\*.*", szSysDir);
 
     lFindHandle = FindFirstFileW(szFileName, &fdData);
     if (lFindHandle == INVALID_HANDLE_VALUE)
@@ -163,13 +165,10 @@ EnumSystemFilesInFolder(Handler func, PRUnichar* szSysDir, int maxDepth)
 	    _snwprintf(szFileName, _MAX_PATH, L"%s\\%s", szSysDir, 
 		       fdData.cFileName);
 	    if (fdData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-		EnumSystemFilesInFolder(func, szFileName, maxDepth - 1);
+		if (++uFolders <= MAX_FOLDERS)
+		    EnumSystemFilesInFolder(func, szFileName, maxDepth - 1);
 	    } else {
-		iContinue = WideCharToMultiByte(CP_ACP, 0, szFileName, -1, 
-						narrowFileName, _MAX_PATH, 
-						NULL, NULL);
-		if (iContinue)
-		    iContinue = !(*func)(narrowFileName);
+		iContinue = (++uFiles <= MAX_FILES) && !(*func)(szFileName);
 	    }
 	}
 	if (iContinue)
@@ -187,7 +186,6 @@ EnumSystemFiles(Handler func)
 	CSIDL_RECENT,
 #ifndef WINCE		     
 	CSIDL_INTERNET_CACHE, 
-	CSIDL_COMPUTERSNEARME, 
 	CSIDL_HISTORY,
 #endif
 	0
@@ -208,17 +206,16 @@ EnumSystemFiles(Handler func)
 }
 
 static PRInt32
-CountFiles(const char *file)
+CountFiles(const PRUnichar *file)
 {
     dwNumFiles++;
     return 0;
 }
 
-static void 
+static int
 ReadSingleFile(const char *filename)
 {
     PRFileDesc *    file;
-    int             nBytes;
     unsigned char   buffer[1024];
 
     file = PR_Open(filename, PR_RDONLY, 0);
@@ -227,27 +224,43 @@ ReadSingleFile(const char *filename)
 	    ;
         PR_Close(file);
     }
+    return (file != NULL);
 }
 
 static PRInt32
-ReadOneFile(const char *file)
+ReadOneFile(const PRUnichar *szFileName)
 {
+    char narrowFileName[_MAX_PATH];
+
     if (dwNumFiles == dwFileToRead) {
-	ReadSingleFile(file);
+	int success = WideCharToMultiByte(CP_ACP, 0, szFileName, -1, 
+					  narrowFileName, _MAX_PATH, 
+					  NULL, NULL);
+	if (success)
+	    success = ReadSingleFile(narrowFileName);
+    	if (!success)
+	    dwFileToRead++; /* couldn't read this one, read the next one. */
     }
     dwNumFiles++;
     return dwNumFiles > dwFileToRead;
 }
 
 static PRInt32
-ReadFiles(const char *file)
+ReadFiles(const PRUnichar *szFileName)
 {
+    char narrowFileName[_MAX_PATH];
+
     if ((dwNumFiles % dwReadEvery) == 0) {
 	++filesToRead;
     }
     if (filesToRead) {
-	DWORD    prevFileBytes = totalFileBytes;
-        RNG_FileForRNG(file);
+	DWORD prevFileBytes = totalFileBytes;
+	int   iContinue     = WideCharToMultiByte(CP_ACP, 0, szFileName, -1, 
+						  narrowFileName, _MAX_PATH, 
+						  NULL, NULL);
+	if (iContinue) {
+	    RNG_FileForRNG(narrowFileName);
+	}
 	if (prevFileBytes < totalFileBytes) {
 	    --filesToRead;
 	}
@@ -257,7 +270,7 @@ ReadFiles(const char *file)
 }
 
 static void
-ReadSystemFiles()
+ReadSystemFiles(void)
 {
     // first count the number of files
     dwNumFiles = 0;
@@ -277,6 +290,7 @@ ReadSystemFiles()
         dwReadEvery = 1;  // less than 10 files
 
     dwNumFiles = 0;
+    totalFileBytes = 0;
     EnumSystemFiles(ReadFiles);
 }
 
@@ -349,8 +363,9 @@ void RNG_SystemInfoForRNG(void)
     }
 #endif
 
-    // now let's do some files
-    ReadSystemFiles();
+    // Skip the potentially slow file scanning if the OS's PRNG worked.
+    if (!usedWindowsPRNG)
+	ReadSystemFiles();
 
     nBytes = RNG_GetNoise(buffer, 20);  // get up to 20 bytes
     RNG_RandomUpdate(buffer, nBytes);
@@ -410,8 +425,10 @@ void RNG_FileForRNG(const char *filename)
 size_t RNG_SystemRNG(void *dest, size_t maxLen)
 {
     size_t bytes = 0;
+    usedWindowsPRNG = PR_FALSE;
     if (CeGenRandom(maxLen, dest)) {
-	    bytes = maxLen;
+	bytes = maxLen;
+	usedWindowsPRNG = PR_TRUE;
     }
     if (bytes == 0) {
 	bytes = rng_systemFromNoise(dest,maxLen);
@@ -429,8 +446,6 @@ void RNG_FileForRNG(const char *filename)
     struct stat     stat_buf;
     unsigned char   buffer[1024];
 
-   /* static DWORD    totalFileBytes = 0; */
-
     /* windows doesn't initialize all the bytes in the stat buf,
      * so initialize them all here to avoid UMRs.
      */
@@ -516,6 +531,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
     HCRYPTPROV hCryptProv;
     size_t bytes = 0;
 
+    usedWindowsPRNG = PR_FALSE;
     hModule = LoadLibrary("advapi32.dll");
     if (hModule == NULL) {
 	return rng_systemFromNoise(dest,maxLen);
@@ -525,6 +541,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
     if (pRtlGenRandom) {
 	if (pRtlGenRandom(dest, maxLen)) {
 	    bytes = maxLen;
+	    usedWindowsPRNG = PR_TRUE;
 	} else {
 	    bytes = rng_systemFromNoise(dest,maxLen);
 	}
@@ -544,6 +561,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
 	PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
 	if (pCryptGenRandom(hCryptProv, maxLen, dest)) {
 	    bytes = maxLen;
+	    usedWindowsPRNG = PR_TRUE;
 	}
 	pCryptReleaseContext(hCryptProv, 0);
     }
diff --git a/security/nss/lib/jar/jarver.c b/security/nss/lib/jar/jarver.c
index 28e28178910..da83bcf40af 100644
--- a/security/nss/lib/jar/jarver.c
+++ b/security/nss/lib/jar/jarver.c
@@ -343,11 +343,11 @@ jar_parse_any(JAR *jar, int type, JAR_Signer *signer,
 
     /* skip over the preliminary section */
     /* This is one section at the top of the file with global metainfo */
-    while (raw_len) {
+    while (raw_len > 0) {
 	JAR_Metainfo *met;
 
 	raw_manifest = jar_eat_line(1, PR_TRUE, raw_manifest, &raw_len);
-	if (!*raw_manifest)
+	if (raw_len <= 0 || !*raw_manifest)
 	    break;
 
 	met = PORT_ZNew(JAR_Metainfo);
@@ -443,7 +443,7 @@ jar_parse_any(JAR *jar, int type, JAR_Signer *signer,
     }
 
     /* done with top section of global data */
-    while (raw_len) {
+    while (raw_len > 0) {
 	*x_md5 = 0;
 	*x_sha = 0;
 	*x_name = 0;
@@ -461,7 +461,7 @@ jar_parse_any(JAR *jar, int type, JAR_Signer *signer,
 	    } else
 		sec = raw_manifest;
 
-	    if (!PORT_Strncasecmp(sec, "Name:", 5)) {
+	    if (sec_len > 0 && !PORT_Strncasecmp(sec, "Name:", 5)) {
 		if (type == jarTypeMF)
 		    mfdig = jar_digest_section(sec, sec_len);
 		else
@@ -470,9 +470,9 @@ jar_parse_any(JAR *jar, int type, JAR_Signer *signer,
 	}
 
 
-	while (raw_len) {
+	while (raw_len > 0) {
 	    raw_manifest = jar_eat_line(1, PR_TRUE, raw_manifest, &raw_len);
-	    if (!*raw_manifest)
+	    if (raw_len <= 0 || !*raw_manifest)
 		break; /* blank line, done with this entry */
 
 	    if (PORT_Strlen(raw_manifest) >= SZ) {
@@ -747,53 +747,72 @@ loser:
 /*
  *  e a t _ l i n e
  *
- *  Consume an ASCII line from the top of a file kept in memory. 
- *  This destroys the file in place. 
+ * Reads and/or modifies input buffer "data" of length "*len".
+ * This function does zero, one or two of the following tasks:
+ * 1) if "lines" is non-zero, it reads and discards that many lines from
+ *    the input.  NUL characters are treated as end-of-line characters,
+ *    not as end-of-input characters.  The input is NOT NUL terminated.
+ *    Note: presently, all callers pass either 0 or 1 for lines.
+ * 2) After skipping the specified number of input lines, if "eating" is 
+ *    non-zero, it finds the end of the next line of input and replaces
+ *    the end of line character(s) with a NUL character.
+ *  This function modifies the input buffer, containing the file, in place. 
  *  This function handles PC, Mac, and Unix style text files.
+ *  On entry, *len contains the maximum number of characters that this
+ *  function should ever examine, starting with the character in *data.
+ *  On return, *len is reduced by the number of characters skipped by the
+ *  first task, if any;
+ *  If lines is zero and eating is false, this function returns
+ *  the value in the data argument, but otherwise does nothing.
  */
 static char *
 jar_eat_line(int lines, int eating, char *data, long *len)
 {
-    char *ret;
+    char *start = data;
+    long maxLen = *len;
 
-    ret = data;
-    if (!*len)
-	return ret;
+    if (maxLen <= 0)
+	return start;
+
+#define GO_ON ((data - start) < maxLen)
 
     /* Eat the requisite number of lines, if any;
-	 prior to terminating the current line with a 0. */
+       prior to terminating the current line with a 0. */
+    for (/* yip */ ; lines > 0; lines--) {
+	while (GO_ON && *data && *data != '\r' && *data != '\n')
+	    data++;
 
-    for (/* yip */ ; lines; lines--) {
-	while (*data && *data != '\n')
+	/* Eat any leading CR */
+	if (GO_ON && *data == '\r')
 	    data++;
 
 	/* After the CR, ok to eat one LF */
-	if (*data == '\n')
+	if (GO_ON && *data == '\n')
 	    data++;
 
-	/* If there are zeros, we put them there */
-	while (*data == 0 && data - ret < *len)
+	/* If there are NULs, this function probably put them there */
+	while (GO_ON && !*data)
 	    data++;
     }
-
-    *len -= data - ret;
-    ret = data;
-
-    if (eating) {
+    maxLen -= data - start;           /* we have this many characters left. */
+    *len  = maxLen;
+    start = data;                     /* now start again here.            */
+    if (maxLen > 0 && eating) {
 	/* Terminate this line with a 0 */
-	while (*data && *data != '\n' && *data != '\r')
+	while (GO_ON && *data && *data != '\n' && *data != '\r')
 	    data++;
 
-	/* In any case we are allowed to eat CR */
-	if (*data == '\r')
+	/* If not past the end, we are allowed to eat one CR */
+	if (GO_ON && *data == '\r')
 	    *data++ = 0;
 
-	/* After the CR, ok to eat one LF */
-	if (*data == '\n')
+	/* After the CR (if any), if not past the end, ok to eat one LF */
+	if (GO_ON && *data == '\n')
 	    *data++ = 0;
     }
-    return ret;
+    return start;
 }
+#undef GO_ON
 
 /*
  *  j a r _ d i g e s t _ s e c t i o n
@@ -811,9 +830,9 @@ jar_digest_section(char *manifest, long length)
     global_end = manifest;
     global_len = length;
 
-    while (global_len) {
+    while (global_len > 0) {
 	global_end = jar_eat_line(1, PR_FALSE, global_end, &global_len);
-	if (*global_end == 0 || *global_end == '\n')
+	if (global_len > 0 && (*global_end == 0 || *global_end == '\n'))
 	    break;
     }
     return JAR_calculate_digest (manifest, global_end - manifest);
diff --git a/security/nss/lib/libpkix/include/pkix_errorstrings.h b/security/nss/lib/libpkix/include/pkix_errorstrings.h
index 182f8493a7c..324e22761b0 100755
--- a/security/nss/lib/libpkix/include/pkix_errorstrings.h
+++ b/security/nss/lib/libpkix/include/pkix_errorstrings.h
@@ -142,7 +142,7 @@ PKIX_ERRORENTRY(CERTCHECKCRLFAILED,Fail to get crl cache issued by cert,0),
 PKIX_ERRORENTRY(CERTCHECKEXTENDEDKEYUSAGEFAILED,pkix_pl_Cert_CheckExtendedKeyUsage failed,0),
 PKIX_ERRORENTRY(CERTCHECKKEYUSAGEFAILED,CERT_CheckKeyUsage failed,SEC_ERROR_INADEQUATE_KEY_USAGE),
 PKIX_ERRORENTRY(CERTCHECKNAMECONSTRAINTSFAILED,PKIX_PL_Cert_CheckNameConstraints failed,0),
-PKIX_ERRORENTRY(CERTCHECKVALIDITYFAILED,PKIX_PL_Cert_CheckValidity failed,SEC_ERROR_CERT_NOT_VALID),
+PKIX_ERRORENTRY(CERTCHECKVALIDITYFAILED,PKIX_PL_Cert_CheckValidity failed,0),
 PKIX_ERRORENTRY(CERTCOMPLETECRLDECODEDENTRIESFAILED,CERT_CompleteCRLDecodedEntries failed,0),
 PKIX_ERRORENTRY(CERTCOPYNAMECONSTRAINTFAILED,CERT_CopyNameConstraint failed,0),
 PKIX_ERRORENTRY(CERTCOPYNAMEFAILED,CERT_CopyName failed,0),
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c
index 4b2fa91893a..3d1dc64cc9b 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c
@@ -274,6 +274,8 @@ pkix_pl_AIAMgr_GetHTTPCerts(
                 /* find or create httpClient = default client */
 		httpClient = SEC_GetRegisteredHttpClient();
 		aiaMgr->client.hdata.httpClient = httpClient;
+		if (!httpClient)
+		    PKIX_ERROR(PKIX_OUTOFMEMORY);
 
 		if (httpClient->version == 1) {
 
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crldp.c b/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crldp.c
index 3e88768a943..60cdd79d213 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crldp.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crldp.c
@@ -152,7 +152,7 @@ pkix_pl_CrlDp_Create(
             issuerName = certIssuerName;
         }
         rdnArena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
-        if (rdnArena) {
+        if (!rdnArena) {
             PKIX_ERROR(PKIX_PORTARENAALLOCFAILED);
         }
         issuerNameCopy = (CERTName *)PORT_ArenaZNew(rdnArena, CERTName*);
@@ -164,7 +164,7 @@ pkix_pl_CrlDp_Create(
             PKIX_ERROR(PKIX_ALLOCERROR);
         }
         rv = CERT_AddRDN(issuerNameCopy, (CERTRDN*)relName);
-        if (rv = SECFailure) {
+        if (rv == SECFailure) {
             PKIX_ERROR(PKIX_ALLOCERROR);
         }
         dpl->distPointType = relativeDistinguishedName;
diff --git a/security/nss/lib/nss/config.mk b/security/nss/lib/nss/config.mk
index 98e6802a496..e97ee7b9dbe 100644
--- a/security/nss/lib/nss/config.mk
+++ b/security/nss/lib/nss/config.mk
@@ -129,29 +129,6 @@ SHARED_LIBRARY_DIRS = \
 	../libpkix/pkix_pl_nss/module \
 	$(NULL)
 
-ifeq ($(OS_TARGET),SunOS)
-ifeq ($(BUILD_SUN_PKG), 1)
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-ifeq ($(USE_64), 1)
-MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
-else
-MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
-endif
-else
-MKSHLIB += -R '$$ORIGIN'
-endif
-endif
-
-ifeq ($(OS_ARCH), HP-UX) 
-ifneq ($(OS_TEST), ia64)
-# pa-risc
-ifeq ($(USE_64), 1)
-MKSHLIB += +b '$$ORIGIN'
-endif
-endif
-endif
-
 ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
 ifndef NS_USE_GCC
 # Export 'mktemp' to be backward compatible with NSS 3.2.x and 3.3.x
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index ecb12c30d06..d2347078b6d 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nss.h,v 1.66 2009/04/30 18:16:09 kaie%kuix.de Exp $ */
+/* $Id: nss.h,v 1.67 2009/07/20 20:06:57 nelson%bolyard.com Exp $ */
 
 #ifndef __nss_h_
 #define __nss_h_
@@ -66,7 +66,7 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.12.4.1" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION  "3.12.4.4" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   12
 #define NSS_VPATCH   4
diff --git a/security/nss/lib/nss/nssinit.c b/security/nss/lib/nss/nssinit.c
index ed41fce73fc..4522e882d44 100644
--- a/security/nss/lib/nss/nssinit.c
+++ b/security/nss/lib/nss/nssinit.c
@@ -36,9 +36,10 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nssinit.c,v 1.97 2008/08/22 01:33:03 wtc%google.com Exp $ */
+/* $Id: nssinit.c,v 1.98 2009/05/29 19:23:30 wtc%google.com Exp $ */
 
 #include <ctype.h>
+#include <string.h>
 #include "seccomon.h"
 #include "prinit.h"
 #include "prprf.h"
@@ -555,7 +556,11 @@ loser:
 				STAN_GetDefaultTrustDomain());
 	if ((!noModDB) && (!noCertDB) && (!noRootInit)) {
 	    if (!SECMOD_HasRootCerts()) {
-		nss_FindExternalRoot(configdir, secmodName);
+		const char *dbpath = configdir;
+		if (strncmp(dbpath, "sql:", 4) == 0) {
+		    dbpath += 4;
+		}
+		nss_FindExternalRoot(dbpath, secmodName);
 	    }
 	}
 	pk11sdr_Init();
diff --git a/security/nss/lib/pk11wrap/pk11auth.c b/security/nss/lib/pk11wrap/pk11auth.c
index c957d1b4663..23e55e374a5 100644
--- a/security/nss/lib/pk11wrap/pk11auth.c
+++ b/security/nss/lib/pk11wrap/pk11auth.c
@@ -630,7 +630,7 @@ PK11_DoPassword(PK11SlotInfo *slot, PRBool loadCerts, void *wincx)
 void PK11_LogoutAll(void)
 {
     SECMODListLock *lock = SECMOD_GetDefaultModuleListLock();
-    SECMODModuleList *modList = SECMOD_GetDefaultModuleList();
+    SECMODModuleList *modList;
     SECMODModuleList *mlp = NULL;
     int i;
 
@@ -640,6 +640,7 @@ void PK11_LogoutAll(void)
     }
 
     SECMOD_GetReadLock(lock);
+    modList = SECMOD_GetDefaultModuleList();
     /* find the number of entries */
     for (mlp = modList; mlp != NULL; mlp = mlp->next) {
 	for (i=0; i < mlp->module->slotCount; i++) {
diff --git a/security/nss/lib/pk11wrap/pk11sdr.h b/security/nss/lib/pk11wrap/pk11sdr.h
index 488bd7d995e..02e769a705a 100644
--- a/security/nss/lib/pk11wrap/pk11sdr.h
+++ b/security/nss/lib/pk11wrap/pk11sdr.h
@@ -43,13 +43,14 @@ SEC_BEGIN_PROTOS
 
 /*
  * PK11SDR_Encrypt - encrypt data using the specified key id or SDR default
- *
+ * result should be freed with SECItem_ZfreeItem
  */
 SECStatus
 PK11SDR_Encrypt(SECItem *keyid, SECItem *data, SECItem *result, void *cx);
 
 /*
  * PK11SDR_Decrypt - decrypt data previously encrypted with PK11SDR_Encrypt
+ * result should be freed with SECItem_ZfreeItem
  */
 SECStatus
 PK11SDR_Decrypt(SECItem *data, SECItem *result, void *cx);
diff --git a/security/nss/lib/pk11wrap/pk11skey.c b/security/nss/lib/pk11wrap/pk11skey.c
index 7f80a068093..acf65aceb90 100644
--- a/security/nss/lib/pk11wrap/pk11skey.c
+++ b/security/nss/lib/pk11wrap/pk11skey.c
@@ -50,6 +50,7 @@
 #include "secitem.h"
 #include "secoid.h"
 #include "secerr.h"
+#include "hasht.h"
 
 /* forward static declarations. */
 static PK11SymKey *pk11_DeriveWithTemplate(PK11SymKey *baseKey, 
@@ -678,6 +679,26 @@ __PK11_GetKeyData(PK11SymKey *symKey)
     return PK11_GetKeyData(symKey);
 }
 
+
+/*
+ * PKCS #11 key Types with predefined length
+ */
+unsigned int
+pk11_GetPredefinedKeyLength(CK_KEY_TYPE keyType)
+{
+    int length = 0;
+    switch (keyType) {
+      case CKK_DES: length = 8; break;
+      case CKK_DES2: length = 16; break;
+      case CKK_DES3: length = 24; break;
+      case CKK_SKIPJACK: length = 10; break;
+      case CKK_BATON: length = 20; break;
+      case CKK_JUNIPER: length = 20; break;
+      default: break;
+    }
+    return length;
+}
+
 /* return the keylength if possible.  '0' if not */
 unsigned int
 PK11_GetKeyLength(PK11SymKey *key)
@@ -688,20 +709,12 @@ PK11_GetKeyLength(PK11SymKey *key)
 
     /* First try to figure out the key length from its type */
     keyType = PK11_ReadULongAttribute(key->slot,key->objectID,CKA_KEY_TYPE);
-    switch (keyType) {
-      case CKK_DES: key->size = 8; break;
-      case CKK_DES2: key->size = 16; break;
-      case CKK_DES3: key->size = 24; break;
-      case CKK_SKIPJACK: key->size = 10; break;
-      case CKK_BATON: key->size = 20; break;
-      case CKK_JUNIPER: key->size = 20; break;
-      case CKK_GENERIC_SECRET:
-	if (key->type == CKM_SSL3_PRE_MASTER_KEY_GEN)  {
-	    key->size=48;
-	}
-	break;
-      default: break;
+    key->size = pk11_GetPredefinedKeyLength(keyType);
+    if ((keyType == CKK_GENERIC_SECRET) &&
+	(key->type == CKM_SSL3_PRE_MASTER_KEY_GEN))  {
+	key->size=48;
     }
+
    if( key->size != 0 ) return key->size;
 
    if (key->data.data == NULL) {
@@ -1636,7 +1649,6 @@ PK11_PubDerive(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey,
 	    int templateCount;
 	    CK_ATTRIBUTE *attrs = keyTemplate;
 	    CK_ECDH1_DERIVE_PARAMS *mechParams = NULL;
-	    SECItem *pubValue = NULL;
 
 	    if (pubKey->keyType != ecKey) {
 		PORT_SetError(SEC_ERROR_BAD_KEY);
@@ -1655,28 +1667,23 @@ PK11_PubDerive(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey,
 
 	    keyType = PK11_GetKeyType(target,keySize);
 	    key_size = keySize;
-	    symKey->size = keySize;
-	    if (key_size == 0) templateCount--;
+	    if (key_size == 0) {
+		if (pk11_GetPredefinedKeyLength(keyType)) {
+		    templateCount --;
+		} else {
+		    /* sigh, some tokens can't figure this out and require
+		     * CKA_VALUE_LEN to be set */
+		    key_size = SHA1_LENGTH;
+		}
+	    }
+	    symKey->size = key_size;
 
 	    mechParams = PORT_ZNew(CK_ECDH1_DERIVE_PARAMS); 
 	    mechParams->kdf = CKD_SHA1_KDF;
 	    mechParams->ulSharedDataLen = 0;
 	    mechParams->pSharedData = NULL;
-
-	    if (PR_GetEnv("NSS_USE_DECODED_CKA_EC_POINT")) {
-		mechParams->ulPublicDataLen =  pubKey->u.ec.publicValue.len;
-		mechParams->pPublicData =  pubKey->u.ec.publicValue.data;
-	    } else {
-		pubValue = SEC_ASN1EncodeItem(NULL, NULL,
-			&pubKey->u.ec.publicValue,
-			SEC_ASN1_GET(SEC_OctetStringTemplate));
-		if (pubValue == NULL) {
-	    	    PORT_ZFree(mechParams, sizeof(CK_ECDH1_DERIVE_PARAMS));
-		    break;
-		}
-		mechParams->ulPublicDataLen =  pubValue->len;
-		mechParams->pPublicData =  pubValue->data;
-	    }
+	    mechParams->ulPublicDataLen =  pubKey->u.ec.publicValue.len;
+	    mechParams->pPublicData =  pubKey->u.ec.publicValue.data;
 
 	    mechanism.mechanism = derive;
 	    mechanism.pParameter = mechParams;
@@ -1688,9 +1695,28 @@ PK11_PubDerive(SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey,
 		templateCount, &symKey->objectID);
 	    pk11_ExitKeyMonitor(symKey);
 
-	    if (pubValue) {
+	    /* old PKCS #11 spec was ambiguous on what needed to be passed,
+	     * try this again with and encoded public key */
+	    if (crv != CKR_OK) {
+		SECItem *pubValue = SEC_ASN1EncodeItem(NULL, NULL,
+			&pubKey->u.ec.publicValue,
+			SEC_ASN1_GET(SEC_OctetStringTemplate));
+		if (pubValue == NULL) {
+	    	    PORT_ZFree(mechParams, sizeof(CK_ECDH1_DERIVE_PARAMS));
+		    break;
+		}
+		mechParams->ulPublicDataLen =  pubValue->len;
+		mechParams->pPublicData =  pubValue->data;
+
+		pk11_EnterKeyMonitor(symKey);
+		crv = PK11_GETTAB(slot)->C_DeriveKey(symKey->session, 
+		    &mechanism, privKey->pkcs11ID, keyTemplate, 
+		    templateCount, &symKey->objectID);
+		pk11_ExitKeyMonitor(symKey);
+
 		SECITEM_FreeItem(pubValue,PR_TRUE);
 	    }
+
 	    PORT_ZFree(mechParams, sizeof(CK_ECDH1_DERIVE_PARAMS));
 
 	    if (crv == CKR_OK) return symKey;
@@ -1722,7 +1748,6 @@ pk11_PubDeriveECKeyWithKDF(
     int                     templateCount;
     CK_ATTRIBUTE           *attrs           = keyTemplate;
     CK_ECDH1_DERIVE_PARAMS *mechParams      = NULL;
-    SECItem *pubValue = NULL;
 
     if (pubKey->keyType != ecKey) {
 	PORT_SetError(SEC_ERROR_BAD_KEY);
@@ -1750,9 +1775,27 @@ pk11_PubDeriveECKeyWithKDF(
 
     keyType = PK11_GetKeyType(target,keySize);
     key_size = keySize;
-    symKey->size = keySize;
-    if (key_size == 0) 
-    	templateCount--;
+    if (key_size == 0) {
+	if (pk11_GetPredefinedKeyLength(keyType)) {
+	    templateCount --;
+	} else {
+	    /* sigh, some tokens can't figure this out and require
+	     * CKA_VALUE_LEN to be set */
+	    switch (kdf) {
+	    case CKD_NULL:
+		key_size = (pubKey->u.ec.publicValue.len-1)/2;
+		break;
+	    case CKD_SHA1_KDF:
+		key_size = SHA1_LENGTH;
+		break;
+	    default:
+		PORT_Assert(!"Invalid CKD");
+		PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
+		return NULL;
+	    }
+	}
+    }
+    symKey->size = key_size;
 
     mechParams = PORT_ZNew(CK_ECDH1_DERIVE_PARAMS);
     if (!mechParams) {
@@ -1767,21 +1810,8 @@ pk11_PubDeriveECKeyWithKDF(
 	mechParams->ulSharedDataLen = sharedData->len;
 	mechParams->pSharedData     = sharedData->data;
     }
-    if (PR_GetEnv("NSS_USE_DECODED_CKA_EC_POINT")) {
-	mechParams->ulPublicDataLen =  pubKey->u.ec.publicValue.len;
-	mechParams->pPublicData =  pubKey->u.ec.publicValue.data;
-    } else {
-	pubValue = SEC_ASN1EncodeItem(NULL, NULL,
-		&pubKey->u.ec.publicValue,
-		SEC_ASN1_GET(SEC_OctetStringTemplate));
-	if (pubValue == NULL) {
-    	    PORT_ZFree(mechParams, sizeof(CK_ECDH1_DERIVE_PARAMS));
-	    PK11_FreeSymKey(symKey);
-	    return NULL;
-	}
-	mechParams->ulPublicDataLen =  pubValue->len;
-	mechParams->pPublicData =  pubValue->data;
-    }
+    mechParams->ulPublicDataLen =  pubKey->u.ec.publicValue.len;
+    mechParams->pPublicData =  pubKey->u.ec.publicValue.data;
 
     mechanism.mechanism      = derive;
     mechanism.pParameter     = mechParams;
@@ -1792,11 +1822,30 @@ pk11_PubDeriveECKeyWithKDF(
     	privKey->pkcs11ID, keyTemplate, templateCount, &symKey->objectID);
     pk11_ExitKeyMonitor(symKey);
 
-    PORT_ZFree(mechParams, sizeof(CK_ECDH1_DERIVE_PARAMS));
-    if (pubValue) {
+    /* old PKCS #11 spec was ambiguous on what needed to be passed,
+     * try this again with and encoded public key */
+    if (crv != CKR_OK) {
+	SECItem *pubValue = SEC_ASN1EncodeItem(NULL, NULL,
+		&pubKey->u.ec.publicValue,
+		SEC_ASN1_GET(SEC_OctetStringTemplate));
+	if (pubValue == NULL) {
+	    goto loser;
+	}
+	mechParams->ulPublicDataLen =  pubValue->len;
+	mechParams->pPublicData =  pubValue->data;
+
+	pk11_EnterKeyMonitor(symKey);
+	crv = PK11_GETTAB(slot)->C_DeriveKey(symKey->session, 
+	    &mechanism, privKey->pkcs11ID, keyTemplate, 
+	    templateCount, &symKey->objectID);
+	pk11_ExitKeyMonitor(symKey);
+
 	SECITEM_FreeItem(pubValue,PR_TRUE);
     }
 
+loser:
+    PORT_ZFree(mechParams, sizeof(CK_ECDH1_DERIVE_PARAMS));
+
     if (crv != CKR_OK) {
 	PK11_FreeSymKey(symKey);
 	symKey = NULL;
diff --git a/security/nss/lib/pk11wrap/pk11slot.c b/security/nss/lib/pk11wrap/pk11slot.c
index a954c9d87f5..6e8f69eb09d 100644
--- a/security/nss/lib/pk11wrap/pk11slot.c
+++ b/security/nss/lib/pk11wrap/pk11slot.c
@@ -482,13 +482,19 @@ PRBool
 SECMOD_HasRootCerts(void)
 {
    SECMODModuleList *mlp;
-   SECMODModuleList *modules = SECMOD_GetDefaultModuleList();
+   SECMODModuleList *modules;
    SECMODListLock *moduleLock = SECMOD_GetDefaultModuleListLock();
    int i;
    PRBool found = PR_FALSE;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return found;
+    }
+
    /* work through all the slots */
    SECMOD_GetReadLock(moduleLock);
+   modules = SECMOD_GetDefaultModuleList();
    for(mlp = modules; mlp != NULL; mlp = mlp->next) {
 	for (i=0; i < mlp->module->slotCount; i++) {
 	    PK11SlotInfo *tmpSlot = mlp->module->slots[i];
@@ -514,17 +520,22 @@ PK11_FindSlotsByNames(const char *dllName, const char* slotName,
                         const char* tokenName, PRBool presentOnly)
 {
     SECMODModuleList *mlp;
-    SECMODModuleList *modules = SECMOD_GetDefaultModuleList();
+    SECMODModuleList *modules;
     SECMODListLock *moduleLock = SECMOD_GetDefaultModuleListLock();
     int i;
     PK11SlotList* slotList = NULL;
     PRUint32 slotcount = 0;
     SECStatus rv = SECSuccess;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return slotList;
+    }
+
     slotList = PK11_NewSlotList();
     if (!slotList) {
         PORT_SetError(SEC_ERROR_NO_MEMORY);
-        return NULL;
+        return slotList;
     }
 
     if ( ((NULL == dllName) || (0 == *dllName)) &&
@@ -537,6 +548,7 @@ PK11_FindSlotsByNames(const char *dllName, const char* slotName,
 
     /* work through all the slots */
     SECMOD_GetReadLock(moduleLock);
+    modules = SECMOD_GetDefaultModuleList();
     for (mlp = modules; mlp != NULL; mlp = mlp->next) {
         PORT_Assert(mlp->module);
         if (!mlp->module) {
@@ -584,17 +596,22 @@ PK11SlotInfo *
 PK11_FindSlotByName(const char *name)
 {
    SECMODModuleList *mlp;
-   SECMODModuleList *modules = SECMOD_GetDefaultModuleList();
+   SECMODModuleList *modules;
    SECMODListLock *moduleLock = SECMOD_GetDefaultModuleListLock();
    int i;
    PK11SlotInfo *slot = NULL;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return slot;
+    }
    if ((name == NULL) || (*name == 0)) {
 	return PK11_GetInternalKeySlot();
    }
 
    /* work through all the slots */
    SECMOD_GetReadLock(moduleLock);
+   modules = SECMOD_GetDefaultModuleList();
    for(mlp = modules; mlp != NULL; mlp = mlp->next) {
 	for (i=0; i < mlp->module->slotCount; i++) {
 	    PK11SlotInfo *tmpSlot = mlp->module->slots[i];
@@ -621,13 +638,18 @@ PK11SlotInfo *
 PK11_FindSlotBySerial(char *serial)
 {
    SECMODModuleList *mlp;
-   SECMODModuleList *modules = SECMOD_GetDefaultModuleList();
+   SECMODModuleList *modules;
    SECMODListLock *moduleLock = SECMOD_GetDefaultModuleListLock();
    int i;
    PK11SlotInfo *slot = NULL;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return slot;
+    }
    /* work through all the slots */
    SECMOD_GetReadLock(moduleLock);
+   modules = SECMOD_GetDefaultModuleList();
    for(mlp = modules; mlp != NULL; mlp = mlp->next) {
 	for (i=0; i < mlp->module->slotCount; i++) {
 	    PK11SlotInfo *tmpSlot = mlp->module->slots[i];
@@ -1722,12 +1744,16 @@ PRBool
 PK11_TokenExists(CK_MECHANISM_TYPE type)
 {
     SECMODModuleList *mlp;
-    SECMODModuleList *modules = SECMOD_GetDefaultModuleList();
+    SECMODModuleList *modules;
     SECMODListLock *moduleLock = SECMOD_GetDefaultModuleListLock();
     PK11SlotInfo *slot;
     PRBool found = PR_FALSE;
     int i;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return found;
+    }
     /* we only need to know if there is a token that does this mechanism.
      * check the internal module first because it's fast, and supports 
      * almost everything. */
@@ -1739,6 +1765,7 @@ PK11_TokenExists(CK_MECHANISM_TYPE type)
     if (found) return PR_TRUE; /* bypass getting module locks */
 
     SECMOD_GetReadLock(moduleLock);
+    modules = SECMOD_GetDefaultModuleList();
     for(mlp = modules; mlp != NULL && (!found); mlp = mlp->next) {
 	for (i=0; i < mlp->module->slotCount; i++) {
 	    slot = mlp->module->slots[i];
@@ -1764,18 +1791,27 @@ PK11SlotList *
 PK11_GetAllTokens(CK_MECHANISM_TYPE type, PRBool needRW, PRBool loadCerts, 
                   void *wincx)
 {
-    PK11SlotList *     list         = PK11_NewSlotList();
-    PK11SlotList *     loginList    = PK11_NewSlotList();
-    PK11SlotList *     friendlyList = PK11_NewSlotList();
+    PK11SlotList *     list;
+    PK11SlotList *     loginList;
+    PK11SlotList *     friendlyList;
     SECMODModuleList * mlp;
-    SECMODModuleList * modules      = SECMOD_GetDefaultModuleList();
-    SECMODListLock *   moduleLock   = SECMOD_GetDefaultModuleListLock();
+    SECMODModuleList * modules;
+    SECMODListLock *   moduleLock;
     int                i;
 #if defined( XP_WIN32 ) 
     int                j            = 0;
     PRInt32            waste[16];
 #endif
 
+    moduleLock   = SECMOD_GetDefaultModuleListLock();
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return NULL;
+    }
+
+    list         = PK11_NewSlotList();
+    loginList    = PK11_NewSlotList();
+    friendlyList = PK11_NewSlotList();
     if ((list == NULL)  || (loginList == NULL) || (friendlyList == NULL)) {
 	if (list) PK11_FreeSlotList(list);
 	if (loginList) PK11_FreeSlotList(loginList);
@@ -1784,6 +1820,8 @@ PK11_GetAllTokens(CK_MECHANISM_TYPE type, PRBool needRW, PRBool loadCerts,
     }
 
     SECMOD_GetReadLock(moduleLock);
+
+    modules      = SECMOD_GetDefaultModuleList();
     for(mlp = modules; mlp != NULL; mlp = mlp->next) {
 
 #if defined( XP_WIN32 ) 
diff --git a/security/nss/lib/pk11wrap/pk11util.c b/security/nss/lib/pk11wrap/pk11util.c
index e4edaf2e677..7cc5cc91224 100644
--- a/security/nss/lib/pk11wrap/pk11util.c
+++ b/security/nss/lib/pk11wrap/pk11util.c
@@ -223,6 +223,10 @@ SECMOD_FindModule(const char *name)
     SECMODModuleList *mlp;
     SECMODModule *module = NULL;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return module;
+    }
     SECMOD_GetReadLock(moduleLock);
     for(mlp = modules; mlp != NULL; mlp = mlp->next) {
 	if (PORT_Strcmp(name,mlp->module->commonName) == 0) {
@@ -258,6 +262,10 @@ SECMOD_FindModuleByID(SECMODModuleID id)
     SECMODModuleList *mlp;
     SECMODModule *module = NULL;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return module;
+    }
     SECMOD_GetReadLock(moduleLock);
     for(mlp = modules; mlp != NULL; mlp = mlp->next) {
 	if (id == mlp->module->moduleID) {
@@ -282,6 +290,10 @@ SECMOD_FindSlotByID(SECMODModule *module, CK_SLOT_ID slotID)
     int i;
     PK11SlotInfo *slot = NULL;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return slot;
+    }
     SECMOD_GetReadLock(moduleLock);
     for (i=0; i < module->slotCount; i++) {
 	PK11SlotInfo *cSlot = module->slots[i];
@@ -329,6 +341,11 @@ SECMOD_DeleteModuleEx(const char *name, SECMODModule *mod,
     SECMODModuleList **mlpp;
     SECStatus rv = SECFailure;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return rv;
+    }
+
     *type = SECMOD_EXTERNAL;
 
     SECMOD_GetWriteLock(moduleLock);
@@ -405,6 +422,10 @@ SECMOD_DeleteInternalModule(const char *name)
 	PORT_SetError(SEC_ERROR_MODULE_STUCK);
 	return rv;
     }
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return rv;
+    }
 
     SECMOD_GetWriteLock(moduleLock);
     for(mlpp = &modules,mlp = modules; 
@@ -508,6 +529,10 @@ SECMOD_FindSlot(SECMODModule *module,const char *name)
     char *string;
     PK11SlotInfo *retSlot = NULL;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return retSlot;
+    }
     SECMOD_GetReadLock(moduleLock);
     for (i=0; i < module->slotCount; i++) {
 	PK11SlotInfo *slot = module->slots[i];
@@ -574,6 +599,10 @@ SECMOD_AddNewModuleEx(const char* moduleName, const char* dllPath,
     PK11SlotInfo* slot;
 
     PR_SetErrorText(0, NULL);
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return result;
+    }
 
     module = SECMOD_CreateModule(dllPath, moduleName, modparms, nssparms);
 
@@ -693,10 +722,14 @@ PRBool
 SECMOD_IsModulePresent( unsigned long int pubCipherEnableFlags )
 {
     PRBool result = PR_FALSE;
-    SECMODModuleList *mods = SECMOD_GetDefaultModuleList();
+    SECMODModuleList *mods;
+
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return result;
+    }
     SECMOD_GetReadLock(moduleLock);
-
-
+    mods = SECMOD_GetDefaultModuleList();
     for ( ; mods != NULL; mods = mods->next) {
         if (mods->module->ssl[0] & 
 		SECMOD_PubCipherFlagstoInternal(pubCipherEnableFlags)) {
@@ -867,6 +900,11 @@ SECMOD_UpdateSlotList(SECMODModule *mod)
     PK11SlotInfo **newSlots = NULL;
     PK11SlotInfo **oldSlots = NULL;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return SECFailure;
+    }
+
     /* C_GetSlotList is not a session function, make sure 
      * calls are serialized */
     PZ_Lock(mod->refLock);
@@ -988,6 +1026,10 @@ secmod_HandleWaitForSlotEvent(SECMODModule *mod,  unsigned long flags,
     int i;
     int error = SEC_ERROR_NO_EVENT;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return NULL;
+    }
     PZ_Lock(mod->refLock);
     if (mod->evControlMask & SECMOD_END_WAIT) {
 	mod->evControlMask &= ~SECMOD_END_WAIT;
@@ -1184,6 +1226,10 @@ SECMOD_HasRemovableSlots(SECMODModule *mod)
     int i;
     PRBool ret = PR_FALSE;
 
+    if (!moduleLock) {
+    	PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
+	return ret;
+    }
     SECMOD_GetReadLock(moduleLock);
     for (i=0; i < mod->slotCount; i++) {
 	PK11SlotInfo *slot = mod->slots[i];
diff --git a/security/nss/lib/pkcs12/p12d.c b/security/nss/lib/pkcs12/p12d.c
index 75afb500097..408bd8f704f 100644
--- a/security/nss/lib/pkcs12/p12d.c
+++ b/security/nss/lib/pkcs12/p12d.c
@@ -2407,7 +2407,10 @@ sec_pkcs12_add_cert(sec_PKCS12SafeBag *cert, PRBool keyExists, void *wincx)
 	rv = PK11_ImportDERCert(cert->slot, derCert, CK_INVALID_HANDLE,
 							nickData, PR_FALSE);
     }
-
+    if (rv) {
+	cert->problem = 1;
+	cert->error = PORT_GetError();
+    }
     cert->installed = PR_TRUE;
     if(nickName) SECITEM_ZfreeItem(nickName, PR_TRUE);
     return rv;
diff --git a/security/nss/lib/smime/config.mk b/security/nss/lib/smime/config.mk
index 7d0629a4720..f3af755d22f 100644
--- a/security/nss/lib/smime/config.mk
+++ b/security/nss/lib/smime/config.mk
@@ -93,18 +93,3 @@ SHARED_LIBRARY_DIRS = \
 	../pkcs7 \
 	$(NULL)
 
-ifeq ($(OS_TARGET),SunOS)
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
-endif
-
-ifeq ($(OS_ARCH), HP-UX) 
-ifneq ($(OS_TEST), ia64)
-# pa-risc
-ifeq ($(USE_64), 1)
-MKSHLIB += +b '$$ORIGIN'
-endif
-endif
-endif
-
diff --git a/security/nss/lib/softoken/config.mk b/security/nss/lib/softoken/config.mk
index 9c1e4bcf902..c434af286ba 100644
--- a/security/nss/lib/softoken/config.mk
+++ b/security/nss/lib/softoken/config.mk
@@ -96,21 +96,9 @@ OS_LIBS += -lpthread
 endif
 
 ifeq ($(OS_TARGET),SunOS)
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
 OS_LIBS += -lbsm 
 endif
 
-ifeq ($(OS_ARCH), HP-UX) 
-ifneq ($(OS_TEST), ia64)
-# pa-risc
-ifeq ($(USE_64), 1)
-MKSHLIB += +b '$$ORIGIN'
-endif
-endif
-endif
-
 ifeq ($(OS_TARGET),WINCE)
 DEFINES += -DDBM_USING_NSPR
 endif
diff --git a/security/nss/lib/softoken/fipstest.c b/security/nss/lib/softoken/fipstest.c
index f5f726139a9..a9ca120a21c 100644
--- a/security/nss/lib/softoken/fipstest.c
+++ b/security/nss/lib/softoken/fipstest.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: fipstest.c,v 1.25 2009/03/29 03:45:34 wtc%google.com Exp $ */
+/* $Id: fipstest.c,v 1.27 2009/06/19 23:05:48 rrelyea%redhat.com Exp $ */
 
 #include "softoken.h"   /* Required for RC2-ECB, RC2-CBC, RC4, DES-ECB,  */
                         /*              DES-CBC, DES3-ECB, DES3-CBC, RSA */
@@ -90,17 +90,17 @@
 #define FIPS_RSA_TYPE                           siBuffer
 #define FIPS_RSA_PUBLIC_EXPONENT_LENGTH           3 /*   24-bits */
 #define FIPS_RSA_PRIVATE_VERSION_LENGTH           1 /*    8-bits */
-#define FIPS_RSA_MESSAGE_LENGTH                 128 /* 1024-bits */
-#define FIPS_RSA_COEFFICIENT_LENGTH              64 /*  512-bits */
-#define FIPS_RSA_PRIME0_LENGTH                   64 /*  512-bits */
-#define FIPS_RSA_PRIME1_LENGTH                   64 /*  512-bits */
-#define FIPS_RSA_EXPONENT0_LENGTH                64 /*  512-bits */
-#define FIPS_RSA_EXPONENT1_LENGTH                64 /*  512-bits */
-#define FIPS_RSA_PRIVATE_EXPONENT_LENGTH        128 /* 1024-bits */
-#define FIPS_RSA_ENCRYPT_LENGTH                 128 /* 1024-bits */
-#define FIPS_RSA_DECRYPT_LENGTH                 128 /* 1024-bits */
-#define FIPS_RSA_SIGNATURE_LENGTH               128 /* 1024-bits */
-#define FIPS_RSA_MODULUS_LENGTH                 128 /* 1024-bits */
+#define FIPS_RSA_MESSAGE_LENGTH                 256 /* 2048-bits */
+#define FIPS_RSA_COEFFICIENT_LENGTH             128 /* 1024-bits */
+#define FIPS_RSA_PRIME0_LENGTH                  128 /* 1024-bits */
+#define FIPS_RSA_PRIME1_LENGTH                  128 /* 1024-bits */
+#define FIPS_RSA_EXPONENT0_LENGTH               128 /* 1024-bits */
+#define FIPS_RSA_EXPONENT1_LENGTH               128 /* 1024-bits */
+#define FIPS_RSA_PRIVATE_EXPONENT_LENGTH        256 /* 2048-bits */
+#define FIPS_RSA_ENCRYPT_LENGTH                 256 /* 2048-bits */
+#define FIPS_RSA_DECRYPT_LENGTH                 256 /* 2048-bits */
+#define FIPS_RSA_SIGNATURE_LENGTH               256 /* 2048-bits */
+#define FIPS_RSA_MODULUS_LENGTH                 256 /* 2048-bits */
 
 
 /* FIPS preprocessor directives for DSA.                        */
@@ -1149,202 +1149,323 @@ loser:
 static CK_RV
 sftk_fips_RSA_PowerUpSelfTest( void )
 {
-    /* RSA Known Modulus used in both Public/Private Key Values (1024-bits). */
+    /* RSA Known Modulus used in both Public/Private Key Values (2048-bits). */
     static const PRUint8 rsa_modulus[FIPS_RSA_MODULUS_LENGTH] = {
-                               0xd5, 0x84, 0x95, 0x07, 0xf4, 0xd0, 0x1f, 0x82,
-                               0xf3, 0x79, 0xf4, 0x99, 0x48, 0x10, 0xe1, 0x71,
-                               0xa5, 0x62, 0x22, 0xa3, 0x4b, 0x00, 0xe3, 0x5b,
-                               0x3a, 0xcc, 0x10, 0x83, 0xe0, 0xaf, 0x61, 0x13,
-                               0x54, 0x6a, 0xa2, 0x6a, 0x2c, 0x5e, 0xb3, 0xcc,
-                               0xa3, 0x71, 0x9a, 0xb2, 0x3e, 0x78, 0xec, 0xb5,
-                               0x0e, 0x6e, 0x31, 0x3b, 0x77, 0x1f, 0x6e, 0x94,
-                               0x41, 0x60, 0xd5, 0x6e, 0xd9, 0xc6, 0xf9, 0x29,
-                               0xc3, 0x40, 0x36, 0x25, 0xdb, 0xea, 0x0b, 0x07,
-                               0xae, 0x76, 0xfd, 0x99, 0x29, 0xf4, 0x22, 0xc1,
-                               0x1a, 0x8f, 0x05, 0xfe, 0x98, 0x09, 0x07, 0x05,
-                               0xc2, 0x0f, 0x0b, 0x11, 0x83, 0x39, 0xca, 0xc7,
-                               0x43, 0x63, 0xff, 0x33, 0x80, 0xe7, 0xc3, 0x78,
-                               0xae, 0xf1, 0x73, 0x52, 0x98, 0x1d, 0xde, 0x5c,
-                               0x53, 0x6e, 0x01, 0x73, 0x0d, 0x12, 0x7e, 0x77,
-                               0x03, 0xf1, 0xef, 0x1b, 0xc8, 0xa8, 0x0f, 0x97};
+                            0xb8, 0x15, 0x00, 0x33, 0xda, 0x0c, 0x9d, 0xa5,
+                            0x14, 0x8c, 0xde, 0x1f, 0x23, 0x07, 0x54, 0xe2,
+                            0xc6, 0xb9, 0x51, 0x04, 0xc9, 0x65, 0x24, 0x6e,
+                            0x0a, 0x46, 0x34, 0x5c, 0x37, 0x86, 0x6b, 0x88,
+                            0x24, 0x27, 0xac, 0xa5, 0x02, 0x79, 0xfb, 0xed,
+                            0x75, 0xc5, 0x3f, 0x6e, 0xdf, 0x05, 0x5f, 0x0f,
+                            0x20, 0x70, 0xa0, 0x5b, 0x85, 0xdb, 0xac, 0xb9,
+                            0x5f, 0x02, 0xc2, 0x64, 0x1e, 0x84, 0x5b, 0x3e,
+                            0xad, 0xbf, 0xf6, 0x2e, 0x51, 0xd6, 0xad, 0xf7,
+                            0xa7, 0x86, 0x75, 0x86, 0xec, 0xa7, 0xe1, 0xf7,
+                            0x08, 0xbf, 0xdc, 0x56, 0xb1, 0x3b, 0xca, 0xd8,
+                            0xfc, 0x51, 0xdf, 0x9a, 0x2a, 0x37, 0x06, 0xf2,
+                            0xd1, 0x6b, 0x9a, 0x5e, 0x2a, 0xe5, 0x20, 0x57,
+                            0x35, 0x9f, 0x1f, 0x98, 0xcf, 0x40, 0xc7, 0xd6,
+                            0x98, 0xdb, 0xde, 0xf5, 0x64, 0x53, 0xf7, 0x9d,
+                            0x45, 0xf3, 0xd6, 0x78, 0xb9, 0xe3, 0xa3, 0x20,
+                            0xcd, 0x79, 0x43, 0x35, 0xef, 0xd7, 0xfb, 0xb9,
+                            0x80, 0x88, 0x27, 0x2f, 0x63, 0xa8, 0x67, 0x3d,
+                            0x4a, 0xfa, 0x06, 0xc6, 0xd2, 0x86, 0x0b, 0xa7,
+                            0x28, 0xfd, 0xe0, 0x1e, 0x93, 0x4b, 0x17, 0x2e,
+                            0xb0, 0x11, 0x6f, 0xc6, 0x2b, 0x98, 0x0f, 0x15,
+                            0xe3, 0x87, 0x16, 0x7a, 0x7c, 0x67, 0x3e, 0x12,
+                            0x2b, 0xf8, 0xbe, 0x48, 0xc1, 0x97, 0x47, 0xf4,
+                            0x1f, 0x81, 0x80, 0x12, 0x28, 0xe4, 0x7b, 0x1e,
+                            0xb7, 0x00, 0xa4, 0xde, 0xaa, 0xfb, 0x0f, 0x77,
+                            0x84, 0xa3, 0xd6, 0xb2, 0x03, 0x48, 0xdd, 0x53,
+                            0x8b, 0x46, 0x41, 0x28, 0x52, 0xc4, 0x53, 0xf0,
+                            0x1c, 0x95, 0xd9, 0x36, 0xe0, 0x0f, 0x26, 0x46,
+                            0x9c, 0x61, 0x0e, 0x80, 0xca, 0x86, 0xaf, 0x39,
+                            0x95, 0xe5, 0x60, 0x43, 0x61, 0x3e, 0x2b, 0xb4,
+                            0xe8, 0xbd, 0x8d, 0x77, 0x62, 0xf5, 0x32, 0x43,
+                            0x2f, 0x4b, 0x65, 0x82, 0x14, 0xdd, 0x29, 0x5b};
 
     /* RSA Known Public Key Values (24-bits). */
     static const PRUint8 rsa_public_exponent[FIPS_RSA_PUBLIC_EXPONENT_LENGTH] 
                                                        = { 0x01, 0x00, 0x01 };
     /* RSA Known Private Key Values (version                 is    8-bits), */
-    /*                              (private exponent        is 1024-bits), */
-    /*                              (private prime0          is  512-bits), */
-    /*                              (private prime1          is  512-bits), */
-    /*                              (private prime exponent0 is  512-bits), */
-    /*                              (private prime exponent1 is  512-bits), */
-    /*                          and (private coefficient     is  512-bits). */
+    /*                              (private exponent        is 2048-bits), */
+    /*                              (private prime0          is 1024-bits), */
+    /*                              (private prime1          is 1024-bits), */
+    /*                              (private prime exponent0 is 1024-bits), */
+    /*                              (private prime exponent1 is 1024-bits), */
+    /*                          and (private coefficient     is 1024-bits). */
     static const PRUint8 rsa_version[] = { 0x00 };
 
     static const PRUint8 rsa_private_exponent[FIPS_RSA_PRIVATE_EXPONENT_LENGTH]
-                           = { 0x85, 0x27, 0x47, 0x61, 0x4c, 0xd4, 0xb5, 0xb2,
-                               0x0e, 0x70, 0x91, 0x8f, 0x3d, 0x97, 0xf9, 0x5f,
-                               0xcc, 0x09, 0x65, 0x1c, 0x7c, 0x5b, 0xb3, 0x6d,
-                               0x63, 0x3f, 0x7b, 0x55, 0x22, 0xbb, 0x7c, 0x48,
-                               0x77, 0xae, 0x80, 0x56, 0xc2, 0x10, 0xd5, 0x03,
-                               0xdb, 0x31, 0xaf, 0x8d, 0x54, 0xd4, 0x48, 0x99,
-                               0xa8, 0xc4, 0x23, 0x43, 0xb8, 0x48, 0x0b, 0xc7,
-                               0xbc, 0xf5, 0xcc, 0x64, 0x72, 0xbf, 0x59, 0x06,
-                               0x04, 0x1c, 0x32, 0xf5, 0x14, 0x2e, 0x6e, 0xe2,
-                               0x0f, 0x5c, 0xde, 0x36, 0x3c, 0x6e, 0x7c, 0x4d,
-                               0xcc, 0xd3, 0x00, 0x6e, 0xe5, 0x45, 0x46, 0xef,
-                               0x4d, 0x25, 0x46, 0x6d, 0x7f, 0xed, 0xbb, 0x4f,
-                               0x4d, 0x9f, 0xda, 0x87, 0x47, 0x8f, 0x74, 0x44,
-                               0xb7, 0xbe, 0x9d, 0xf5, 0xdd, 0xd2, 0x4c, 0xa5,
-                               0xab, 0x74, 0xe5, 0x29, 0xa1, 0xd2, 0x45, 0x3b,
-                               0x33, 0xde, 0xd5, 0xae, 0xf7, 0x03, 0x10, 0x21};
+                         = {0x29, 0x08, 0x05, 0x53, 0x89, 0x76, 0xe6, 0x6c,
+                            0xb5, 0x77, 0xf0, 0xca, 0xdf, 0xf3, 0xf2, 0x67,
+                            0xda, 0x03, 0xd4, 0x9b, 0x4c, 0x88, 0xce, 0xe5,
+                            0xf8, 0x44, 0x4d, 0xc7, 0x80, 0x58, 0xe5, 0xff,
+                            0x22, 0x8f, 0xf5, 0x5b, 0x92, 0x81, 0xbe, 0x35,
+                            0xdf, 0xda, 0x67, 0x99, 0x3e, 0xfc, 0xe3, 0x83,
+                            0x6b, 0xa7, 0xaf, 0x16, 0xb7, 0x6f, 0x8f, 0xc0,
+                            0x81, 0xfd, 0x0b, 0x77, 0x65, 0x95, 0xfb, 0x00,
+                            0xad, 0x99, 0xec, 0x35, 0xc6, 0xe8, 0x23, 0x3e,
+                            0xe0, 0x88, 0x88, 0x09, 0xdb, 0x16, 0x50, 0xb7,
+                            0xcf, 0xab, 0x74, 0x61, 0x9e, 0x7f, 0xc5, 0x67,
+                            0x38, 0x56, 0xc7, 0x90, 0x85, 0x78, 0x5e, 0x84,
+                            0x21, 0x49, 0xea, 0xce, 0xb2, 0xa0, 0xff, 0xe4,
+                            0x70, 0x7f, 0x57, 0x7b, 0xa8, 0x36, 0xb8, 0x54,
+                            0x8d, 0x1d, 0xf5, 0x44, 0x9d, 0x68, 0x59, 0xf9,
+                            0x24, 0x6e, 0x85, 0x8f, 0xc3, 0x5f, 0x8a, 0x2c,
+                            0x94, 0xb7, 0xbc, 0x0e, 0xa5, 0xef, 0x93, 0x06,
+                            0x38, 0xcd, 0x07, 0x0c, 0xae, 0xb8, 0x44, 0x1a,
+                            0xd8, 0xe7, 0xf5, 0x9a, 0x1e, 0x9c, 0x18, 0xc7,
+                            0x6a, 0xc2, 0x7f, 0x28, 0x01, 0x4f, 0xb4, 0xb8,
+                            0x90, 0x97, 0x5a, 0x43, 0x38, 0xad, 0xe8, 0x95,
+                            0x68, 0x83, 0x1a, 0x1b, 0x10, 0x07, 0xe6, 0x02,
+                            0x52, 0x1f, 0xbf, 0x76, 0x6b, 0x46, 0xd6, 0xfb,
+                            0xc3, 0xbe, 0xb5, 0xac, 0x52, 0x53, 0x01, 0x1c,
+                            0xf3, 0xc5, 0xeb, 0x64, 0xf2, 0x1e, 0xc4, 0x38,
+                            0xe9, 0xaa, 0xd9, 0xc3, 0x72, 0x51, 0xa5, 0x44,
+                            0x58, 0x69, 0x0b, 0x1b, 0x98, 0x7f, 0xf2, 0x23,
+                            0xff, 0xeb, 0xf0, 0x75, 0x24, 0xcf, 0xc5, 0x1e,
+                            0xb8, 0x6a, 0xc5, 0x2f, 0x4f, 0x23, 0x50, 0x7d,
+                            0x15, 0x9d, 0x19, 0x7a, 0x0b, 0x82, 0xe0, 0x21,
+                            0x5b, 0x5f, 0x9d, 0x50, 0x2b, 0x83, 0xe4, 0x48,
+                            0xcc, 0x39, 0xe5, 0xfb, 0x13, 0x7b, 0x6f, 0x81 };
 
     static const PRUint8 rsa_prime0[FIPS_RSA_PRIME0_LENGTH]   = {
-                               0xf9, 0x74, 0x8f, 0x16, 0x02, 0x6b, 0xa0, 0xee,
-                               0x7f, 0x28, 0x97, 0x91, 0xdc, 0xec, 0xc0, 0x7c,
-                               0x49, 0xc2, 0x85, 0x76, 0xee, 0x66, 0x74, 0x2d,
-                               0x1a, 0xb8, 0xf7, 0x2f, 0x11, 0x5b, 0x36, 0xd8,
-                               0x46, 0x33, 0x3b, 0xd8, 0xf3, 0x2d, 0xa1, 0x03,
-                               0x83, 0x2b, 0xec, 0x35, 0x43, 0x32, 0xff, 0xdd,
-                               0x81, 0x7c, 0xfd, 0x65, 0x13, 0x04, 0x7c, 0xfc,
-                               0x03, 0x97, 0xf0, 0xd5, 0x62, 0xdc, 0x0d, 0xbf};
+                            0xe4, 0xbf, 0x21, 0x62, 0x9b, 0xa9, 0x77, 0x40,
+                            0x8d, 0x2a, 0xce, 0xa1, 0x67, 0x5a, 0x4c, 0x96,
+                            0x45, 0x98, 0x67, 0xbd, 0x75, 0x22, 0x33, 0x6f,
+                            0xe6, 0xcb, 0x77, 0xde, 0x9e, 0x97, 0x7d, 0x96,
+                            0x8c, 0x5e, 0x5d, 0x34, 0xfb, 0x27, 0xfc, 0x6d,
+                            0x74, 0xdb, 0x9d, 0x2e, 0x6d, 0xf6, 0xea, 0xfc,
+                            0xce, 0x9e, 0xda, 0xa7, 0x25, 0xa2, 0xf4, 0x58,
+                            0x6d, 0x0a, 0x3f, 0x01, 0xc2, 0xb4, 0xab, 0x38,
+                            0xc1, 0x14, 0x85, 0xb6, 0xfa, 0x94, 0xc3, 0x85,
+                            0xf9, 0x3c, 0x2e, 0x96, 0x56, 0x01, 0xe7, 0xd6,
+                            0x14, 0x71, 0x4f, 0xfb, 0x4c, 0x85, 0x52, 0xc4,
+                            0x61, 0x1e, 0xa5, 0x1e, 0x96, 0x13, 0x0d, 0x8f,
+                            0x66, 0xae, 0xa0, 0xcd, 0x7d, 0x25, 0x66, 0x19,
+                            0x15, 0xc2, 0xcf, 0xc3, 0x12, 0x3c, 0xe8, 0xa4,
+                            0x52, 0x4c, 0xcb, 0x28, 0x3c, 0xc4, 0xbf, 0x95,
+                            0x33, 0xe3, 0x81, 0xea, 0x0c, 0x6c, 0xa2, 0x05};
     static const PRUint8 rsa_prime1[FIPS_RSA_PRIME1_LENGTH]   = {
-                               0xdb, 0x1e, 0xa7, 0x3d, 0xe7, 0xfa, 0x8b, 0x04,
-                               0x83, 0x48, 0xf3, 0xa5, 0x31, 0x9d, 0x35, 0x5e,
-                               0x4d, 0x54, 0x77, 0xcc, 0x84, 0x09, 0xf3, 0x11,
-                               0x0d, 0x54, 0xed, 0x85, 0x39, 0xa9, 0xca, 0xa8,
-                               0xea, 0xae, 0x19, 0x9c, 0x75, 0xdb, 0x88, 0xb8,
-                               0x04, 0x8d, 0x54, 0xc6, 0xa4, 0x80, 0xf8, 0x93,
-                               0xf0, 0xdb, 0x19, 0xef, 0xd7, 0x87, 0x8a, 0x8f,
-                               0x5a, 0x09, 0x2e, 0x54, 0xf3, 0x45, 0x24, 0x29};
+                            0xce, 0x03, 0x94, 0xf4, 0xa9, 0x2c, 0x1e, 0x06,
+                            0xe7, 0x40, 0x30, 0x01, 0xf7, 0xbb, 0x68, 0x8c,
+                            0x27, 0xd2, 0x15, 0xe3, 0x28, 0x49, 0x5b, 0xa8,
+                            0xc1, 0x9a, 0x42, 0x7e, 0x31, 0xf9, 0x08, 0x34,
+                            0x81, 0xa2, 0x0f, 0x04, 0x61, 0x34, 0xe3, 0x36,
+                            0x92, 0xb1, 0x09, 0x2b, 0xe9, 0xef, 0x84, 0x88,
+                            0xbe, 0x9c, 0x98, 0x60, 0xa6, 0x60, 0x84, 0xe9,
+                            0x75, 0x6f, 0xcc, 0x81, 0xd1, 0x96, 0xef, 0xdd,
+                            0x2e, 0xca, 0xc4, 0xf5, 0x42, 0xfb, 0x13, 0x2b,
+                            0x57, 0xbf, 0x14, 0x5e, 0xc2, 0x7f, 0x77, 0x35,
+                            0x29, 0xc4, 0xe5, 0xe0, 0xf9, 0x6d, 0x15, 0x4a,
+                            0x42, 0x56, 0x1c, 0x3e, 0x0c, 0xc5, 0xce, 0x70,
+                            0x08, 0x63, 0x1e, 0x73, 0xdb, 0x7e, 0x74, 0x05,
+                            0x32, 0x01, 0xc6, 0x36, 0x32, 0x75, 0x6b, 0xed,
+                            0x9d, 0xfe, 0x7c, 0x7e, 0xa9, 0x57, 0xb4, 0xe9,
+                            0x22, 0xe4, 0xe7, 0xfe, 0x36, 0x07, 0x9b, 0xdf};
     static const PRUint8 rsa_exponent0[FIPS_RSA_EXPONENT0_LENGTH] = {
-                               0x6a, 0xd1, 0x25, 0x80, 0x18, 0x33, 0x3c, 0x2b,
-                               0x44, 0x19, 0xfe, 0xa5, 0x40, 0x03, 0xc4, 0xfc,
-                               0xb3, 0x9c, 0xef, 0x07, 0x99, 0x58, 0x17, 0xc1,
-                               0x44, 0xa3, 0x15, 0x7d, 0x7b, 0x22, 0x22, 0xdf,
-                               0x03, 0x58, 0x66, 0xf5, 0x24, 0x54, 0x52, 0x91,
-                               0x2d, 0x76, 0xfe, 0x63, 0x64, 0x4e, 0x0f, 0x50,
-                               0x2b, 0x65, 0x79, 0x1f, 0xf1, 0xbf, 0xc7, 0x41,
-                               0x26, 0xcc, 0xc6, 0x1c, 0xa9, 0x83, 0x6f, 0x03};
+                            0x04, 0x5a, 0x3a, 0xa9, 0x64, 0xaa, 0xd9, 0xd1,
+                            0x09, 0x9e, 0x99, 0xe5, 0xea, 0x50, 0x86, 0x8a,
+                            0x89, 0x72, 0x77, 0xee, 0xdb, 0xee, 0xb5, 0xa9,
+                            0xd8, 0x6b, 0x60, 0xb1, 0x84, 0xb4, 0xff, 0x37,
+                            0xc1, 0x1d, 0xfe, 0x8a, 0x06, 0x89, 0x61, 0x3d,
+                            0x37, 0xef, 0x01, 0xd3, 0xa3, 0x56, 0x02, 0x6c,
+                            0xa3, 0x05, 0xd4, 0xc5, 0x3f, 0x6b, 0x15, 0x59,
+                            0x25, 0x61, 0xff, 0x86, 0xea, 0x0c, 0x84, 0x01,
+                            0x85, 0x72, 0xfd, 0x84, 0x58, 0xca, 0x41, 0xda,
+                            0x27, 0xbe, 0xe4, 0x68, 0x09, 0xe4, 0xe9, 0x63,
+                            0x62, 0x6a, 0x31, 0x8a, 0x67, 0x8f, 0x55, 0xde,
+                            0xd4, 0xb6, 0x3f, 0x90, 0x10, 0x6c, 0xf6, 0x62,
+                            0x17, 0x23, 0x15, 0x7e, 0x33, 0x76, 0x65, 0xb5,
+                            0xee, 0x7b, 0x11, 0x76, 0xf5, 0xbe, 0xe0, 0xf2,
+                            0x57, 0x7a, 0x8c, 0x97, 0x0c, 0x68, 0xf5, 0xf8,
+                            0x41, 0xcf, 0x7f, 0x66, 0x53, 0xac, 0x31, 0x7d};
     static const PRUint8 rsa_exponent1[FIPS_RSA_EXPONENT1_LENGTH] = {
-                               0x12, 0x84, 0x1a, 0x99, 0xce, 0x9a, 0x8b, 0x58,
-                               0xcc, 0x47, 0x43, 0xdf, 0x77, 0xbb, 0xd3, 0x20,
-                               0xae, 0xe4, 0x2e, 0x63, 0x67, 0xdc, 0xf7, 0x5f,
-                               0x3f, 0x83, 0x27, 0xb7, 0x14, 0x52, 0x56, 0xbf,
-                               0xc3, 0x65, 0x06, 0xe1, 0x03, 0xcc, 0x93, 0x57,
-                               0x09, 0x7b, 0x6f, 0xe8, 0x81, 0x4a, 0x2c, 0xb7,
-                               0x43, 0xa9, 0x20, 0x1d, 0xf6, 0x56, 0x8b, 0xcc,
-                               0xe5, 0x4c, 0xd5, 0x4f, 0x74, 0x67, 0x29, 0x51};
+                            0x93, 0x54, 0x14, 0x6e, 0x73, 0x9d, 0x4d, 0x4b,
+                            0xfa, 0x8c, 0xf8, 0xc8, 0x2f, 0x76, 0x22, 0xea,
+                            0x38, 0x80, 0x11, 0x8f, 0x05, 0xfc, 0x90, 0x44,
+                            0x3b, 0x50, 0x2a, 0x45, 0x3d, 0x4f, 0xaf, 0x02,
+                            0x7d, 0xc2, 0x7b, 0xa2, 0xd2, 0x31, 0x94, 0x5c,
+                            0x2e, 0xc3, 0xd4, 0x9f, 0x47, 0x09, 0x37, 0x6a,
+                            0xe3, 0x85, 0xf1, 0xa3, 0x0c, 0xd8, 0xf1, 0xb4,
+                            0x53, 0x7b, 0xc4, 0x71, 0x02, 0x86, 0x42, 0xbb,
+                            0x96, 0xff, 0x03, 0xa3, 0xb2, 0x67, 0x03, 0xea,
+                            0x77, 0x31, 0xfb, 0x4b, 0x59, 0x24, 0xf7, 0x07,
+                            0x59, 0xfb, 0xa9, 0xba, 0x1e, 0x26, 0x58, 0x97,
+                            0x66, 0xa1, 0x56, 0x49, 0x39, 0xb1, 0x2c, 0x55,
+                            0x0a, 0x6a, 0x78, 0x18, 0xba, 0xdb, 0xcf, 0xf4,
+                            0xf7, 0x32, 0x35, 0xa2, 0x04, 0xab, 0xdc, 0xa7,
+                            0x6d, 0xd9, 0xd5, 0x06, 0x6f, 0xec, 0x7d, 0x40,
+                            0x4c, 0xe8, 0x0e, 0xd0, 0xc9, 0xaa, 0xdf, 0x59};
     static const PRUint8 rsa_coefficient[FIPS_RSA_COEFFICIENT_LENGTH] = {
-                               0x23, 0xab, 0xf4, 0x03, 0x2f, 0x29, 0x95, 0x74,
-                               0xac, 0x1a, 0x33, 0x96, 0x62, 0xed, 0xf7, 0xf6,
-                               0xae, 0x07, 0x2a, 0x2e, 0xe8, 0xab, 0xfb, 0x1e,
-                               0xb9, 0xb2, 0x88, 0x1e, 0x85, 0x05, 0x42, 0x64,
-                               0x03, 0xb2, 0x8b, 0xc1, 0x81, 0x75, 0xd7, 0xba,
-                               0xaa, 0xd4, 0x31, 0x3c, 0x8a, 0x96, 0x23, 0x9d,
-                               0x3f, 0x06, 0x3e, 0x44, 0xa9, 0x62, 0x2f, 0x61,
-                               0x5a, 0x51, 0x82, 0x2c, 0x04, 0x85, 0x73, 0xd1};
+                            0x17, 0xd7, 0xf5, 0x0a, 0xf0, 0x68, 0x97, 0x96,
+                            0xc4, 0x29, 0x18, 0x77, 0x9a, 0x1f, 0xe3, 0xf3,
+                            0x12, 0x13, 0x0f, 0x7e, 0x7b, 0xb9, 0xc1, 0x91,
+                            0xf9, 0xc7, 0x08, 0x56, 0x5c, 0xa4, 0xbc, 0x83,
+                            0x71, 0xf9, 0x78, 0xd9, 0x2b, 0xec, 0xfe, 0x6b,
+                            0xdc, 0x2f, 0x63, 0xc9, 0xcd, 0x50, 0x14, 0x5b,
+                            0xd3, 0x6e, 0x85, 0x4d, 0x0c, 0xa2, 0x0b, 0xa0,
+                            0x09, 0xb6, 0xca, 0x34, 0x9c, 0xc2, 0xc1, 0x4a,
+                            0xb0, 0xbc, 0x45, 0x93, 0xa5, 0x7e, 0x99, 0xb5,
+                            0xbd, 0xe4, 0x69, 0x29, 0x08, 0x28, 0xd2, 0xcd,
+                            0xab, 0x24, 0x78, 0x48, 0x41, 0x26, 0x0b, 0x37,
+                            0xa3, 0x43, 0xd1, 0x95, 0x1a, 0xd6, 0xee, 0x22,
+                            0x1c, 0x00, 0x0b, 0xc2, 0xb7, 0xa4, 0xa3, 0x21,
+                            0xa9, 0xcd, 0xe4, 0x69, 0xd3, 0x45, 0x02, 0xb1,
+                            0xb7, 0x3a, 0xbf, 0x51, 0x35, 0x1b, 0x78, 0xc2,
+                            0xcf, 0x0c, 0x0d, 0x60, 0x09, 0xa9, 0x44, 0x02};
 
     /* RSA Known Plaintext Message (1024-bits). */
     static const PRUint8 rsa_known_plaintext_msg[FIPS_RSA_MESSAGE_LENGTH] = {
-                                         "Known plaintext message utilized" 
+                                         "Known plaintext message utilized"
                                          "for RSA Encryption &  Decryption"
-                                         "block, SHA1, SHA256, SHA384  and"
-                                         "SHA512 RSA Signature KAT tests."};
+                                         "blocks SHA256, SHA384  and      "
+                                         "SHA512 RSA Signature KAT tests. "
+                                         "Known plaintext message utilized"
+                                         "for RSA Encryption &  Decryption"
+                                         "blocks SHA256, SHA384  and      "
+                                         "SHA512 RSA Signature KAT  tests."};
 
-    /* RSA Known Ciphertext (1024-bits). */
+    /* RSA Known Ciphertext (2048-bits). */
     static const PRUint8 rsa_known_ciphertext[] = {
-                               0x1e, 0x7e, 0x12, 0xbb, 0x15, 0x62, 0xd0, 0x23,
-                               0x53, 0x4c, 0x51, 0x97, 0x77, 0x06, 0xa0, 0xbb,
-                               0x26, 0x99, 0x9a, 0x8f, 0x39, 0xad, 0x88, 0x5c,
-                               0xc4, 0xce, 0x33, 0x40, 0x94, 0x92, 0xb4, 0x0e,
-                               0xab, 0x71, 0xa9, 0x5d, 0x9a, 0x37, 0xe3, 0x9a,
-                               0x24, 0x95, 0x13, 0xea, 0x0f, 0xbb, 0xf7, 0xff,
-                               0xdf, 0x31, 0x33, 0x23, 0x1d, 0xce, 0x26, 0x9e,
-                               0xd1, 0xde, 0x98, 0x40, 0xde, 0x57, 0x86, 0x12,
-                               0xf1, 0xe6, 0x5a, 0x3f, 0x08, 0x02, 0x81, 0x85,
-                               0xe0, 0xd9, 0xad, 0x3c, 0x8c, 0x71, 0xf8, 0xcf,
-                               0x0a, 0x98, 0xc5, 0x08, 0xdc, 0xc4, 0xca, 0x8c,
-                               0x23, 0x1b, 0x4d, 0x9b, 0xb5, 0x13, 0x44, 0xe1,
-                               0x5f, 0xf9, 0x30, 0x80, 0x25, 0xe0, 0x1e, 0x94,
-                               0xa3, 0x0c, 0xdc, 0x82, 0x2e, 0xfb, 0x30, 0xbe,
-                               0x89, 0xba, 0x76, 0xb6, 0x23, 0xf7, 0xda, 0x7c,
-                               0xca, 0xe6, 0x02, 0xbd, 0x92, 0xce, 0x64, 0xfc};
+                            0x04, 0x12, 0x46, 0xe3, 0x6a, 0xee, 0xde, 0xdd,
+                            0x49, 0xa1, 0xd9, 0x83, 0xf7, 0x35, 0xf9, 0x70,
+                            0x88, 0x03, 0x2d, 0x01, 0x8b, 0xd1, 0xbf, 0xdb,
+                            0xe5, 0x1c, 0x85, 0xbe, 0xb5, 0x0b, 0x48, 0x45,
+                            0x7a, 0xf0, 0xa0, 0xe3, 0xa2, 0xbb, 0x4b, 0xf6,
+                            0x27, 0xd0, 0x1b, 0x12, 0xe3, 0x77, 0x52, 0x34,
+                            0x9e, 0x8e, 0x03, 0xd2, 0xf8, 0x79, 0x6e, 0x39,
+                            0x79, 0x53, 0x3c, 0x44, 0x14, 0x94, 0xbb, 0x8d,
+                            0xaa, 0x14, 0x44, 0xa0, 0x7b, 0xa5, 0x8c, 0x93,
+                            0x5f, 0x99, 0xa4, 0xa3, 0x6e, 0x7a, 0x38, 0x40,
+                            0x78, 0xfa, 0x36, 0x91, 0x5e, 0x9a, 0x9c, 0xba,
+                            0x1e, 0xd4, 0xf9, 0xda, 0x4b, 0x0f, 0xa8, 0xa3,
+                            0x1c, 0xf3, 0x3a, 0xd1, 0xa5, 0xb4, 0x51, 0x16,
+                            0xed, 0x4b, 0xcf, 0xec, 0x93, 0x7b, 0x90, 0x21,
+                            0xbc, 0x3a, 0xf4, 0x0b, 0xd1, 0x3a, 0x2b, 0xba,
+                            0xa6, 0x7d, 0x5b, 0x53, 0xd8, 0x64, 0xf9, 0x29,
+                            0x7b, 0x7f, 0x77, 0x3e, 0x51, 0x4c, 0x9a, 0x94,
+                            0xd2, 0x4b, 0x4a, 0x8d, 0x61, 0x74, 0x97, 0xae,
+                            0x53, 0x6a, 0xf4, 0x90, 0xc2, 0x2c, 0x49, 0xe2,
+                            0xfa, 0xeb, 0x91, 0xc5, 0xe5, 0x83, 0x13, 0xc9,
+                            0x44, 0x4b, 0x95, 0x2c, 0x57, 0x70, 0x15, 0x5c,
+                            0x64, 0x8d, 0x1a, 0xfd, 0x2a, 0xc7, 0xb2, 0x9c,
+                            0x5c, 0x99, 0xd3, 0x4a, 0xfd, 0xdd, 0xf6, 0x82,
+                            0x87, 0x8c, 0x5a, 0xc4, 0xa8, 0x0d, 0x2a, 0xef,
+                            0xc3, 0xa2, 0x7e, 0x8e, 0x67, 0x9f, 0x6f, 0x63,
+                            0xdb, 0xbb, 0x1d, 0x31, 0xc4, 0xbb, 0xbc, 0x13,
+                            0x3f, 0x54, 0xc6, 0xf6, 0xc5, 0x28, 0x32, 0xab,
+                            0x96, 0x42, 0x10, 0x36, 0x40, 0x92, 0xbb, 0x57,
+                            0x55, 0x38, 0xf5, 0x43, 0x7e, 0x43, 0xc4, 0x65,
+                            0x47, 0x64, 0xaa, 0x0f, 0x4c, 0xe9, 0x49, 0x16,
+                            0xec, 0x6a, 0x50, 0xfd, 0x14, 0x49, 0xca, 0xdb,
+                            0x44, 0x54, 0xca, 0xbe, 0xa3, 0x0e, 0x5f, 0xef};
 
-    /* RSA Known Signed Hash (1024-bits). */
-    static const PRUint8 rsa_known_sha1_signature[] = {
-                               0xd2, 0xa4, 0xe0, 0x2b, 0xc7, 0x03, 0x7f, 0xc6,
-                               0x06, 0x9e, 0xa2, 0x82, 0x19, 0xe9, 0x2b, 0xaf,
-                               0xe3, 0x48, 0x88, 0xc1, 0xf3, 0xb5, 0x0d, 0xe4,
-                               0x52, 0x9e, 0xad, 0xd5, 0x58, 0xb5, 0x9f, 0xe8,
-                               0x40, 0xe9, 0xb7, 0x2e, 0xc6, 0x71, 0x58, 0x56,
-                               0x04, 0xac, 0xb0, 0xf3, 0x3a, 0x42, 0x38, 0x08,
-                               0xc4, 0x43, 0x39, 0xba, 0x19, 0xce, 0xb1, 0x99,
-                               0xf1, 0x8d, 0x89, 0xd8, 0x50, 0x07, 0x14, 0x3d,
-                               0xcf, 0xd0, 0xb6, 0x79, 0xde, 0x9c, 0x89, 0x32,
-                               0xb0, 0x73, 0x3f, 0xed, 0x03, 0x0b, 0xdf, 0x6d,
-                               0x7e, 0xc9, 0x1c, 0x39, 0xe8, 0x2b, 0x16, 0x09,
-                               0xbb, 0x5f, 0x99, 0x2f, 0xeb, 0xf3, 0x37, 0x73,
-                               0x0d, 0x0e, 0xcc, 0x95, 0xad, 0x90, 0x80, 0x03,
-                               0x1d, 0x80, 0x55, 0x37, 0xa1, 0x2a, 0x71, 0x76,
-                               0x23, 0x87, 0x8c, 0x9b, 0x41, 0x07, 0xc6, 0x3d,
-                               0xc6, 0xa3, 0x7d, 0x1b, 0xff, 0x4e, 0x11, 0x19};
-
-    /* RSA Known Signed Hash (1024-bits). */
+    /* RSA Known Signed Hash (2048-bits). */
     static const PRUint8 rsa_known_sha256_signature[] = {
-                               0x27, 0x35, 0xdd, 0xc4, 0xf8, 0xe2, 0x0b, 0xa3,
-                               0xef, 0x63, 0x57, 0x3b, 0xe1, 0x58, 0x9a, 0xbc,
-                               0x20, 0x9c, 0x25, 0x12, 0x01, 0xbf, 0xbb, 0x29,
-                               0x80, 0x1a, 0xb1, 0x37, 0x9c, 0xcd, 0x67, 0xc7,
-                               0x0d, 0xf8, 0x64, 0x10, 0x9f, 0xe2, 0xa1, 0x9b,
-                               0x21, 0x90, 0xcc, 0xda, 0x8b, 0x76, 0x5e, 0x79,
-                               0x00, 0x9d, 0x58, 0x8b, 0x8a, 0xb3, 0xc3, 0xb5,
-                               0xf1, 0x54, 0xc5, 0x8c, 0x72, 0xba, 0xde, 0x51,
-                               0x3c, 0x6b, 0x94, 0xd6, 0xf3, 0x1b, 0xa2, 0x53,
-                               0xe6, 0x1a, 0x46, 0x1d, 0x7f, 0x14, 0x86, 0xcc,
-                               0xa6, 0x30, 0x92, 0x96, 0xc0, 0x96, 0x24, 0xf0,
-                               0x42, 0x53, 0x4c, 0xdd, 0x27, 0xdf, 0x1d, 0x2e,
-                               0x8b, 0x83, 0xbe, 0xed, 0x85, 0x1d, 0x50, 0x46,
-                               0xa3, 0x7d, 0x20, 0xea, 0x3e, 0x91, 0xfb, 0xf6,
-                               0x86, 0x51, 0xfd, 0x8c, 0xe5, 0x31, 0xe6, 0x7e,
-                               0x60, 0x08, 0x0e, 0xec, 0xa6, 0xea, 0x24, 0x8d};
+                            0x8c, 0x2d, 0x2e, 0xfb, 0x37, 0xb5, 0x6f, 0x38,
+                            0x9f, 0x06, 0x5a, 0xf3, 0x8c, 0xa0, 0xd0, 0x7a,
+                            0xde, 0xcf, 0xf9, 0x14, 0x95, 0x59, 0xd3, 0x5f,
+                            0x51, 0x5d, 0x5d, 0xad, 0xd8, 0x71, 0x33, 0x50,
+                            0x1d, 0x03, 0x3b, 0x3a, 0x32, 0x00, 0xb4, 0xde,
+                            0x7f, 0xe4, 0xb1, 0xe5, 0x6b, 0x83, 0xf4, 0x80,
+                            0x10, 0x3b, 0xb8, 0x8a, 0xdb, 0xe8, 0x0a, 0x42,
+                            0x9e, 0x8d, 0xd7, 0xbe, 0xed, 0xde, 0x5a, 0x3d,
+                            0xc6, 0xdb, 0xfe, 0x49, 0x6a, 0xe9, 0x1e, 0x75,
+                            0x66, 0xf1, 0x3f, 0x9e, 0x3f, 0xff, 0x05, 0x65,
+                            0xde, 0xca, 0x62, 0x62, 0xf3, 0xec, 0x53, 0x09,
+                            0xa0, 0x37, 0xd5, 0x66, 0x62, 0x72, 0x14, 0xb6,
+                            0x51, 0x32, 0x67, 0x50, 0xc1, 0xe1, 0x2f, 0x9e,
+                            0x98, 0x4e, 0x53, 0x96, 0x55, 0x4b, 0xc4, 0x92,
+                            0xc3, 0xb4, 0x80, 0xf0, 0x35, 0xc9, 0x00, 0x4b,
+                            0x5c, 0x85, 0x92, 0xb1, 0xe8, 0x6e, 0xa5, 0x51,
+                            0x38, 0x9f, 0xc9, 0x11, 0xb6, 0x14, 0xdf, 0x34,
+                            0x64, 0x40, 0x82, 0x82, 0xde, 0x16, 0x69, 0x93,
+                            0x89, 0x4e, 0x5c, 0x32, 0xf2, 0x0a, 0x4e, 0x9e,
+                            0xbd, 0x63, 0x99, 0x4f, 0xf3, 0x15, 0x90, 0xc2,
+                            0xfe, 0x6f, 0xb7, 0xf4, 0xad, 0xd4, 0x8e, 0x0b,
+                            0xd2, 0xf5, 0x22, 0xd2, 0x71, 0x65, 0x13, 0xf7,
+                            0x82, 0x7b, 0x75, 0xb6, 0xc1, 0xb4, 0x45, 0xbd,
+                            0x8f, 0x95, 0xcf, 0x5b, 0x95, 0x32, 0xef, 0x18,
+                            0x5f, 0xd3, 0xdf, 0x7e, 0x22, 0xdd, 0x25, 0xeb,
+                            0xe1, 0xbf, 0x3b, 0x9a, 0x55, 0x75, 0x4f, 0x3c,
+                            0x38, 0x67, 0x57, 0x04, 0x04, 0x57, 0x27, 0xf6,
+                            0x34, 0x0e, 0x57, 0x8a, 0x7c, 0xff, 0x7d, 0xca,
+                            0x8c, 0x06, 0xf8, 0x9d, 0xdb, 0xe4, 0xd8, 0x19,
+                            0xdd, 0x4d, 0xfd, 0x8f, 0xa0, 0x06, 0x53, 0xe8,
+                            0x33, 0x00, 0x70, 0x3f, 0x6b, 0xc3, 0xbd, 0x9a,
+                            0x78, 0xb5, 0xa9, 0xef, 0x6d, 0xda, 0x67, 0x92};
 
-    /* RSA Known Signed Hash (1024-bits). */
-    static const PRUint8 rsa_known_sha384_signature[] = {
-                               0x0b, 0x03, 0x94, 0x4f, 0x94, 0x78, 0x9b, 0x96,
-                               0x76, 0xeb, 0x72, 0x58, 0xe1, 0xc5, 0xc7, 0x5f,
-                               0x85, 0x01, 0xa8, 0xc4, 0xf6, 0x1a, 0xb5, 0x2c,
-                               0xd1, 0xd8, 0x87, 0xde, 0x3a, 0x9c, 0x9f, 0x57,
-                               0x81, 0x2a, 0x1e, 0x23, 0x07, 0x70, 0xb0, 0xf9,
-                               0x28, 0x3d, 0xfa, 0xe5, 0x2e, 0x1b, 0x9a, 0x72,
-                               0xc3, 0x74, 0xb3, 0x42, 0x1c, 0x9a, 0x13, 0xdc,
-                               0xc9, 0xd6, 0xd5, 0x88, 0xc9, 0x9c, 0x46, 0xf1,
-                               0x0c, 0xa6, 0xf7, 0xd8, 0x06, 0xa3, 0x1b, 0xdf,
-                               0x55, 0xb3, 0x1b, 0x7b, 0x58, 0x1d, 0xff, 0x19,
-                               0xc7, 0xe0, 0xdd, 0x59, 0xac, 0x2f, 0x78, 0x71,
-                               0xe7, 0xe0, 0x17, 0xa3, 0x1c, 0x5c, 0x92, 0xef,
-                               0xb6, 0x75, 0xed, 0xbe, 0x18, 0x39, 0x6b, 0xd7,
-                               0xc9, 0x08, 0x62, 0x55, 0x62, 0xac, 0x5d, 0xa1,
-                               0x9b, 0xd5, 0xb8, 0x98, 0x15, 0xc0, 0xf5, 0x41,
-                               0x85, 0x44, 0x96, 0xca, 0x10, 0xdc, 0x57, 0x21};
+   /* RSA Known Signed Hash (2048-bits). */
+   static const PRUint8 rsa_known_sha384_signature[] = {
+                            0x20, 0x2d, 0x21, 0x3a, 0xaa, 0x1e, 0x05, 0x15,
+                            0x5c, 0xca, 0x84, 0x86, 0xc0, 0x15, 0x81, 0xdf,
+                            0xd4, 0x06, 0x9f, 0xe0, 0xc1, 0xed, 0xef, 0x0f,
+                            0xfe, 0xb3, 0xc3, 0xbb, 0x28, 0xa5, 0x56, 0xbf,
+                            0xe3, 0x11, 0x5c, 0xc2, 0xc0, 0x0b, 0xfa, 0xfa,
+                            0x3d, 0xd3, 0x06, 0x20, 0xe2, 0xc9, 0xe4, 0x66,
+                            0x28, 0xb7, 0xc0, 0x3b, 0x3c, 0x96, 0xc6, 0x49,
+                            0x3b, 0xcf, 0x86, 0x49, 0x31, 0xaf, 0x5b, 0xa3,
+                            0xec, 0x63, 0x10, 0xdf, 0xda, 0x2f, 0x68, 0xac,
+                            0x7b, 0x3a, 0x49, 0xfa, 0xe6, 0x0d, 0xfe, 0x37,
+                            0x17, 0x56, 0x8e, 0x5c, 0x48, 0x97, 0x43, 0xf7,
+                            0xa0, 0xbc, 0xe3, 0x4b, 0x42, 0xde, 0x58, 0x1d,
+                            0xd9, 0x5d, 0xb3, 0x08, 0x35, 0xbd, 0xa4, 0xe1,
+                            0x80, 0xc3, 0x64, 0xab, 0x21, 0x97, 0xad, 0xfb,
+                            0x71, 0xee, 0xa3, 0x3d, 0x9c, 0xaa, 0xfa, 0x16,
+                            0x60, 0x46, 0x32, 0xda, 0x44, 0x2e, 0x10, 0x92,
+                            0x20, 0xd8, 0x98, 0x80, 0x84, 0x75, 0x5b, 0x70,
+                            0x91, 0x00, 0x33, 0x19, 0x69, 0xc9, 0x2a, 0xec,
+                            0x3d, 0xe5, 0x5f, 0x0f, 0x9a, 0xa7, 0x97, 0x1f,
+                            0x79, 0xc3, 0x1d, 0x65, 0x74, 0x62, 0xc5, 0xa1,
+                            0x23, 0x65, 0x4b, 0x84, 0xa1, 0x03, 0x98, 0xf3,
+                            0xf1, 0x02, 0x24, 0xca, 0xe5, 0xd4, 0xc8, 0xa2,
+                            0x30, 0xad, 0x72, 0x7d, 0x29, 0x60, 0x1a, 0x8e,
+                            0x6f, 0x23, 0xa4, 0xda, 0x68, 0xa4, 0x45, 0x9c,
+                            0x39, 0x70, 0x44, 0x18, 0x4b, 0x73, 0xfe, 0xf8,
+                            0x33, 0x53, 0x1d, 0x7e, 0x93, 0x93, 0xac, 0xc7,
+                            0x1e, 0x6e, 0x6b, 0xfd, 0x9e, 0xba, 0xa6, 0x71,
+                            0x70, 0x47, 0x6a, 0xd6, 0x82, 0x32, 0xa2, 0x6e,
+                            0x20, 0x72, 0xb0, 0xba, 0xec, 0x91, 0xbb, 0x6b,
+                            0xcc, 0x84, 0x0a, 0x33, 0x2b, 0x8a, 0x8d, 0xeb,
+                            0x71, 0xcd, 0xca, 0x67, 0x1b, 0xad, 0x10, 0xd4,
+                            0xce, 0x4f, 0xc0, 0x29, 0xec, 0xfa, 0xed, 0xfa};
 
-    /* RSA Known Signed Hash (1024-bits). */
-    static const PRUint8 rsa_known_sha512_signature[] = {
-                               0xa5, 0xd0, 0x80, 0x04, 0x22, 0xfc, 0x80, 0x73,
-                               0x7d, 0x46, 0xc8, 0x7b, 0xac, 0x44, 0x7b, 0xe6,
-                               0x07, 0xe5, 0x61, 0x4c, 0x33, 0x7f, 0x6f, 0x46,
-                               0x7c, 0x30, 0xe3, 0x75, 0x59, 0x4b, 0x42, 0xf3,
-                               0x9f, 0x35, 0x3c, 0x10, 0x56, 0xdb, 0xd2, 0x69,
-                               0x43, 0xcb, 0x77, 0xe9, 0x7d, 0xcd, 0x07, 0x43,
-                               0xc5, 0xd4, 0x0c, 0x9d, 0xf5, 0x92, 0xbd, 0x0e,
-                               0x3b, 0xb7, 0x68, 0x88, 0x84, 0xca, 0xae, 0x0d,
-                               0xab, 0x71, 0x10, 0xad, 0xab, 0x27, 0xe4, 0xa3,
-                               0x24, 0x41, 0xeb, 0x1c, 0xa6, 0x5f, 0xf1, 0x85,
-                               0xd0, 0xf6, 0x22, 0x74, 0x3d, 0x81, 0xbe, 0xdd,
-                               0x1b, 0x2a, 0x4c, 0xd1, 0x6c, 0xb5, 0x6d, 0x7a,
-                               0xbb, 0x99, 0x69, 0x01, 0xa6, 0xc0, 0x98, 0xfa,
-                               0x97, 0xa3, 0xd1, 0xb0, 0xdf, 0x09, 0xe3, 0x3d,
-                               0x88, 0xee, 0x90, 0xf3, 0x10, 0x41, 0x0f, 0x06,
-                               0x31, 0xe9, 0x60, 0x2d, 0xbf, 0x63, 0x7b, 0xf8};
+   /* RSA Known Signed Hash (2048-bits). */
+   static const PRUint8 rsa_known_sha512_signature[] = {
+                            0x35, 0x0e, 0x74, 0x9d, 0xeb, 0xc7, 0x67, 0x31,
+                            0x9f, 0xff, 0x0b, 0xbb, 0x5e, 0x66, 0xb4, 0x2f,
+                            0xbf, 0x72, 0x60, 0x4f, 0xe9, 0xbd, 0xec, 0xc8,
+                            0x17, 0x79, 0x5f, 0x39, 0x83, 0xb4, 0x54, 0x2e,
+                            0x01, 0xb9, 0xd3, 0x20, 0x47, 0xcb, 0xd4, 0x42,
+                            0xf2, 0x6e, 0x36, 0xc1, 0x97, 0xad, 0xef, 0x8e,
+                            0xe6, 0x51, 0xee, 0x5e, 0x9e, 0x88, 0xb4, 0x9d,
+                            0xda, 0x3e, 0x77, 0x4b, 0xe8, 0xae, 0x48, 0x53,
+                            0x2c, 0xc4, 0xd3, 0x25, 0x6b, 0x23, 0xb7, 0x54,
+                            0x3c, 0x95, 0x8f, 0xfb, 0x6f, 0x6d, 0xc5, 0x56,
+                            0x39, 0x69, 0x28, 0x0e, 0x74, 0x9b, 0x31, 0xe8,
+                            0x76, 0x77, 0x2b, 0xc1, 0x44, 0x89, 0x81, 0x93,
+                            0xfc, 0xf6, 0xec, 0x5f, 0x8f, 0x89, 0xfc, 0x1d,
+                            0xa4, 0x53, 0x58, 0x8c, 0xe9, 0xc0, 0xc0, 0x26,
+                            0xe6, 0xdf, 0x6d, 0x27, 0xb1, 0x8e, 0x3e, 0xb6,
+                            0x47, 0xe1, 0x02, 0x96, 0xc2, 0x5f, 0x7f, 0x3d,
+                            0xc5, 0x6c, 0x2f, 0xea, 0xaa, 0x5e, 0x39, 0xfc,
+                            0x77, 0xca, 0x00, 0x02, 0x5c, 0x64, 0x7c, 0xce,
+                            0x7d, 0x63, 0x82, 0x05, 0xed, 0xf7, 0x5b, 0x55,
+                            0x58, 0xc0, 0xeb, 0x76, 0xd7, 0x95, 0x55, 0x37,
+                            0x85, 0x7d, 0x17, 0xad, 0xd2, 0x11, 0xfd, 0x97,
+                            0x48, 0xb5, 0xc2, 0x5e, 0xc7, 0x62, 0xc0, 0xe0,
+                            0x68, 0xa8, 0x61, 0x14, 0x41, 0xca, 0x25, 0x3a,
+                            0xec, 0x48, 0x54, 0x22, 0x83, 0x2b, 0x69, 0x54,
+                            0xfd, 0xc8, 0x99, 0x9a, 0xee, 0x37, 0x03, 0xa3,
+                            0x8f, 0x0f, 0x32, 0xb0, 0xaa, 0x74, 0x39, 0x04,
+                            0x7c, 0xd9, 0xc2, 0x8f, 0xbe, 0xf2, 0xc4, 0xbe,
+                            0xdd, 0x7a, 0x7a, 0x7f, 0x72, 0xd3, 0x80, 0x59,
+                            0x18, 0xa0, 0xa1, 0x2d, 0x6f, 0xa3, 0xa9, 0x48,
+                            0xed, 0x20, 0xa6, 0xea, 0xaa, 0x10, 0x83, 0x98,
+                            0x0c, 0x13, 0x69, 0x6e, 0xcd, 0x31, 0x6b, 0xd0,
+                            0x66, 0xa6, 0x5e, 0x30, 0x0c, 0x82, 0xd5, 0x81};
 
     static const RSAPublicKey    bl_public_key = { NULL,
       { FIPS_RSA_TYPE, (unsigned char *)rsa_modulus,         
@@ -1447,13 +1568,6 @@ sftk_fips_RSA_PowerUpSelfTest( void )
                        FIPS_RSA_DECRYPT_LENGTH ) != 0 ) )
         goto rsa_loser;
 
-    rsa_status = sftk_fips_RSA_PowerUpSigSelfTest (HASH_AlgSHA1,
-                           rsa_public_key, rsa_private_key,
-                           rsa_known_plaintext_msg, FIPS_RSA_MESSAGE_LENGTH, 
-                           rsa_known_sha1_signature);
-    if( rsa_status != SECSuccess )
-        goto rsa_loser;
-
     rsa_status = sftk_fips_RSA_PowerUpSigSelfTest (HASH_AlgSHA256,
                            rsa_public_key, rsa_private_key,
                            rsa_known_plaintext_msg, FIPS_RSA_MESSAGE_LENGTH,
@@ -1822,7 +1936,7 @@ sftk_fips_RNG_PowerUpSelfTest( void )
 			0x7f,0x7e,0xc8,0xae,0x9c,0x09,0x99,0x7d,
 			0xbb,0x9e,0x48,0x7f,0xbb,0x96,0x46,0xb3,
 			0x03,0x75,0xf8,0xc8,0x69,0x45,0x3f,0x97,
-			0x5e,0x2e,0x48,0xe1,0x5d,0x58,0x97,0x4c};
+			0x5e,0x2e,0x48,0xe1,0x5d,0x58,0x97,0x4c };
    static const PRUint8 rng_known_result[] = {
 			0x16,0xe1,0x8c,0x57,0x21,0xd8,0xf1,0x7e,
 			0x5a,0xa0,0x16,0x0b,0x7e,0xa6,0x25,0xb4,
@@ -1830,67 +1944,36 @@ sftk_fips_RNG_PowerUpSelfTest( void )
 			0xbb,0xaa,0x2a,0x1b,0x22,0x33,0x2e,0x4a,
 			0x14,0x07,0x9d,0x52,0xfc,0x73,0x61,0x48,
 			0xac,0xc1,0x22,0xfc,0xa4,0xfc,0xac,0xa4,
-			0xdb,0xda,0x5b,0x27,0x33,0xc4,0xb3,0xec,
-			0xb0,0xf2,0xee,0x63,0x11,0x61,0xdb,0x30,
-			0xd3,0x04,0x6b,0x96,0x22,0x1e,0x17,0x24,
-			0x1a,0x54,0x70,0xf3,0x4d,0x1c,0x6a,0xb0,
-			0xf9,0xe3,0xc8,0x07,0x97,0x5f,0xbb,0xe5,
-			0xde,0xce,0xa9,0x3f,0x91,0xd3,0x82,0x33,
-			0x11,0x3f,0x5b,0xb2,0xa9,0x1e,0x71,0x59,
-			0x68,0x8f,0x7d,0x77,0xfd,0xf5,0xcb,0xc8,
-			0x8f,0x51,0xb9,0x62,0x30,0x1b,0x12,0xa5,
-			0x7a,0xe1,0xf3,0x15,0x49,0x15,0xe9,0xc4,
-			0x3d,0x2d,0x1f,0x8c,0xe8,0x4e,0xd1,0xe6,
-			0x4e,0xf1,0x7a,0x64,0x2e,0x05,0xd6,0xee,
-			0xb8,0x7b,0x71,0x82,0x38,0x2b,0xc5,0xdd,
-			0x3a,0x32,0xae,0x64,0x0e,0xed,0x30,0xb2,
-			0x00,0x72,0x61,0x65,0xfb,0x09,0x26,0x68,
-			0x3e,0x36,0xb3,0x15,0xe2,0x30,0xde,0x49,
-			0xed,0x60,0xc5,0x40,0xe1,0x1a,0xe9,0x33,
-			0x7f,0x77,0xb5,0xa9,0xf7,0xa1,0xb9,0xdb,
-			0x77,0x61,0x00,0xc2,0x18,0xa1,0xa1,0x3a,
-			0x0e,0x2a,0x6c,0xa1,0x3f,0x33,0xdd,0xb9,
-			0x23,0x48,0x75,0x50,0xd3,0xbb,0xd9,0x0e,
-			0xdb,0xb4,0x62,0x33,0x52,0x41,0x5c,0xfc,
-			0xdd,0x89,0xd6,0x60,0xe8,0x2b,0x6f,0xb2,
-			0x7f,0x4d,0x97,0x8c,0x69,0xa4,0x15,0x16,
-			0x4c,0x7f,0x4d,0x8d,0x2e,0xec,0xfa,0x0e,
-			0xfa,0x37,0xe9,0x9d,0x21,0x9b,0x69,0x2a,
-			0xc5,0x4f,0x5b,0x59,0xe9,0x98,0x73,0x54,
-			0x28,0x33,0x4d,0x7c,0x53,0x8c,0x43,0x2b,
-			0xc7,0x0e,0xfb,0x35,0x9d,0xf7,0x2e,0x1a,
-			0xaa,0x80,0xa3,0x70,0x2c,0x72,0x43,0xb0,
-			0x35,0x3b,0xe2,0x58,0x63,0xf8,0x1d,0xcd,
-			0x55,0x66,0xb8,0x1e,0x06,0xa5,0xb6,0x4d,
-			0xc2,0x9f,0x9b,0xde,0xa3,0xda,0x67,0x0e,
-			0xd9,0x4b,0xfd,0x29,0xba,0x16,0x4e,0x03,
-			0xe9,0x04,0x9a,0x67,0xf8,0xc4,0xb7,0x01,
-			0xba,0x3c,0x5f,0xdd,0x8e,0x56,0xf3,0xea,
-			0xf4,0xfb,0x75,0x76,0x30,0x20,0xe6,0xec,
-			0x44,0xc9,0x76,0xb2,0x21,0x0c,0x1c,0xb9,
-			0x5f,0x27,0xff,0x09,0x45,0x2c,0x26,0xfd,
-			0x27,0xb0,0xca,0x67,0xd3,0xb0,0x77,0x3e,
-			0x10,0x46,0xdd,0x81,0x70,0x47,0x5c,0x12,
-			0xe7,0x37,0x49,0x17,0xf5,0x04,0xbc,0x62,
-			0xef,0xba,0x6e,0x1d,0xb9,0x42,0xb5,0xf9,
-			0xda,0x2f,0x5b,0x05,0xa7,0x34,0x19,0xf6,
-			0xa4,0xdb,0x45,0xb0,0x18,0x6b,0x32,0x75,
-			0x0f,0x34,0xc8,0x1c,0x14,0xca,0x4f,0xf9,
-			0x43,0x76,0xa5,0x41,0xeb,0xd4,0x37,0xc9,
-			0xc8,0x94,0xe7,0x0f,0x4a,0xa1,0x72,0xc7,
-			0x48,0xbd,0x1c,0x84,0x74,0x73,0xd1,0x73,
-			0xcd,0x1e,0xf0,0xb9,0x66,0x00,0x63,0xab};
+			0xdb,0xda,0x5b,0x27,0x33,0xc4,0xb3 };
+   static const PRUint8 reseed_entropy[] = {
+			0xc6,0x0b,0x0a,0x30,0x67,0x07,0xf4,0xe2,
+			0x24,0xa7,0x51,0x6f,0x5f,0x85,0x3e,0x5d,
+			0x67,0x97,0xb8,0x3b,0x30,0x9c,0x7a,0xb1,
+			0x52,0xc6,0x1b,0xc9,0x46,0xa8,0x62,0x79 };
+   static const PRUint8 additional_input[] = {
+			0x86,0x82,0x28,0x98,0xe7,0xcb,0x01,0x14,
+			0xae,0x87,0x4b,0x1d,0x99,0x1b,0xc7,0x41,
+			0x33,0xff,0x33,0x66,0x40,0x95,0x54,0xc6,
+			0x67,0x4d,0x40,0x2a,0x1f,0xf9,0xeb,0x65 };
+   static const PRUint8 rng_reseed_result[] = {
+			0x02,0x0c,0xc6,0x17,0x86,0x49,0xba,0xc4,
+			0x7b,0x71,0x35,0x05,0xf0,0xdb,0x4a,0xc2,
+			0x2c,0x38,0xc1,0xa4,0x42,0xe5,0x46,0x4a,
+			0x7d,0xf0,0xbe,0x47,0x88,0xb8,0x0e,0xc6,
+			0x25,0x2b,0x1d,0x13,0xef,0xa6,0x87,0x96,
+			0xa3,0x7d,0x5b,0x80,0xc2,0x38,0x76,0x61,
+			0xc7,0x80,0x5d,0x0f,0x05,0x76,0x85 };
    static const PRUint8 Q[] = {
 			0x85,0x89,0x9c,0x77,0xa3,0x79,0xff,0x1a,
 			0x86,0x6f,0x2f,0x3e,0x2e,0xf9,0x8c,0x9c,
 			0x9d,0xef,0xeb,0xed};
-  static const PRUint8 GENX[] = {
+   static const PRUint8 GENX[] = {
 			0x65,0x48,0xe3,0xca,0xac,0x64,0x2d,0xf7,
 			0x7b,0xd3,0x4e,0x79,0xc9,0x7d,0xa6,0xa8,
 			0xa2,0xc2,0x1f,0x8f,0xe9,0xb9,0xd3,0xa1,
 			0x3f,0xf7,0x0c,0xcd,0xa6,0xca,0xbf,0xce,
 			0x84,0x0e,0xb6,0xf1,0x0d,0xbe,0xa9,0xa3};
-  static const PRUint8 rng_known_DSAX[] = {
+   static const PRUint8 rng_known_DSAX[] = {
 			0x7a,0x86,0xf1,0x7f,0xbd,0x4e,0x6e,0xd9,
 			0x0a,0x26,0x21,0xd0,0x19,0xcb,0x86,0x73,
 			0x10,0x1f,0x60,0xd7};
@@ -1898,6 +1981,7 @@ sftk_fips_RNG_PowerUpSelfTest( void )
 
 
    SECStatus rng_status = SECSuccess;
+   PR_STATIC_ASSERT(sizeof(rng_known_result) >= sizeof(rng_reseed_result));
    PRUint8 result[sizeof(rng_known_result)];
    PRUint8 DSAX[FIPS_DSA_SUBPRIME_LENGTH];
 
@@ -1909,10 +1993,24 @@ sftk_fips_RNG_PowerUpSelfTest( void )
    if (rng_status != SECSuccess) {
 	return ( CKR_DEVICE_ERROR );
    }
-   rng_status = PRNGTEST_Generate(result, sizeof result, NULL, 0);
+   rng_status = PRNGTEST_Generate(result, sizeof rng_known_result, NULL, 0);
    if ( ( rng_status != SECSuccess)  ||
         ( PORT_Memcmp( result, rng_known_result,
-                       sizeof result ) != 0 ) ) {
+                       sizeof rng_known_result ) != 0 ) ) {
+	PRNGTEST_Uninstantiate();
+	return ( CKR_DEVICE_ERROR );
+   }
+   rng_status = PRNGTEST_Reseed(reseed_entropy, sizeof reseed_entropy,
+				additional_input, sizeof additional_input);
+   if (rng_status != SECSuccess) {
+	PRNGTEST_Uninstantiate();
+	return ( CKR_DEVICE_ERROR );
+   }
+   rng_status = PRNGTEST_Generate(result, sizeof rng_reseed_result, NULL, 0);
+   if ( ( rng_status != SECSuccess)  ||
+        ( PORT_Memcmp( result, rng_reseed_result,
+                       sizeof rng_reseed_result ) != 0 ) ) {
+	PRNGTEST_Uninstantiate();
 	return ( CKR_DEVICE_ERROR );
    }
    rng_status = PRNGTEST_Uninstantiate();
diff --git a/security/nss/lib/softoken/legacydb/config.mk b/security/nss/lib/softoken/legacydb/config.mk
index f155a2aedd5..eb184790f76 100644
--- a/security/nss/lib/softoken/legacydb/config.mk
+++ b/security/nss/lib/softoken/legacydb/config.mk
@@ -90,21 +90,9 @@ EXTRA_SHARED_LIBS += \
 endif
 
 ifeq ($(OS_TARGET),SunOS)
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
 OS_LIBS += -lbsm 
 endif
 
-ifeq ($(OS_ARCH), HP-UX) 
-ifneq ($(OS_TEST), ia64)
-# pa-risc
-ifeq ($(USE_64), 1)
-MKSHLIB += +b '$$ORIGIN'
-endif
-endif
-endif
-
 ifeq ($(OS_TARGET),WINCE)
 DEFINES += -DDBM_USING_NSPR
 endif
diff --git a/security/nss/lib/softoken/pk11pars.h b/security/nss/lib/softoken/pk11pars.h
index 20e2c3cb680..dea16e75317 100644
--- a/security/nss/lib/softoken/pk11pars.h
+++ b/security/nss/lib/softoken/pk11pars.h
@@ -122,7 +122,7 @@ static PRBool secmod_argGetPair(char c) {
 }
 
 static PRBool secmod_argIsBlank(char c) {
-   return isspace(c);
+   return isspace((unsigned char )c);
 }
 
 static PRBool secmod_argIsEscape(char c) {
diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c
index f9572476f36..e536f8c104d 100644
--- a/security/nss/lib/softoken/pkcs11.c
+++ b/security/nss/lib/softoken/pkcs11.c
@@ -2589,8 +2589,6 @@ CK_RV nsc_CommonInitialize(CK_VOID_PTR pReserved, PRBool isFIPS)
 	crv = CKR_DEVICE_ERROR;
 	return crv;
     }
-    RNG_SystemInfoForRNG();
-
 
     /* NOTE:
      * we should be getting out mutexes from this list, not statically binding
diff --git a/security/nss/lib/softoken/pkcs11u.c b/security/nss/lib/softoken/pkcs11u.c
index a416c63f6a8..7f44873e759 100644
--- a/security/nss/lib/softoken/pkcs11u.c
+++ b/security/nss/lib/softoken/pkcs11u.c
@@ -143,7 +143,7 @@ sftk_FindTokenAttribute(SFTKTokenObject *object,CK_ATTRIBUTE_TYPE type)
 {
     SFTKAttribute *myattribute = NULL;
     SFTKDBHandle *dbHandle = NULL;
-    CK_RV crv;
+    CK_RV crv = CKR_HOST_MEMORY;
 
     myattribute = (SFTKAttribute*)PORT_Alloc(sizeof(SFTKAttribute));
     if (myattribute == NULL) {
diff --git a/security/nss/lib/softoken/sdb.c b/security/nss/lib/softoken/sdb.c
index 3a602771c55..f9d85130be0 100644
--- a/security/nss/lib/softoken/sdb.c
+++ b/security/nss/lib/softoken/sdb.c
@@ -324,7 +324,7 @@ sdb_getTempDir(sqlite3 *sqlDB)
 /*
  * Map SQL_LITE errors to PKCS #11 errors as best we can.
  */
-static int 
+static CK_RV
 sdb_mapSQLError(sdbDataType type, int sqlerr)
 {
     switch (sqlerr) {
@@ -731,6 +731,7 @@ sdb_FindObjectsInit(SDB *sdb, const CK_ATTRIBUTE *template, CK_ULONG count,
 
 loser: 
     if (findstmt) {
+	sqlite3_reset(findstmt);
 	sqlite3_finalize(findstmt);
     }
     if (sqlDB) {
@@ -1977,8 +1978,10 @@ s_open(const char *directory, const char *certPrefix, const char *keyPrefix,
     int inUpdate;
     PRUint32 accessOps;
 
-    *certdb = NULL;
-    *keydb = NULL;
+    if (certdb) 
+	*certdb = NULL;
+    if (keydb) 
+	*keydb = NULL;
     *newInit = 0;
 
 #ifdef SQLITE_UNSAFE_THREADS
diff --git a/security/nss/lib/softoken/sftkdb.c b/security/nss/lib/softoken/sftkdb.c
index 655e196870a..0a4d4d3ef92 100644
--- a/security/nss/lib/softoken/sftkdb.c
+++ b/security/nss/lib/softoken/sftkdb.c
@@ -1328,12 +1328,13 @@ CK_RV
 sftkdb_SetAttributeValue(SFTKDBHandle *handle, SFTKObject *object,
                                 const CK_ATTRIBUTE *template, CK_ULONG count)
 {
-    CK_RV crv = CKR_OK;
     CK_ATTRIBUTE *ntemplate;
     unsigned char *data = NULL;
     PLArenaPool *arena = NULL;
-    CK_OBJECT_HANDLE objectID = (object->handle & SFTK_OBJ_ID_MASK);
     SDB *db;
+    CK_RV crv = CKR_OK;
+    CK_OBJECT_HANDLE objectID = (object->handle & SFTK_OBJ_ID_MASK);
+    PRBool inTransaction = PR_FALSE;
 
     if (handle == NULL) {
 	return CKR_TOKEN_WRITE_PROTECTED;
@@ -1363,18 +1364,20 @@ sftkdb_SetAttributeValue(SFTKDBHandle *handle, SFTKObject *object,
     /* make sure we don't have attributes that conflict with the existing DB */
     crv = sftkdb_checkConflicts(db, object->objclass, template, count, objectID);
     if (crv != CKR_OK) {
-	return crv;
+	goto loser;
     }
 
     arena = PORT_NewArena(256);
     if (arena ==  NULL) {
-	return CKR_HOST_MEMORY;
+	crv = CKR_HOST_MEMORY;
+	goto loser;
     }
 
     crv = (*db->sdb_Begin)(db);
     if (crv != CKR_OK) {
 	goto loser;
     }
+    inTransaction = PR_TRUE;
     crv = sftkdb_setAttributeValue(arena, handle, db, 
 				   objectID, template, count);
     if (crv != CKR_OK) {
@@ -1382,14 +1385,16 @@ sftkdb_SetAttributeValue(SFTKDBHandle *handle, SFTKObject *object,
     }
     crv = (*db->sdb_Commit)(db);
 loser:
-    if (crv != CKR_OK) {
+    if (crv != CKR_OK && inTransaction) {
 	(*db->sdb_Abort)(db);
     }
     if (data) {
 	PORT_Free(ntemplate);
 	PORT_Free(data);
     }
-    PORT_FreeArena(arena, PR_FALSE);
+    if (arena) {
+	PORT_FreeArena(arena, PR_FALSE);
+    }
     return crv;
 }
 
@@ -2113,7 +2118,8 @@ sftkdb_updateObjectTemplate(PRArenaPool *arena, SDB *db,
 		 * give them a new CKA_ID */
 		/* NOTE: this changes ptemplate */
 		attr = sftkdb_getAttributeFromTemplate(CKA_ID,ptemplate,*plen);
-		crv = sftkdb_incrementCKAID(arena, attr); 
+		crv = attr ? sftkdb_incrementCKAID(arena, attr) 
+		           : CKR_HOST_MEMORY; 
 		/* in the extremely rare event that we needed memory and
 		 * couldn't get it, just drop the key */
 		if (crv != CKR_OK) {
diff --git a/security/nss/lib/softoken/sftkmod.c b/security/nss/lib/softoken/sftkmod.c
index 73c7dbb642b..c89b7daaed7 100644
--- a/security/nss/lib/softoken/sftkmod.c
+++ b/security/nss/lib/softoken/sftkmod.c
@@ -628,12 +628,16 @@ sftkdb_DeleteSecmodDB(SDBType dbType, const char *appName,
     } 
     fclose(fd);
     fclose(fd2);
-    /* rename dbname2 to dbname */
     if (found) {
+	/* rename dbname2 to dbname */
 	PR_Delete(dbname);
 	PR_Rename(dbname2,dbname);
+    } else {
+	PR_Delete(dbname2);
     }
     PORT_Free(dbname2);
+    PORT_Free(lib);
+    PORT_Free(name);
     return SECSuccess;
 
 loser:
@@ -647,6 +651,8 @@ loser:
 	PR_Delete(dbname2);
 	PORT_Free(dbname2);
     }
+    PORT_Free(lib);
+    PORT_Free(name);
     return SECFailure;
 }
 
@@ -695,9 +701,9 @@ sftkdb_AddSecmodDB(SDBType dbType, const char *appName,
 	    block = sftkdb_DupCat(block, module);
 	    break;
 	}
-	value = sftk_argFetchValue(&keyEnd[1], &count);
 	block = sftkdb_DupnCat(block, module, keyEnd-module+1);
 	if (block == NULL) { goto loser; }
+	value = sftk_argFetchValue(&keyEnd[1], &count);
 	if (value) {
 	    block = sftkdb_DupCat(block, sftk_argStrip(value));
 	    PORT_Free(value);
diff --git a/security/nss/lib/softoken/sftkpars.c b/security/nss/lib/softoken/sftkpars.c
index 014514be216..aefd69639ce 100644
--- a/security/nss/lib/softoken/sftkpars.c
+++ b/security/nss/lib/softoken/sftkpars.c
@@ -74,7 +74,7 @@ static PRBool sftk_argGetPair(char c) {
 }
 
 static PRBool sftk_argIsBlank(char c) {
-   return isspace(c);
+   return isspace((unsigned char )c);
 }
 
 static PRBool sftk_argIsEscape(char c) {
diff --git a/security/nss/lib/softoken/sftkpwd.c b/security/nss/lib/softoken/sftkpwd.c
index 3559898cfe7..9d56f1b1192 100644
--- a/security/nss/lib/softoken/sftkpwd.c
+++ b/security/nss/lib/softoken/sftkpwd.c
@@ -610,13 +610,13 @@ sftkdb_FreeUpdatePasswordKey(SFTKDBHandle *handle)
 {
     SECItem *key = NULL;
 
-    /* if we're a cert db, we don't have one */
-    if (handle->type == SFTK_CERTDB_TYPE) {
+    /* don't have one */
+    if (!handle) {
 	return;
     }
 
-    /* don't have one */
-    if (!handle) {
+    /* if we're a cert db, we don't have one */
+    if (handle->type == SFTK_CERTDB_TYPE) {
 	return;
     }
 
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
index 67ee0b72be0..f292b856de1 100644
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -57,7 +57,7 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.12.4" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION  "3.12.4.4" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   12
 #define SOFTOKEN_VPATCH   4
diff --git a/security/nss/lib/sqlite/config.mk b/security/nss/lib/sqlite/config.mk
index fa476ff9fe2..219bb5bfb28 100644
--- a/security/nss/lib/sqlite/config.mk
+++ b/security/nss/lib/sqlite/config.mk
@@ -55,17 +55,6 @@ endif
 endif
 
 ifeq ($(OS_TARGET),SunOS)
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
 OS_LIBS += -lbsm 
 endif
 
-ifeq ($(OS_ARCH), HP-UX) 
-ifneq ($(OS_TEST), ia64)
-# pa-risc
-ifeq ($(USE_64), 1)
-MKSHLIB += +b '$$ORIGIN'
-endif
-endif
-endif
diff --git a/security/nss/lib/ssl/config.mk b/security/nss/lib/ssl/config.mk
index 8901280f6a9..5bbcd33c817 100644
--- a/security/nss/lib/ssl/config.mk
+++ b/security/nss/lib/ssl/config.mk
@@ -107,19 +107,4 @@ ifeq ($(OS_ARCH), BeOS)
 EXTRA_SHARED_LIBS += -lbe
 endif
 
-ifeq ($(OS_TARGET),SunOS)
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
-endif
-
-ifeq ($(OS_ARCH), HP-UX) 
-ifneq ($(OS_TEST), ia64)
-# pa-risc
-ifeq ($(USE_64), 1)
-MKSHLIB += +b '$$ORIGIN'
-endif
-endif
-endif
-
 endif
diff --git a/security/nss/lib/ssl/sslmutex.c b/security/nss/lib/ssl/sslmutex.c
index a91dde3efc7..6b5dbd16639 100644
--- a/security/nss/lib/ssl/sslmutex.c
+++ b/security/nss/lib/ssl/sslmutex.c
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslmutex.c,v 1.23 2008/12/02 06:36:59 nelson%bolyard.com Exp $ */
+/* $Id: sslmutex.c,v 1.24 2009/06/05 02:34:14 nelson%bolyard.com Exp $ */
 
 #include "seccomon.h"
 /* This ifdef should match the one in sslsnce.c */
@@ -89,7 +89,7 @@ static SECStatus single_process_sslMutex_Lock(sslMutex* pMutex)
     return SECSuccess;
 }
 
-#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
+#if defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/security/nss/lib/ssl/sslmutex.h b/security/nss/lib/ssl/sslmutex.h
index aeeef64e10d..0fdb6852a3c 100644
--- a/security/nss/lib/ssl/sslmutex.h
+++ b/security/nss/lib/ssl/sslmutex.h
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslmutex.h,v 1.11 2008/12/02 06:36:59 nelson%bolyard.com Exp $ */
+/* $Id: sslmutex.h,v 1.12 2009/06/05 02:34:15 nelson%bolyard.com Exp $ */
 #ifndef __SSLMUTEX_H_
 #define __SSLMUTEX_H_ 1
 
@@ -83,7 +83,7 @@ typedef struct
 
 typedef int    sslPID;
 
-#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
+#elif defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
 
 #include <sys/types.h>
 #include "prtypes.h"
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index 29864543b96..5387f2c2012 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsnce.c,v 1.49 2008/12/02 06:36:59 nelson%bolyard.com Exp $ */
+/* $Id: sslsnce.c,v 1.50 2009/06/05 02:34:15 nelson%bolyard.com Exp $ */
 
 /* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server 
  * cache sids!
@@ -260,7 +260,7 @@ static PRBool isMultiProcess  = PR_FALSE;
 #define MAX_SSL3_TIMEOUT      86400L  /* 24 hours */
 #define MIN_SSL3_TIMEOUT          5   /* seconds  */
 
-#if defined(AIX) || defined(LINUX) || defined(VMS) || defined(NETBSD) || defined(OPENBSD)
+#if defined(AIX) || defined(LINUX) || defined(NETBSD) || defined(OPENBSD)
 #define MAX_SID_CACHE_LOCKS 8	/* two FDs per lock */
 #elif defined(OSF1)
 #define MAX_SID_CACHE_LOCKS 16	/* one FD per lock */
diff --git a/security/nss/lib/util/config.mk b/security/nss/lib/util/config.mk
index b51f3db5891..bc025571c3e 100644
--- a/security/nss/lib/util/config.mk
+++ b/security/nss/lib/util/config.mk
@@ -80,25 +80,3 @@ EXTRA_SHARED_LIBS += \
 
 endif
 
-ifeq ($(OS_TARGET),SunOS)
-ifeq ($(BUILD_SUN_PKG), 1)
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-ifeq ($(USE_64), 1)
-MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
-else
-MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
-endif
-else
-MKSHLIB += -R '$$ORIGIN'
-endif
-endif
-
-ifeq ($(OS_ARCH), HP-UX) 
-ifneq ($(OS_TEST), ia64)
-# pa-risc
-ifeq ($(USE_64), 1)
-MKSHLIB += +b '$$ORIGIN'
-endif
-endif
-endif
diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h
index 83b057117ed..bb100479bdb 100644
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -51,7 +51,7 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.12.4 Beta"
+#define NSSUTIL_VERSION  "3.12.4.4 Beta"
 #define NSSUTIL_VMAJOR   3
 #define NSSUTIL_VMINOR   12
 #define NSSUTIL_VPATCH   4
diff --git a/security/nss/pkg/solaris/SUNWtlsd/prototype b/security/nss/pkg/solaris/SUNWtlsd/prototype
index fab227f2991..6e9ccf51999 100755
--- a/security/nss/pkg/solaris/SUNWtlsd/prototype
+++ b/security/nss/pkg/solaris/SUNWtlsd/prototype
@@ -38,7 +38,7 @@
 #
 # ***** END LICENSE BLOCK *****
 #
-#ident	"$Id: prototype,v 1.9 2009/03/02 23:21:03 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: prototype,v 1.10 2009/06/25 01:29:18 julien.pierre.boogz%sun.com Exp $"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -159,3 +159,4 @@ f none usr/include/mps/ssl.h 0644 root bin
 f none usr/include/mps/sslerr.h 0644 root bin
 f none usr/include/mps/sslproto.h 0644 root bin
 f none usr/include/mps/sslt.h 0644 root bin
+f none usr/include/mps/utilrename.h 0644 root bin
diff --git a/security/nss/tests/chains/chains.sh b/security/nss/tests/chains/chains.sh
index ffa6aed5c80..d6e1b76ca56 100644
--- a/security/nss/tests/chains/chains.sh
+++ b/security/nss/tests/chains/chains.sh
@@ -167,7 +167,8 @@ n
 6
 7
 9
-n" > ${CU_DATA}
+n
+" > ${CU_DATA}
 
     TESTNAME="Creating Root CA ${ENTITY}"
     echo "${SCRIPTNAME}: ${TESTNAME}"
@@ -204,20 +205,25 @@ create_cert_req()
 
     CA_FLAG=
     EXT_DATA=
+    OPTIONS=
+
     if [ "${TYPE}" != "EE" ]; then
         CA_FLAG="-2"
         EXT_DATA="y
 -1
-y"
+y
+"
     fi
 
+    process_crldp
+
     echo "${EXT_DATA}" > ${CU_DATA}
 
     TESTNAME="Creating ${TYPE} certifiate request ${REQ}"
     echo "${SCRIPTNAME}: ${TESTNAME}"
-    echo "certutil -s \"CN=${ENTITY} ${TYPE}, O=${ENTITY}, C=US\" ${CTYPE_OPT} -R ${CA_FLAG} -d ${ENTITY_DB} -f ${ENTITY_DB}/dbpasswd -z ${NOISE_FILE} -o ${REQ} < ${CU_DATA}"
+    echo "certutil -s \"CN=${ENTITY} ${TYPE}, O=${ENTITY}, C=US\" ${CTYPE_OPT} -R ${CA_FLAG} -d ${ENTITY_DB} -f ${ENTITY_DB}/dbpasswd -z ${NOISE_FILE} -o ${REQ} ${OPTIONS} < ${CU_DATA}"
     print_cu_data
-    ${BINDIR}/certutil -s "CN=${ENTITY} ${TYPE}, O=${ENTITY}, C=US" ${CTYPE_OPT} -R ${CA_FLAG} -d ${ENTITY_DB} -f ${ENTITY_DB}/dbpasswd -z ${NOISE_FILE} -o ${REQ} < ${CU_DATA} 
+    ${BINDIR}/certutil -s "CN=${ENTITY} ${TYPE}, O=${ENTITY}, C=US" ${CTYPE_OPT} -R ${CA_FLAG} -d ${ENTITY_DB} -f ${ENTITY_DB}/dbpasswd -z ${NOISE_FILE} -o ${REQ} ${OPTIONS} < ${CU_DATA} 
     html_msg $? 0 "${SCENARIO}${TESTNAME}"
 }
 
@@ -395,10 +401,71 @@ process_ocsp()
 ${NSS_AIA_OCSP}:${OCSP}
 0
 n
-n"
+n
+"
     fi
 }
 
+process_crldp()
+{
+    if [ -n "${CRLDP}" ]; then
+        OPTIONS="${OPTIONS} -4"
+
+        EXT_DATA="${EXT_DATA}1
+"
+
+        for ITEM in ${CRLDP}; do
+            CRL_PUBLIC="${HOST}-$$-${ITEM}.crl"
+
+            EXT_DATA="${EXT_DATA}7
+${NSS_AIA_HTTP}/${CRL_PUBLIC}
+"
+        done
+
+        EXT_DATA="${EXT_DATA}0
+0
+0
+n
+n
+"
+    fi
+}
+
+process_ku_ns_eku()
+{
+    if [ -n "${EXT_KU}" ]; then
+        OPTIONS="${OPTIONS} --keyUsage ${EXT_KU}"
+    fi
+    if [ -n "${EXT_NS}" ]; then
+        EXT_NS_KEY=$(echo ${EXT_NS} | cut -d: -f1)
+        EXT_NS_CODE=$(echo ${EXT_NS} | cut -d: -f2)
+
+        OPTIONS="${OPTIONS} --nsCertType ${EXT_NS_KEY}"
+        DATA="${DATA}${EXT_NS_CODE}
+-1
+n
+"
+    fi
+    if [ -n "${EXT_EKU}" ]; then
+        OPTIONS="${OPTIONS} --extKeyUsage ${EXT_EKU}"
+    fi
+}
+
+copy_crl()
+
+{
+    if [ -z "${NSS_AIA_PATH}" ]; then
+        return;
+    fi
+
+    CRL_LOCAL="${COPYCRL}.crl"
+    CRL_PUBLIC="${HOST}-$$-${COPYCRL}.crl"
+
+    cp ${CRL_LOCAL} ${NSS_AIA_PATH}/${CRL_PUBLIC} 2> /dev/null
+    chmod a+r ${NSS_AIA_PATH}/${CRL_PUBLIC}
+    echo ${NSS_AIA_PATH}/${CRL_PUBLIC} >> ${AIA_FILES}
+}
+
 ########################## process_extension ###########################
 # local shell function to process entity extension parameters and 
 # generate input for certutil
@@ -413,6 +480,7 @@ process_extensions()
     process_inhibit
     process_aia
     process_ocsp
+    process_ku_ns_eku
 }
 
 ############################## sign_cert ###############################
@@ -663,16 +731,19 @@ verify_cert()
         fi
     done
 
-    TESTNAME="Verifying certificate(s) ${VFY_LIST} with flags ${REV_OPTS} ${DB_OPT} ${FETCH_OPT} ${POLICY_OPT} ${TRUST_OPT}"
+    VFY_OPTS_TNAME="${REV_OPTS} ${DB_OPT} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${TRUST_OPT}"
+    VFY_OPTS_ALL="${DB_OPT} -pp -vv ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
+
+    TESTNAME="Verifying certificate(s) ${VFY_LIST} with flags ${VFY_OPTS_TNAME}"
     echo "${SCRIPTNAME}: ${TESTNAME}"
-    echo "vfychain ${DB_OPT} -pp -vv ${REV_OPTS} ${FETCH_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
+    echo "vfychain ${VFY_OPTS_ALL}"
 
     if [ -z "${MEMLEAK_DBG}" ]; then
-        VFY_OUT=$(${BINDIR}/vfychain ${DB_OPT} -pp -vv ${REV_OPTS} ${FETCH_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT} 2>&1)
+        VFY_OUT=$(${BINDIR}/vfychain ${VFY_OPTS_ALL} 2>&1)
         RESULT=$?
         echo "${VFY_OUT}"
     else 
-        VFY_OUT=$(${RUN_COMMAND_DBG} ${BINDIR}/vfychain ${REV_OPTS} ${DB_OPT} -pp -vv ${FETCH_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT} 2>> ${LOGFILE})
+        VFY_OUT=$(${RUN_COMMAND_DBG} ${BINDIR}/vfychain ${VFY_OPTS_ALL} 2>> ${LOGFILE})
         RESULT=$?
         echo "${VFY_OUT}"
     fi
@@ -699,7 +770,6 @@ verify_cert()
     fi
 }
 
-
 check_ocsp()
 {
     OCSP_CERT=$1
@@ -722,7 +792,7 @@ check_ocsp()
         ping -n 1 ${OCSP_HOST}
         return $?
     elif [ "${OS_ARCH}" = "HP-UX" ]; then
-        ping ${OCSP_HOST} -c 1
+        ping ${OCSP_HOST} -n 1
         return $?
     else
         ping -c 1 ${OCSP_HOST}
@@ -780,9 +850,13 @@ parse_config()
             MAPPING=
             INHIBIT=
             AIA=
+            CRLDP=
             OCSP=
             DB=
             EMAILS=
+            EXT_KU=
+            EXT_NS=
+            EXT_EKU=
             ;;
         "type")
             TYPE="${VALUE}"
@@ -800,6 +874,9 @@ parse_config()
             MAPPING=
             INHIBIT=
             AIA=
+            EXT_KU=
+            EXT_NS=
+            EXT_EKU=
             ;;
         "ctype") 
             CTYPE="${VALUE}"
@@ -816,6 +893,9 @@ parse_config()
         "aia")
             AIA="${AIA} ${VALUE}"
             ;;
+        "crldp")
+            CRLDP="${CRLDP} ${VALUE}"
+            ;;
         "ocsp")
             OCSP="${VALUE}"
             ;;
@@ -842,6 +922,10 @@ parse_config()
         "serial")
             SERIAL="${VALUE}"
             ;;
+        "copycrl")
+            COPYCRL="${VALUE}"
+            copy_crl "${COPYCRL}"
+            ;;
         "verify")
             VERIFY="${VALUE}"
             TRUST=
@@ -849,6 +933,7 @@ parse_config()
             FETCH=
             EXP_RESULT=
             REV_OPTS=
+            USAGE_OPT=
             ;;
         "cert")
             VERIFY="${VERIFY} ${VALUE}"
@@ -907,6 +992,18 @@ parse_config()
                 break;
             fi
             ;;
+        "ku")
+            EXT_KU="${VALUE}"
+            ;;
+        "ns")
+            EXT_NS="${VALUE}"
+            ;;
+        "eku")
+            EXT_EKU="${VALUE}"
+            ;;
+        "usage")
+            USAGE_OPT="-u ${VALUE}"
+            ;;
         "")
             if [ -n "${ENTITY}" ]; then
                 if [ -z "${DB}" ]; then
diff --git a/security/nss/tests/dbtests/dbtests.sh b/security/nss/tests/dbtests/dbtests.sh
index e48d4dae9d1..5614e51202b 100755
--- a/security/nss/tests/dbtests/dbtests.sh
+++ b/security/nss/tests/dbtests/dbtests.sh
@@ -80,8 +80,6 @@ dbtest_init()
   fi
 
   SCRIPTNAME="dbtests.sh"
-  DBTEST_LOG=${HOSTDIR}/dbtest.log    #we don't want all the errormessages 
-         # in the output.log, otherwise we can't tell what's a real error
   RONLY_DIR=${HOSTDIR}/ronlydir
   EMPTY_DIR=${HOSTDIR}/emptydir
   CONFLICT_DIR=${HOSTDIR}/conflictdir
@@ -283,5 +281,5 @@ dbtest_main()
 ################## main #################################################
 
 dbtest_init 
-dbtest_main >$DBTEST_LOG 2>&1
+dbtest_main 2>&1
 dbtest_cleanup
diff --git a/security/nss/tests/libpkix/certs/PayPalEE.cert b/security/nss/tests/libpkix/certs/PayPalEE.cert
index 1a8a0859330596e5b06b9f2899f7824077af6898..6e7f755542f4bf82aa4c6122d5da340fdcf4d14c 100644
GIT binary patch
delta 821
zcmcb>eVW_Qpo#UkK@-dR1<Xv0OiTjtz7uvZ9A@7zwRd{P!U(zF2E1&XT5TR}-+37s
zSy>qj8h1@JY~?aBFk)j4WnmW9o_Ii0+S$=SPMp`k(!j*X!T=1S#CZ)33``6RH*+wW
zGuA(OVSeq!eZl8?fzwTzZ36q-zbv1Bf8mLJn@^pa=5pHDKKhjE3M1C}vJua|H`r-C
zdc?D3Z^Y)~oBfnGm;?kxe>CQd{Mv3|@hf1Te*W5^6NhHMcdm0hTpiNp7<lsH&4WKZ
zqC}IEpE8!sKY3#B_TxR7lk{HKUVr)bL8sTvib<ts57lQgF*7nSE^cD{Y|zB`-hdP6
zc3EK-CIbcoSrC(tMT|vc=j!UB%gaOi?=vVUiuT<9bo<$I8v|~TG(QUqGZX6q11Ati
zp2ZsIQS$|+3yj+gGfGMdtn~F=!-7+jON&x<lZ$fn%2JCmi!;;n^pf*)p)y=WsYV6{
zW_m#B$;`~|^<Ya?S;P!P*f_M=fWgYn%m`;O8OVd|QD%`a5Ni<m(-p95-cHr1>d;pI
zsSL^eFC(&@4QgPD85vm$4Dt+gVSEF|Hbrzd<tG;xpg79F%oeVm3DXaWnTaUM;l7*f
z!qQXUwvs1(g}#0McmJaq3r+|+Z~J0@yqRsqT=`Gg?PZVlom5`yzGd@K?^hG1c*;F%
z=TSO!Eu-$5n$MBz`tzoBewA7=FYkcd`%9C2mX%5TwJrBZJ-z48-)&j}8&amTEV8Pt
zUSaj*)4aniZoZ2w+FIwwd`qmTY3h0`dMRu7f$)!$CQPf(<6(cF@HBkYB*88v;ca2J
zRxzzUbn)tyiH~9<7p@IcKAdIf7cs;B3cG=8g}+(nA<j!pb1t=5&s=ULuNi%AS>?a@
z!rN=3KXRY8)rx7YI+Afza|^%u3KbXUFVP9*lix|Jt#*IC|F2Bd+QiG>4#({^;FR{=
VxJmd-|J}C{pB7GW`NQ<!8vq;iKuZ7s

delta 810
zcmX@jeSzE1po#U2K@-cC1<Xv0OiTjFzUO2T=l{-DlVe>Qy|T5<fR~L^tIebBJ1-+6
zD=ULR<GzW8ty~rcW^Bx%EX>0C6Ax(02fI5fI6E51iSrs*7?>Iu8Gu0)kZTFzZf0RL
zXRN;|c>4&~p$yfEABs^+N?UJ--d~U!>L9v}yJ+L1HZCWJ7G)QeUCU}!eL5>QtmQfx
zS#jz2Csi(f>-0&2w+gMb?XP*Z84DPCh)!-<YSgers9dDr$E?b!eU=^~I+@KyDk<#}
zdA;VYM~{DGii?es?~Curcq_sEpu%a6YwY81_dQ)-GBGnUFfMLl{9@3=_`!e^=zdvY
z7A6A*16dH0k420{q~%EM>wrej15R5{xM}ZFdG09MuWi5$lICY&VP;}oFxi>eUEU5P
zAkShB^qcVl!v*?nx)~)U1y=g{u3?^eB{`E7nMLYB3}85z=_MEC7-)brsIn*;$g^>1
zvjKyVotY8NVq)V=X!Brf`{BgG2vh)6smvl_Al4w_=X^r8?7ew#mH(%R{3)L;9$npg
z-=GYpkCBlj%OJx*8^$+aY?DVg!vko&ZhmrcfnHf^QD$*wdY)c#ey)KfTs0G#qjeKA
z6H(N{JY&z&Q=e!Z7{1g-^|BIc#LR{^`L{7WHy&L6$=c#J=cLsQ(TU$o%umkB-Rxm!
zccc5I)U?_aCd(t*^j>V5dHQl9`!uf;YSj&fhYIRm`l|_K>Gd=B%(P;26L~*9=I!g=
z{2d2=-}F7`R^DWrcFX*|{AI7BAKCttP5s|`$GBu2&uy04j$>x^yn7}7am`VFo363p
zJJ;P8IumRjM<v~w`AQ_?r<e5nI|>`vp8PKn_vw655-m69Q=-SpU(fr`%{V+&(`UcY
zj-sBZgqe3&6)y5%&0KI#ZN|QJH|}nZe6=c+=j$o$@c+g>uU<}8?f3Bi@#Mgd7}4F=
aS?81pe@<t#5&gK!U3C4o6|s+*!W;o0&?>S3

diff --git a/security/nss/tests/libpkix/certs/PayPalICA.cert b/security/nss/tests/libpkix/certs/PayPalICA.cert
index 28e971d684413f6336f2a1197e655cb1c2c9b4fc..459373be94872c6cf99e61b0550d14e82f28497d 100644
GIT binary patch
delta 643
zcmV-}0(||B4Co6VFoFf-FoFckpaTK{0s;_QcUi_4gyCMtC%`h5DJW}^AN~QlkugY<
zW&u44G%zv-162eA6DyOg0V$K(0V98y+n`nJoc$Mh<C<<19kE-OBZn4lhjyH`I6JkV
zdb9^)2^r=ph)AjDowhJq2$u}(s^k`Fa$+Nz`+8I;n8ge&x7Q-J$oV)I$KBd7Mw*lq
zj-Kv#ptmB_NmQ3j<#bz;yzFc&-{--$8yZz>W(Wg+MX#DO@esglnM#r*F$jNc-2y&g
zc6fNU?S40|Z1aiXx8d9s%(qsbfS|Dje@-_Q|F<t5j|MnDP`7C)qqSyVHX2e$LuOLn
zqLNS37+}8R>RuUf1;3sgY-n;NZ?k)I$!)z7|C>QFUi9dG#S5cMWYJE%CJ1Hw8JAdi
z;WNMOXg;wgMQ_03?3ZcxT+=T1Q33-200E<d0n#vn0nRWT1_M<c4g?ki6#R-%x}Lcu
zT6<N6Pn7^;kLg%zLz5{3lat;9y8$<ongn!zmZJK9<~{AyE6%qSKfrPWUyHgHkR|uR
zgV@J)G-GHIQw&pyd&yP_r^7ZxP7cswVzY+&=%Jf5XN^-L7e4*0?q@DT;$43;gz}<r
zz;1$<z%>0O#v_02=CH+ALxi&4E%DIyNFNk&SF)@z;g=*M$rD|4<woxbe4gQ%F$xHO
zc^i*$pBHAxIM42km$nAEb4KLTl)>d-wIy{e*=aHC&6dNXcKzsdM643IO}|m-xzt2X
zC(EuN(S9m?wqr-0cDk3)7Uv6WZTCZOGYcs&clw?A^-j2Uv&|T^`5^B-+vduxo6t_u
dhp7#wL~~Hxa9i!IeoDL|)u<-q!i69L4cVLfEG+;4

delta 681
zcmV;a0#^O#3yusQFoFgOFoFc~paTK{0s;^bDgbRa<q&Vy%6!A`y381nAN~QpkugY<
zW&u44I50K_162eA6EBmk0VxAhM?;g<0VIFDR*1TYG-PDY&C0Ou=NWUwa@o5@ytSzR
zgT5RC+wF<BE)W_eyj99Up`Q!S8D4O?UO7viF&tlqt}3diE20}a5F=j`vE2xaP88aM
zf#bD|<7n+9XU<l(tebO|MB9ptv)1r&laAYQR7&e}S!$1PQ7i+Wm(k1-dc0x{l`4P9
z9CcUe^~dVEgf+{@g<5{(P2mxjeGVWrMceVB3G3@Up177nUNlPxB_2Z>qS?2K0W>|s
z_~oxpjQ`DL@FPyem$O{jkQ{=A4F(OtBDQ-dqyxiDQ_)zwa=ZvR{GfKIsOd{?h&|)8
zF(r(1DM$`7c?Ru0L-h9K>HK}ZjtDN*9|8jb00E<d0rW6}0q`&#1_M<c4g?ki6i!3P
z9d_?GQ+iMGSZ|c`IO5g4-;*T+lOZ4m163U*1Q{?F1_@w>NCAfULIeQ@3Sfpv0fzWR
z0SEz;w*$NZIFob)bbnf+vA^q$)HtYsa>Cp=F07|<`75KlN4srlZxA+^jK@|kyS%GP
zn|jvrf|KAB{)*0nw}ac0hpVh*c}e|Osj<!pAG#0~#0d^!<M|3D)nu6P@~97XGJcWf
z81B61+R#poc)Q}Az*#H6&Xo-$406geUT`9bD@w5OXovIeM1PGaKzBKANODCnU28cG
zh63tlnUgUO-)G*YpNySM&T(%#A@;d6KlyIhn)g21^MPM_Ty2kh_L+3I|Kt~4?O|T4
zNV}GeW<@!)5(@Tk>6~^VOJM0L8#GDxqSR-=u_mn(y4i#Q!K>kpZEzMlcdU_`yBZ(b
PSf}Jq!C|hvq5}R)h59)g


From 037b79d8508aab18c04f594525689cd74a6cf026 Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Tue, 28 Jul 2009 17:16:51 -0700
Subject: [PATCH 045/175] Another attempt to fix bug 503988: change the way we
 invoke find, check the Find bar's status afterwards.

---
 docshell/test/chrome/bug298622_window.xul | 33 ++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/docshell/test/chrome/bug298622_window.xul b/docshell/test/chrome/bug298622_window.xul
index 0402bac669d..961d17f3f17 100755
--- a/docshell/test/chrome/bug298622_window.xul
+++ b/docshell/test/chrome/bug298622_window.xul
@@ -27,19 +27,6 @@
       tests.next();
     }
 
-    ////
-    // Enter a string in the find bar's search field, by issuing
-    // a series of key events to it.
-    //
-    function enterStringIntoFindField(aString) {
-      for (var i=0; i < aString.length; i++) {
-        var event = document.createEvent("KeyEvents");
-        event.initKeyEvent("keypress", true, true, null, false, false,
-                           false, false, 0, aString.charCodeAt(i));
-        gFindBar._findField.inputField.dispatchEvent(event);
-      }
-    }
-
     ////
     // Generator function for test steps for bug 298622:  
     // Find should work correctly on a page loaded from the
@@ -85,7 +72,15 @@
       };
       document.getElementById("cmd_find").doCommand();
       ok(!gFindBar.hidden, "failed to open findbar");
-      enterStringIntoFindField("A generic page");
+      gFindBar._findField.value = "A generic page";
+      gFindBar._find();
+      SimpleTest.executeSoon(nextTest);
+      yield;
+
+      // Make sure Find bar's internal status is not 'notfound'
+      isnot(gFindBar._findField.getAttribute("status"), "notfound",
+         "Findfield status attribute should not have been 'notfound'" +
+         " after Find");
 
       // Make sure the key events above have time to be processed
       // before continuing
@@ -122,8 +117,16 @@
       gFindBar = document.getElementById("FindToolbar");
       document.getElementById("cmd_find").doCommand();
       ok(!gFindBar.hidden, "failed to open findbar");
-      enterStringIntoFindField("find this");
+      gFindBar._findField.value = "find this";
+      gFindBar._find();
+      SimpleTest.executeSoon(nextTest);
+      yield;
 
+      // Make sure Find bar's internal status is not 'notfound'
+      isnot(gFindBar._findField.getAttribute("status"), "notfound",
+         "Findfield status attribute should not have been 'notfound'" +
+         " after Find");
+ 
       // Make sure the key events above have time to be processed
       // before continuing
       waitForTrue(function() {

From 3c733aeb5364336ad98de3890513c264ceffbceb Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Tue, 28 Jul 2009 17:26:39 -0700
Subject: [PATCH 046/175] add reftest for bug 467472

---
 layout/reftests/svg/dynamic-marker-02-ref.svg | 18 +++++++++
 layout/reftests/svg/dynamic-marker-02.svg     | 37 +++++++++++++++++++
 layout/reftests/svg/reftest.list              |  1 +
 3 files changed, 56 insertions(+)
 create mode 100644 layout/reftests/svg/dynamic-marker-02-ref.svg
 create mode 100644 layout/reftests/svg/dynamic-marker-02.svg

diff --git a/layout/reftests/svg/dynamic-marker-02-ref.svg b/layout/reftests/svg/dynamic-marker-02-ref.svg
new file mode 100644
index 00000000000..71d3e63802c
--- /dev/null
+++ b/layout/reftests/svg/dynamic-marker-02-ref.svg
@@ -0,0 +1,18 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/licenses/publicdomain/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+
+  <defs>
+	  <marker style="overflow: visible" id="m1" orient="auto" markerUnits="strokeWidth">
+		  <rect width="100%" height="100%" fill="blue"/>
+	  </marker>
+  </defs>
+
+	
+  <rect width="100%" height="100%" fill="yellow"/>
+	
+  <line x1="30" x2="30" y1="10" y2="10" stroke="red" stroke-width="3" marker-end="url(#m1)"/>
+
+</svg>
diff --git a/layout/reftests/svg/dynamic-marker-02.svg b/layout/reftests/svg/dynamic-marker-02.svg
new file mode 100644
index 00000000000..2d053ad540e
--- /dev/null
+++ b/layout/reftests/svg/dynamic-marker-02.svg
@@ -0,0 +1,37 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/licenses/publicdomain/
+-->
+<svg xmlns="http://www.w3.org/2000/svg" class="reftest-wait"
+  onload="startTest()">
+
+<script>
+<![CDATA[
+
+function startTest() {
+  document.addEventListener("MozReftestInvalidate", boom, false);
+  // in case we're not gecko
+  setTimeout(boom, 5000);
+}
+
+function boom() {
+  n = document.getElementById("m1");
+  n.style.overflow = "visible";
+  document.documentElement.removeAttribute("class");
+}
+
+]]>
+</script>
+
+  <defs>
+	  <marker id="m1" orient="auto" markerUnits="strokeWidth">
+		  <rect width="100%" height="100%" fill="blue"/>
+	  </marker>
+  </defs>
+
+	
+  <rect width="100%" height="100%" fill="yellow"/>
+	
+  <line x1="30" x2="30" y1="10" y2="10" stroke="red" stroke-width="3" marker-end="url(#m1)"/>
+
+</svg>
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index e8e39f350c0..9d0ad92f5f6 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -32,6 +32,7 @@ include moz-only/reftest.list
 == dynamic-gradient-contents-01.svg pass.svg
 == dynamic-link-style-01.svg pass.svg
 == dynamic-marker-01.svg pass.svg
+== dynamic-marker-02.svg dynamic-marker-02-ref.svg
 == dynamic-mask-contents-01.svg pass.svg
 == dynamic-pattern-01.svg pass.svg
 == dynamic-pattern-02.svg pass.svg

From f7421971078f402725b54b90ba0b884959c19a03 Mon Sep 17 00:00:00 2001
From: Rob Arnold <robarnold@cmu.edu>
Date: Tue, 28 Jul 2009 18:11:57 -0700
Subject: [PATCH 047/175] Backed out changeset d41cc3134424

---
 .../nsICanvasRenderingContextInternal.h       |   2 -
 .../canvas/src/nsCanvasRenderingContext2D.cpp | 127 +++++++-----------
 2 files changed, 51 insertions(+), 78 deletions(-)

diff --git a/content/canvas/public/nsICanvasRenderingContextInternal.h b/content/canvas/public/nsICanvasRenderingContextInternal.h
index 0351c91f6ac..a6fdfe7880d 100644
--- a/content/canvas/public/nsICanvasRenderingContextInternal.h
+++ b/content/canvas/public/nsICanvasRenderingContextInternal.h
@@ -62,8 +62,6 @@ public:
   // whenever the size of the element changes.
   NS_IMETHOD SetDimensions(PRInt32 width, PRInt32 height) = 0;
 
-  NS_IMETHOD InitializeWithSurface(nsIDocShell *docShell, gfxASurface *surface, PRInt32 width, PRInt32 height) = 0;
-
   // Render the canvas at the origin of the given gfxContext
   NS_IMETHOD Render(gfxContext *ctx, gfxPattern::GraphicsFilter aFilter) = 0;
 
diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 6171aba7c38..d23931f1539 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -20,7 +20,6 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Rob Arnold <tellrob@gmail.com>
  *   Eric Butler <zantifon@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
@@ -317,7 +316,6 @@ public:
     // nsICanvasRenderingContextInternal
     NS_IMETHOD SetCanvasElement(nsICanvasElement* aParentCanvas);
     NS_IMETHOD SetDimensions(PRInt32 width, PRInt32 height);
-    NS_IMETHOD InitializeWithSurface(nsIDocShell *shell, gfxASurface *surface, PRInt32 width, PRInt32 height);
     NS_IMETHOD Render(gfxContext *ctx, gfxPattern::GraphicsFilter aFilter);
     NS_IMETHOD GetInputStream(const char* aMimeType,
                               const PRUnichar* aEncoderOptions,
@@ -363,9 +361,6 @@ protected:
     // so these are not nsCOMPtrs
     nsICanvasElement* mCanvasElement;
 
-    // If mCanvasElement is not provided, then a docshell is
-    nsCOMPtr<nsIDocShell> mDocShell;
-
     // our CSS parser, for colors and whatnot
     nsCOMPtr<nsICSSParser> mCSSParser;
 
@@ -484,20 +479,6 @@ protected:
      */
     nsresult DrawRect(const gfxRect& rect, Style style);
 
-    /**
-     * Gets the pres shell from either the canvas element or the doc shell
-     */
-    nsIPresShell *GetPresShell() {
-      nsIPresShell *presShell = nsnull;
-      nsCOMPtr<nsIContent> content = do_QueryInterface(mCanvasElement);
-      if (content) {
-          presShell = content->GetCurrentDoc()->GetPrimaryShell();
-      } else if (mDocShell) {
-          mDocShell->GetPresShell(&presShell);
-      }
-      return presShell;
-    }
-
     // text
     enum TextAlign {
         TEXT_ALIGN_START,
@@ -632,14 +613,17 @@ protected:
         PRUint32 devPixel = 60;
         PRUint32 cssPixel = 60;
 
-        nsIPresShell *ps = GetPresShell();
-        nsPresContext *pc;
-
-        if (!ps) goto FINISH;
-        pc = ps->GetPresContext();
-        if (!pc) goto FINISH;
-        devPixel = pc->AppUnitsPerDevPixel();
-        cssPixel = pc->AppUnitsPerCSSPixel();
+        nsCOMPtr<nsINode> elem = do_QueryInterface(mCanvasElement);
+        if (elem) {
+            nsIDocument *doc = elem->GetOwnerDoc();
+            if (!doc) goto FINISH;
+            nsIPresShell *ps = doc->GetPrimaryShell();
+            if (!ps) goto FINISH;
+            nsPresContext *pc = ps->GetPresContext();
+            if (!pc) goto FINISH;
+            devPixel = pc->AppUnitsPerDevPixel();
+            cssPixel = pc->AppUnitsPerCSSPixel();
+        }
 
       FINISH:
         if (perDevPixel)
@@ -811,10 +795,12 @@ nsCanvasRenderingContext2D::ApplyStyle(Style aWhichStyle,
 
     nsCanvasPattern* pattern = CurrentState().patternStyles[aWhichStyle];
     if (pattern) {
-        if (mCanvasElement)
-            CanvasUtils::DoDrawImageSecurityCheck(mCanvasElement,
-                                                  pattern->Principal(),
-                                                  pattern->GetForceWriteOnly());
+        if (!mCanvasElement)
+            return;
+
+        CanvasUtils::DoDrawImageSecurityCheck(mCanvasElement,
+                                              pattern->Principal(),
+                                              pattern->GetForceWriteOnly());
 
         gfxPattern* gpat = pattern->GetPattern();
 
@@ -873,7 +859,8 @@ nsCanvasRenderingContext2D::SetDimensions(PRInt32 width, PRInt32 height)
 {
     Destroy();
 
-    nsRefPtr<gfxASurface> surface;
+    mWidth = width;
+    mHeight = height;
 
     // Check that the dimensions are sane
     if (gfxASurface::CheckSurfaceSize(gfxIntSize(width, height), 0xffff)) {
@@ -881,28 +868,13 @@ nsCanvasRenderingContext2D::SetDimensions(PRInt32 width, PRInt32 height)
         if (mOpaque)
             format = gfxASurface::ImageFormatRGB24;
 
-        surface = gfxPlatform::GetPlatform()->CreateOffscreenSurface
+        mSurface = gfxPlatform::GetPlatform()->CreateOffscreenSurface
             (gfxIntSize(width, height), format);
 
-        if (surface->CairoStatus() != 0) {
-          surface = NULL;
+        if (mSurface->CairoStatus() == 0) {
+            mThebes = new gfxContext(mSurface);
         }
     }
-    return InitializeWithSurface(NULL, surface, width, height);
-}
-
-NS_IMETHODIMP
-nsCanvasRenderingContext2D::InitializeWithSurface(nsIDocShell *docShell, gfxASurface *surface, PRInt32 width, PRInt32 height) {
-    Destroy();
-
-    NS_ASSERTION(!docShell ^ !mCanvasElement, "Cannot set both docshell and canvas element");
-    mDocShell = docShell;
-
-    mWidth = width;
-    mHeight = height;
-
-    mSurface = surface;
-    mThebes = new gfxContext(mSurface);
 
     /* Create dummy surfaces here */
     if (mSurface == nsnull || mSurface->CairoStatus() != 0 ||
@@ -914,11 +886,6 @@ nsCanvasRenderingContext2D::InitializeWithSurface(nsIDocShell *docShell, gfxASur
         mValid = PR_TRUE;
     }
 
-    // set up our css parser, if necessary
-    if (!mCSSParser) {
-        mCSSParser = do_CreateInstance("@mozilla.org/content/css-parser;1");
-    }
-
     // set up the initial canvas defaults
     mStyleStack.Clear();
     mSaveCount = 0;
@@ -1065,6 +1032,11 @@ nsCanvasRenderingContext2D::SetCanvasElement(nsICanvasElement* aCanvasElement)
     // don't hold a ref to this!
     mCanvasElement = aCanvasElement;
 
+    // set up our css parser, if necessary
+    if (!mCSSParser) {
+        mCSSParser = do_CreateInstance("@mozilla.org/content/css-parser;1");
+    }
+
     return NS_OK;
 }
 
@@ -1898,15 +1870,16 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
      */
 
     nsCOMPtr<nsIContent> content = do_QueryInterface(mCanvasElement);
-    if (!content && !mDocShell) {
-        NS_WARNING("Canvas element must be an nsIContent and non-null or a docshell must be provided");
+    if (!content) {
+        NS_WARNING("Canvas element must be an nsIContent and non-null");
         return NS_ERROR_FAILURE;
     }
 
-    nsIPresShell* presShell = GetPresShell();
+    nsIDocument* document = content->GetOwnerDoc();
+
+    nsIPresShell* presShell = document->GetPrimaryShell();
     if (!presShell)
-      return NS_ERROR_FAILURE;
-    nsIDocument* document = presShell->GetDocument();
+        return NS_ERROR_FAILURE;
 
     nsCString langGroup;
     presShell->GetPresContext()->GetLangGroup()->ToUTF8String(langGroup);
@@ -1914,7 +1887,7 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
     nsCOMArray<nsIStyleRule> rules;
 
     nsCOMPtr<nsICSSStyleRule> rule;
-    rv = CreateFontStyleRule(font, mCSSParser.get(), document, getter_AddRefs(rule));
+    rv = CreateFontStyleRule(font, mCSSParser.get(), content.get(), getter_AddRefs(rule));
     if (NS_FAILED(rv))
         return rv;
 
@@ -1926,7 +1899,7 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
     // values (2em, bolder, etc.)
     nsRefPtr<nsStyleContext> parentContext;
 
-    if (content && content->IsInDoc()) {
+    if (content->IsInDoc()) {
         // inherit from the canvas element
         parentContext = nsInspectorCSSUtils::GetStyleContextForContent(
                 content,
@@ -1937,7 +1910,7 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
         nsCOMPtr<nsICSSStyleRule> parentRule;
         rv = CreateFontStyleRule(NS_LITERAL_STRING("10px sans-serif"),
                                  mCSSParser.get(),
-                                 document,
+                                 content.get(),
                                  getter_AddRefs(parentRule));
         if (NS_FAILED(rv))
             return rv;
@@ -2246,17 +2219,17 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
         return NS_ERROR_INVALID_ARG;
 
     nsCOMPtr<nsIContent> content = do_QueryInterface(mCanvasElement);
-    if (!content && !mDocShell) {
-        NS_WARNING("Canvas element must be an nsIContent and non-null or a docshell must be provided");
+    if (!content) {
+        NS_WARNING("Canvas element must be an nsIContent and non-null");
         return NS_ERROR_FAILURE;
     }
 
-    nsIPresShell* presShell = GetPresShell();
+    nsIDocument* document = content->GetOwnerDoc();
+
+    nsIPresShell* presShell = document->GetPrimaryShell();
     if (!presShell)
         return NS_ERROR_FAILURE;
 
-    nsIDocument* document = presShell->GetDocument();
-
     nsBidiPresUtils* bidiUtils = presShell->GetPresContext()->GetBidiUtils();
     if (!bidiUtils)
         return NS_ERROR_FAILURE;
@@ -2268,7 +2241,7 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
     // for now, default to ltr if not in doc
     PRBool isRTL = PR_FALSE;
 
-    if (content && content->IsInDoc()) {
+    if (content->IsInDoc()) {
         // try to find the closest context
         nsRefPtr<nsStyleContext> canvasStyle =
             nsInspectorCSSUtils::GetStyleContextForContent(content,
@@ -2278,8 +2251,6 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
             return NS_ERROR_FAILURE;
         isRTL = canvasStyle->GetStyleVisibility()->mDirection ==
             NS_STYLE_DIRECTION_RTL;
-    } else {
-      isRTL = GET_BIDI_OPTION_DIRECTION(document->GetBidiOptions()) == IBMBIDI_TEXTDIRECTION_RTL;
     }
 
     // don't need to take care of these with stroke since Stroke() does that
@@ -2925,6 +2896,11 @@ nsCanvasRenderingContext2D::DrawImage()
     nsresult rv;
     gfxRect dirty;
 
+    // we can't do a security check without a canvas element, so
+    // just skip this entirely
+    if (!mCanvasElement)
+        return NS_ERROR_FAILURE;
+
     nsAXPCNativeCallContext *ncc = nsnull;
     rv = nsContentUtils::XPConnect()->
         GetCurrentNativeCallContext(&ncc);
@@ -2983,8 +2959,7 @@ nsCanvasRenderingContext2D::DrawImage()
     gfxIntSize imgSize = res.mSize;
     PRBool forceWriteOnly = res.mIsWriteOnly;
 
-    if (mCanvasElement)
-        CanvasUtils::DoDrawImageSecurityCheck(mCanvasElement, principal, forceWriteOnly);
+    CanvasUtils::DoDrawImageSecurityCheck(mCanvasElement, principal, forceWriteOnly);
 
     gfxContextPathAutoSaveRestore pathSR(mThebes, PR_FALSE);
 
@@ -3394,10 +3369,10 @@ nsCanvasRenderingContext2D::DrawWindow(nsIDOMWindow* aWindow, float aX, float aY
 NS_IMETHODIMP
 nsCanvasRenderingContext2D::GetImageData()
 {
-    if (!mValid)
+    if (!mValid || !mCanvasElement)
         return NS_ERROR_FAILURE;
 
-    if (mCanvasElement && mCanvasElement->IsWriteOnly() && !nsContentUtils::IsCallerTrustedForRead()) {
+    if (mCanvasElement->IsWriteOnly() && !nsContentUtils::IsCallerTrustedForRead()) {
         // XXX ERRMSG we need to report an error to developers here! (bug 329026)
         return NS_ERROR_DOM_SECURITY_ERR;
     }
@@ -3752,7 +3727,7 @@ nsCanvasRenderingContext2D::GetThebesSurface(gfxASurface **surface)
 NS_IMETHODIMP
 nsCanvasRenderingContext2D::CreateImageData()
 {
-    if (!mValid)
+    if (!mValid || !mCanvasElement)
         return NS_ERROR_FAILURE;
 
     nsAXPCNativeCallContext *ncc = nsnull;

From a03fd8cb2abf469bef130519637fde6137b6b722 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Tue, 28 Jul 2009 23:02:55 -0400
Subject: [PATCH 048/175] Bug 506641: Click image resizing for nsImageDocument
 should be disabled, r=bzbarsky

---
 content/html/document/src/nsImageDocument.cpp | 6 +++++-
 modules/libpref/src/init/all.js               | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/content/html/document/src/nsImageDocument.cpp b/content/html/document/src/nsImageDocument.cpp
index 13b9dbc97ea..35d1dbe400a 100644
--- a/content/html/document/src/nsImageDocument.cpp
+++ b/content/html/document/src/nsImageDocument.cpp
@@ -74,6 +74,7 @@
 #include "nsIMarkupDocumentViewer.h"
 
 #define AUTOMATIC_IMAGE_RESIZING_PREF "browser.enable_automatic_image_resizing"
+#define CLICK_IMAGE_RESIZING_PREF "browser.enable_click_image_resizing"
 
 class nsImageDocument;
 
@@ -146,6 +147,7 @@ protected:
   PRInt32                       mImageHeight;
 
   PRPackedBool                  mResizeImageByDefault;
+  PRPackedBool                  mClickResizingEnabled;
   PRPackedBool                  mImageIsOverflowing;
   // mImageIsResized is true if the image is currently resized
   PRPackedBool                  mImageIsResized;
@@ -307,6 +309,8 @@ nsImageDocument::Init()
 
   mResizeImageByDefault =
     nsContentUtils::GetBoolPref(AUTOMATIC_IMAGE_RESIZING_PREF);
+  mClickResizingEnabled =
+    nsContentUtils::GetBoolPref(CLICK_IMAGE_RESIZING_PREF);
   mShouldResize = mResizeImageByDefault;
   mFirstResize = PR_TRUE;
 
@@ -560,7 +564,7 @@ nsImageDocument::HandleEvent(nsIDOMEvent* aEvent)
   if (eventType.EqualsLiteral("resize")) {
     CheckOverflowing(PR_FALSE);
   }
-  else if (eventType.EqualsLiteral("click")) {
+  else if (eventType.EqualsLiteral("click") && mClickResizingEnabled) {
     SetZoomLevel(1.0);
     mShouldResize = PR_TRUE;
     if (mImageIsResized) {
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 5468365115a..a5bae40372b 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -104,6 +104,7 @@ pref("browser.visited_color",               "#551A8B");
 pref("browser.underline_anchors",           true);
 pref("browser.blink_allowed",               true);
 pref("browser.enable_automatic_image_resizing", false);
+pref("browser.enable_click_image_resizing", true);
 
 // See http://whatwg.org/specs/web-apps/current-work/#ping
 pref("browser.send_pings", false);

From 6ec22795bf2701ab0cca5a0b4916551f2b5389f8 Mon Sep 17 00:00:00 2001
From: Nochum Sossonko <highmind63@gmail.com>
Date: Wed, 29 Jul 2009 07:55:03 +0200
Subject: [PATCH 049/175] Bug 506116 - speed up makeURI(str) and use it in
 browser.js. r=gavin, sr=vlad

---
 browser/base/content/browser.js     | 43 ++++++++---------------------
 toolkit/content/contentAreaUtils.js | 23 ++++++++-------
 2 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 8316f133f2b..2cae4f4b2d5 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2660,10 +2660,9 @@ var browserDragAndDrop = {
     var file = dt.mozGetDataAt("application/x-moz-file", 0);
     if (file) {
       var name = file instanceof Ci.nsIFile ? file.leafName : "";
-      var ioService = Cc["@mozilla.org/network/io-service;1"]
-                                .getService(Ci.nsIIOService);
-      var fileHandler = ioService.getProtocolHandler("file")
-                                 .QueryInterface(Ci.nsIFileProtocolHandler);
+      var fileHandler = ContentAreaUtils.ioService
+                                        .getProtocolHandler("file")
+                                        .QueryInterface(Ci.nsIFileProtocolHandler);
       return [fileHandler.getURLSpecFromFile(file), name];
     }
 
@@ -2889,9 +2888,7 @@ const DOMLinkHandler = {
               break;
 
             var targetDoc = link.ownerDocument;
-            var ios = Cc["@mozilla.org/network/io-service;1"].
-                      getService(Ci.nsIIOService);
-            var uri = ios.newURI(link.href, targetDoc.characterSet, null);
+            var uri = makeURI(link.href, targetDoc.characterSet);
 
             if (gBrowser.isFailedIcon(uri))
               break;
@@ -4422,10 +4419,7 @@ nsBrowserAccess.prototype =
           if (aURI) {
             if (aOpener) {
               location = aOpener.location;
-              referrer =
-                      Components.classes["@mozilla.org/network/io-service;1"]
-                                .getService(Components.interfaces.nsIIOService)
-                                .newURI(location, null, null);
+              referrer = makeURI(location);
             }
             newWindow.QueryInterface(Ci.nsIInterfaceRequestor)
                      .getInterface(Ci.nsIWebNavigation)
@@ -4442,10 +4436,7 @@ nsBrowserAccess.prototype =
             newWindow = aOpener.top;
             if (aURI) {
               location = aOpener.location;
-              referrer =
-                      Components.classes["@mozilla.org/network/io-service;1"]
-                                .getService(Components.interfaces.nsIIOService)
-                                .newURI(location, null, null);
+              referrer = makeURI(location);
 
               newWindow.QueryInterface(Ci.nsIInterfaceRequestor)
                        .getInterface(nsIWebNavigation)
@@ -5418,11 +5409,8 @@ var OfflineApps = {
     if (!attr) return null;
 
     try {
-      var ios = Cc["@mozilla.org/network/io-service;1"].
-                getService(Ci.nsIIOService);
-
-      var contentURI = ios.newURI(aWindow.location.href, null, null);
-      return ios.newURI(attr, aWindow.document.characterSet, contentURI);
+      var contentURI = makeURI(aWindow.location.href, null, null);
+      return makeURI(attr, aWindow.document.characterSet, contentURI);
     } catch (e) {
       return null;
     }
@@ -5623,11 +5611,8 @@ var OfflineApps = {
     if (!manifest)
       return;
 
-    var ios = Cc["@mozilla.org/network/io-service;1"].
-              getService(Ci.nsIIOService);
-
-    var manifestURI = ios.newURI(manifest, aDocument.characterSet,
-                                 aDocument.documentURIObject);
+    var manifestURI = makeURI(manifest, aDocument.characterSet,
+                              aDocument.documentURIObject);
 
     var updateService = Cc["@mozilla.org/offlinecacheupdate-service;1"].
                         getService(Ci.nsIOfflineCacheUpdateService);
@@ -5640,9 +5625,7 @@ var OfflineApps = {
   {
     if (aTopic == "dom-storage-warn-quota-exceeded") {
       if (aSubject) {
-        var uri = Cc["@mozilla.org/network/io-service;1"].
-                  getService(Ci.nsIIOService).
-                  newURI(aSubject.location.href, null, null);
+        var uri = makeURI(aSubject.location.href);
 
         if (OfflineApps._checkUsage(uri)) {
           var browserWindow =
@@ -5703,9 +5686,7 @@ var MailIntegration = {
       mailtoUrl += "&subject=" + encodeURIComponent(aSubject);
     }
 
-    var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                              .getService(Components.interfaces.nsIIOService);
-    var uri = ioService.newURI(mailtoUrl, null, null);
+    var uri = makeURI(mailtoUrl);
 
     // now pass this uri to the operating system
     this._launchExternalUrl(uri);
diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js
index c3ac0f345c3..83cbad59841 100644
--- a/toolkit/content/contentAreaUtils.js
+++ b/toolkit/content/contentAreaUtils.js
@@ -41,6 +41,15 @@
 #
 # ***** END LICENSE BLOCK *****
 
+var ContentAreaUtils = {
+  get ioService() {
+    delete this.ioService;
+    return this.ioService =
+      Components.classes["@mozilla.org/network/io-service;1"]
+                .getService(Components.interfaces.nsIIOService);
+  }
+}
+
 /**
  * urlSecurityCheck: JavaScript wrapper for checkLoadURIWithPrincipal
  * and checkLoadURIStrWithPrincipal.
@@ -772,16 +781,12 @@ function makeWebBrowserPersist()
  */
 function makeURI(aURL, aOriginCharset, aBaseURI)
 {
-  var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                            .getService(Components.interfaces.nsIIOService);
-  return ioService.newURI(aURL, aOriginCharset, aBaseURI);
+  return ContentAreaUtils.ioService.newURI(aURL, aOriginCharset, aBaseURI);
 }
 
 function makeFileURI(aFile)
 {
-  var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                            .getService(Components.interfaces.nsIIOService);
-  return ioService.newFileURI(aFile);
+  return ContentAreaUtils.ioService.newFileURI(aFile);
 }
 
 function makeFilePicker()
@@ -1025,9 +1030,7 @@ function getCharsetforSave(aDocument)
  */
 function openURL(aURL)
 {
-  var ios = Components.classes["@mozilla.org/network/io-service;1"]
-                      .getService(Components.interfaces.nsIIOService);
-  var uri = ios.newURI(aURL, null, null);
+  var uri = makeURI(aURL);
 
   var protocolSvc = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"]
                               .getService(Components.interfaces.nsIExternalProtocolService);
@@ -1075,7 +1078,7 @@ function openURL(aURL)
       }
     }
 
-    var channel = ios.newChannelFromURI(uri);
+    var channel = ContentAreaUtils.ioService.newChannelFromURI(uri);
     var uriLoader = Components.classes["@mozilla.org/uriloader;1"]
                               .getService(Components.interfaces.nsIURILoader);
     uriLoader.openURI(channel, true, uriListener);

From a428480e2c9ad1fa3b60f33fbfd99ee25b966c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 29 Jul 2009 07:55:18 +0200
Subject: [PATCH 050/175] Bug 506861 - make more use of makeURI(). r=gavin

---
 browser/base/content/browser-places.js  |  5 +----
 browser/base/content/nsContextMenu.js   |  4 +---
 browser/base/content/tabbrowser.xml     | 29 ++++++++++---------------
 browser/base/content/urlbarBindings.xml |  9 ++------
 4 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index ce1fbb10145..1fa8f3caf5c 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -524,10 +524,7 @@ var PlacesCommandHook = {
    *            A short description of the feed. Optional.
    */
   addLiveBookmark: function PCH_addLiveBookmark(url, feedTitle, feedSubtitle) {
-    var ios = 
-        Cc["@mozilla.org/network/io-service;1"].
-        getService(Ci.nsIIOService);
-    var feedURI = ios.newURI(url, null, null);
+    var feedURI = makeURI(url);
     
     var doc = gBrowser.contentDocument;
     var title = (arguments.length > 1) ? feedTitle : doc.title;
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 1bfb2197034..5b62cfe6483 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1182,10 +1182,8 @@ nsContextMenu.prototype = {
   },
   
   getLinkURI: function() {
-    var ioService = Cc["@mozilla.org/network/io-service;1"].
-                    getService(Ci.nsIIOService);
     try {
-      return ioService.newURI(this.linkURL, null, null);
+      return makeURI(this.linkURL);
     }
     catch (ex) {
      // e.g. empty URL string
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 081acf41e58..50c7698010c 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -622,17 +622,13 @@
         <body>
           <![CDATA[
             var browser = this.getBrowserForTab(aTab);
-            browser.mIconURL = aURI;
+            browser.mIconURL = aURI instanceof Ci.nsIURI ? aURI.spec : aURI;
 
-            if (aURI) {
-              if (!(aURI instanceof Components.interfaces.nsIURI)) {
-                var ios = Components.classes["@mozilla.org/network/io-service;1"]
-                                    .getService(Components.interfaces.nsIIOService);
-                aURI = ios.newURI(aURI, null, null);
-              }
-              if (this.mFaviconService)
-                this.mFaviconService.setAndLoadFaviconForPage(browser.currentURI,
-                                                              aURI, false);
+            if (aURI && this.mFaviconService) {
+              if (!(aURI instanceof Ci.nsIURI))
+                aURI = makeURI(aURI);
+              this.mFaviconService.setAndLoadFaviconForPage(browser.currentURI,
+                                                            aURI, false);
             }
 
             this.updateIcon(aTab);
@@ -706,7 +702,7 @@
                       req.image.height > sz)
                     return;
 
-                  this.setIcon(aTab, browser.currentURI.spec);
+                  this.setIcon(aTab, browser.currentURI);
                 } catch (e) { }
               }
             }
@@ -725,14 +721,11 @@
         <parameter name="aURI"/>
         <body>
           <![CDATA[
-            if (!(aURI instanceof Components.interfaces.nsIURI)) {
-              var ios = Components.classes["@mozilla.org/network/io-service;1"]
-                                  .getService(Components.interfaces.nsIIOService);
-              aURI = ios.newURI(aURI, null, null);
-            }
-
-            if (this.mFaviconService)
+            if (this.mFaviconService) {
+              if (!(aURI instanceof Ci.nsIURI))
+                aURI = makeURI(aURI);
               return this.mFaviconService.isFailedFavicon(aURI);
+            }
             return null;
           ]]>
         </body>
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index 5d905b4f9c4..f2641b78d67 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -283,10 +283,8 @@
           if (val == this.value &&
               this.getAttribute("pageproxystate") == "valid") {
             let uri;
-            let ioService = Cc["@mozilla.org/network/io-service;1"]
-                              .getService(Ci.nsIIOService);
             try {
-              uri = ioService.newURI(val, null, null);
+              uri = makeURI(val);
             } catch (e) {}
 
             if (uri && !uri.schemeIs("javascript") && !uri.schemeIs("data")) {
@@ -387,10 +385,7 @@
         <setter>
           <![CDATA[
           try {
-            let uri = Cc["@mozilla.org/network/io-service;1"].
-                      getService(Ci.nsIIOService).
-                      newURI(val, null, null);
-            val = losslessDecodeURI(uri);
+            val = losslessDecodeURI(makeURI(val));
           } catch (ex) { }
           this.value = val;
 

From ffe9c01f287bf6df77979e56e93df7405ecec2a9 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Tue, 28 Jul 2009 23:19:31 -0700
Subject: [PATCH 051/175] Bug 506811 - nsIconChannel assumes writing to
 non-aligned 32bit int is ok. r=joe

---
 .../decoders/icon/win/nsIconChannel.cpp       | 95 ++++++++++++-------
 1 file changed, 63 insertions(+), 32 deletions(-)

diff --git a/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp b/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
index d85b4ea5e92..d157777eb53 100644
--- a/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
+++ b/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
@@ -470,44 +470,72 @@ nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, PRBool nonBloc
     {
       // we got the bitmaps, first find out their size
       HDC hDC = CreateCompatibleDC(NULL); // get a device context for the screen.
-      BITMAPINFO maskInfo = {{sizeof(BITMAPINFOHEADER)}};
-      if (GetDIBits(hDC, iconInfo.hbmMask, 0, 0, NULL, &maskInfo, DIB_RGB_COLORS) &&
+      BITMAPINFO maskInfo  = {{sizeof(BITMAPINFOHEADER)}};
+      BITMAPINFO colorInfo = {{sizeof(BITMAPINFOHEADER)}};
+      if (GetDIBits(hDC, iconInfo.hbmMask,  0, 0, NULL, &maskInfo,  DIB_RGB_COLORS) &&
+          GetDIBits(hDC, iconInfo.hbmColor, 0, 0, NULL, &colorInfo, DIB_RGB_COLORS) &&
+          maskInfo.bmiHeader.biHeight == colorInfo.bmiHeader.biHeight &&
+          maskInfo.bmiHeader.biWidth  == colorInfo.bmiHeader.biWidth  &&
+          colorInfo.bmiHeader.biBitCount > 8 &&
+          colorInfo.bmiHeader.biSizeImage > 0 &&
           maskInfo.bmiHeader.biSizeImage > 0) {
-        PRUint32 colorSize = maskInfo.bmiHeader.biWidth * maskInfo.bmiHeader.biHeight * 4;
-        PRUint32 iconSize = sizeof(ICONFILEHEADER) + sizeof(ICONENTRY) + sizeof(BITMAPINFOHEADER) + colorSize + maskInfo.bmiHeader.biSizeImage;
+
+        PRUint32 iconSize = sizeof(ICONFILEHEADER) +
+                            sizeof(ICONENTRY) +
+                            sizeof(BITMAPINFOHEADER) +
+                            colorInfo.bmiHeader.biSizeImage +
+                            maskInfo.bmiHeader.biSizeImage;
+
         char *buffer = new char[iconSize];
         if (!buffer)
           rv = NS_ERROR_OUT_OF_MEMORY;
         else {
-          // the data starts with an icon file header
-          ICONFILEHEADER *iconHeader = (ICONFILEHEADER *)buffer;
-          iconHeader->ifhReserved = 0;
-          iconHeader->ifhType = 1;
-          iconHeader->ifhCount = 1;
-          // followed by the single icon entry
-          ICONENTRY *iconEntry = (ICONENTRY *)(buffer + sizeof(ICONFILEHEADER));
-          iconEntry->ieWidth = maskInfo.bmiHeader.biWidth;
-          iconEntry->ieHeight = maskInfo.bmiHeader.biHeight;
-          iconEntry->ieColors = 0;
-          iconEntry->ieReserved = 0;
-          iconEntry->iePlanes = 1;
-          iconEntry->ieBitCount = 32;
-          iconEntry->ieSizeImage = sizeof(BITMAPINFOHEADER) + colorSize + maskInfo.bmiHeader.biSizeImage;
-          iconEntry->ieFileOffset = sizeof(ICONFILEHEADER) + sizeof(ICONENTRY);
-          // followed by the bitmap info header and the bits
-          LPBITMAPINFO lpBitmapInfo = (LPBITMAPINFO)(buffer + sizeof(ICONFILEHEADER) + sizeof(ICONENTRY));
-          memcpy(lpBitmapInfo, &maskInfo.bmiHeader, sizeof(BITMAPINFOHEADER));
-          if (GetDIBits(hDC, iconInfo.hbmMask, 0, maskInfo.bmiHeader.biHeight, buffer + sizeof(ICONFILEHEADER) + sizeof(ICONENTRY) + sizeof(BITMAPINFOHEADER) + colorSize, lpBitmapInfo, DIB_RGB_COLORS)) {
-            PRUint32 maskSize = lpBitmapInfo->bmiHeader.biSizeImage;
-            lpBitmapInfo->bmiHeader.biBitCount = 32;
-            lpBitmapInfo->bmiHeader.biSizeImage = colorSize;
-            lpBitmapInfo->bmiHeader.biClrUsed = 0;
-            lpBitmapInfo->bmiHeader.biClrImportant = 0;
-            if (GetDIBits(hDC, iconInfo.hbmColor, 0, maskInfo.bmiHeader.biHeight, buffer + sizeof(ICONFILEHEADER) + sizeof(ICONENTRY) + sizeof(BITMAPINFOHEADER), lpBitmapInfo, DIB_RGB_COLORS)) {
-              // doubling the height because icons have two bitmaps
-              lpBitmapInfo->bmiHeader.biHeight *= 2;
-              lpBitmapInfo->bmiHeader.biSizeImage += maskSize;
+          char *whereTo = buffer;
+          int howMuch;
 
+          // the data starts with an icon file header
+          ICONFILEHEADER iconHeader;
+          iconHeader.ifhReserved = 0;
+          iconHeader.ifhType = 1;
+          iconHeader.ifhCount = 1;
+          howMuch = sizeof(ICONFILEHEADER);
+          memcpy(whereTo, &iconHeader, howMuch);
+          whereTo += howMuch;
+
+          // followed by the single icon entry
+          ICONENTRY iconEntry;
+          iconEntry.ieWidth = colorInfo.bmiHeader.biWidth;
+          iconEntry.ieHeight = colorInfo.bmiHeader.biHeight;
+          iconEntry.ieColors = 0;
+          iconEntry.ieReserved = 0;
+          iconEntry.iePlanes = 1;
+          iconEntry.ieBitCount = colorInfo.bmiHeader.biBitCount;
+          iconEntry.ieSizeImage = sizeof(BITMAPINFOHEADER) +
+                                  colorInfo.bmiHeader.biSizeImage +
+                                  maskInfo.bmiHeader.biSizeImage;
+          iconEntry.ieFileOffset = sizeof(ICONFILEHEADER) + sizeof(ICONENTRY);
+          howMuch = sizeof(ICONENTRY);
+          memcpy(whereTo, &iconEntry, howMuch);
+          whereTo += howMuch;
+
+          // followed by the bitmap info header
+          // (doubling the height because icons have two bitmaps)
+          colorInfo.bmiHeader.biHeight *= 2;
+          colorInfo.bmiHeader.biSizeImage += maskInfo.bmiHeader.biSizeImage;
+          howMuch = sizeof(BITMAPINFOHEADER);
+          memcpy(whereTo, &colorInfo.bmiHeader, howMuch);
+          whereTo += howMuch;
+          colorInfo.bmiHeader.biHeight /= 2;
+          colorInfo.bmiHeader.biSizeImage -= maskInfo.bmiHeader.biSizeImage;
+
+          // followed by the bitmap data
+          if (GetDIBits(hDC, iconInfo.hbmColor, 0,
+                        colorInfo.bmiHeader.biHeight, whereTo,
+                        &colorInfo, DIB_RGB_COLORS)) {
+            whereTo += colorInfo.bmiHeader.biSizeImage;
+            if (GetDIBits(hDC, iconInfo.hbmMask, 0,
+                          maskInfo.bmiHeader.biHeight, whereTo,
+                          &maskInfo, DIB_RGB_COLORS)) {
               // Now, create a pipe and stuff our data into it
               nsCOMPtr<nsIInputStream> inStream;
               nsCOMPtr<nsIOutputStream> outStream;
@@ -534,6 +562,9 @@ nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, PRBool nonBloc
     DestroyIcon(hIcon);
   } // if we got an hIcon
 
+  // If we didn't make a stream, then fail.
+  if (!*_retval && NS_SUCCEEDED(rv))
+    rv = NS_ERROR_NOT_AVAILABLE;
 #endif
   return rv;
 }

From d8d288070e8f097d42e69c13063c42bbd2af9560 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Tue, 28 Jul 2009 23:19:34 -0700
Subject: [PATCH 052/175] Bug 503573 - moz-icon doesn't work on Window CE.
 r=vlad

---
 .../decoders/icon/win/nsIconChannel.cpp       | 106 +++++++++++++++++-
 1 file changed, 101 insertions(+), 5 deletions(-)

diff --git a/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp b/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
index d157777eb53..11b93d9e186 100644
--- a/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
+++ b/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
@@ -66,6 +66,10 @@
 #define _WIN32_WINNT 0x0600
 #endif
 
+#ifdef WINCE
+#define SHGetFileInfoW SHGetFileInfo
+#endif
+
 // we need windows.h to read out registry information...
 #include <windows.h>
 #include <shellapi.h>
@@ -298,12 +302,13 @@ static DWORD GetSpecialFolderIcon(nsIFile* aFile, int aFolder, SHFILEINFOW* aSFI
 static UINT GetSizeInfoFlag(PRUint32 aDesiredImageSize)
 {
   UINT infoFlag;
-#ifndef WINCE
-  // SHGFI_SHELLICONSIZE does not exist on windows mobile.
   if (aDesiredImageSize > 16)
+#ifndef WINCE
     infoFlag = SHGFI_SHELLICONSIZE;
-  else
+#else
+    infoFlag = SHGFI_LARGEICON;
 #endif
+  else
     infoFlag = SHGFI_SMALLICON;
 
   return infoFlag;
@@ -311,7 +316,7 @@ static UINT GetSizeInfoFlag(PRUint32 aDesiredImageSize)
 
 nsresult nsIconChannel::GetHIconFromFile(HICON *hIcon)
 {
-#ifdef WINCE
+#ifdef WINCE_WINDOWS_MOBILE
     // GetDIBits does not exist on windows mobile.
   return NS_ERROR_NOT_AVAILABLE;
 #else
@@ -336,8 +341,15 @@ nsresult nsIconChannel::GetHIconFromFile(HICON *hIcon)
     NS_ENSURE_SUCCESS(rv, rv);
 
     localFile->GetPath(filePath);
+#ifndef WINCE
     if (filePath.Length() < 2 || filePath[1] != ':')
       return NS_ERROR_MALFORMED_URI; // UNC
+#else
+    // WinCE paths don't have drive letters
+    if (filePath.Length() < 2 ||
+        filePath[0] != '\\' || filePath[1] == '\\')
+      return NS_ERROR_MALFORMED_URI; // UNC
+#endif
 
     if (filePath.Last() == ':')
       filePath.Append('\\');
@@ -368,12 +380,21 @@ nsresult nsIconChannel::GetHIconFromFile(HICON *hIcon)
     filePath = NS_LITERAL_STRING(".") + NS_ConvertUTF8toUTF16(defFileExt);
   }
 
+#ifndef WINCE
   // Is this the "Desktop" folder?
   DWORD shellResult = GetSpecialFolderIcon(localFile, CSIDL_DESKTOP, &sfi, infoFlags);
   if (!shellResult) {
     // Is this the "My Documents" folder?
     shellResult = GetSpecialFolderIcon(localFile, CSIDL_PERSONAL, &sfi, infoFlags);
   }
+#else
+  DWORD shellResult = 0;
+  // Fantastic. On WinCE, ::SHGetFileInfo (with a localFile) fails
+  // unless I also set another flag like this. We don't actually need
+  // the display name.
+  if (localFile)
+    infoFlags |= SHGFI_DISPLAYNAME;
+#endif
 
   // There are other "Special Folders" and Namespace entities that we are not 
   // fetching icons for, see: 
@@ -439,13 +460,88 @@ nsresult nsIconChannel::GetStockHIcon(nsIMozIconURI *aIconURI, HICON *hIcon)
 }
 #endif
 
+#ifdef WINCE
+int GetDIBits(HDC hdc,
+              HBITMAP hbmp,
+              UINT uStartScan,
+              UINT cScanLines,
+              LPVOID lpvBits,
+              LPBITMAPINFO lpbi,
+              UINT uUsage)
+{
+  // Enforce some assumptions this simplified implementation makes
+  if (!hdc || !hbmp || uStartScan != 0 ||
+      !lpbi || uUsage != DIB_RGB_COLORS ||
+      lpvBits == NULL && lpbi->bmiHeader.biSize != sizeof(BITMAPINFOHEADER))
+    return 0;
+
+  BITMAP bmpInfo;
+  if (!::GetObject(hbmp, sizeof(BITMAP), &bmpInfo))
+    return 0;
+
+  lpbi->bmiHeader.biWidth         = bmpInfo.bmWidth;
+  lpbi->bmiHeader.biHeight        = bmpInfo.bmHeight;
+  lpbi->bmiHeader.biPlanes        = bmpInfo.bmPlanes;
+  lpbi->bmiHeader.biBitCount      = bmpInfo.bmBitsPixel;
+  lpbi->bmiHeader.biCompression   = BI_RGB; // 0
+  lpbi->bmiHeader.biSizeImage     = bmpInfo.bmWidthBytes * bmpInfo.bmHeight;
+  lpbi->bmiHeader.biXPelsPerMeter = 0;
+  lpbi->bmiHeader.biYPelsPerMeter = 0;
+  lpbi->bmiHeader.biClrUsed       = 0;
+  lpbi->bmiHeader.biClrImportant  = 0;
+
+  if (lpbi->bmiHeader.biBitCount == 1) {
+    // Need to set this or else the mask is inverted.
+    lpbi->bmiHeader.biClrUsed       = 2;
+    lpbi->bmiHeader.biClrImportant  = 2;
+    lpbi->bmiColors[0].rgbRed = lpbi->bmiColors[0].rgbGreen =
+      lpbi->bmiColors[0].rgbBlue = lpbi->bmiColors[0].rgbReserved = 0;
+    lpbi->bmiColors[1].rgbRed = lpbi->bmiColors[1].rgbGreen =
+      lpbi->bmiColors[1].rgbBlue = lpbi->bmiColors[1].rgbReserved = 255;
+  }
+
+  if (lpvBits == NULL)
+    return bmpInfo.bmHeight;
+
+  // We just want to pull out the image bits, but Windows CE makes
+  // this stupidly difficult to do...
+  HBITMAP hTargetBitmap;
+  void *pBuffer; 
+  HDC someDC = ::GetDC(NULL);
+  hTargetBitmap = ::CreateDIBSection(someDC, lpbi, DIB_RGB_COLORS,
+                                     (void**)&pBuffer, NULL, 0);
+  ::ReleaseDC(NULL, someDC);
+
+  HDC memDc    = ::CreateCompatibleDC(NULL);
+  HDC targetDc = ::CreateCompatibleDC(NULL);
+  if (!memDc || !targetDc)
+    return 0;
+
+  HBITMAP hOldMemBitmap = (HBITMAP)::SelectObject(memDc, hbmp);
+  HBITMAP hOldTgtBitmap = (HBITMAP)::SelectObject(targetDc, hTargetBitmap);
+
+  // BitBlt into the target bitmap, then copy the bits into our buffer.
+  ::BitBlt(targetDc, 0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight, memDc, 0, 0, SRCCOPY);
+  memcpy(lpvBits, pBuffer, lpbi->bmiHeader.biSizeImage);
+
+  // Cleanup
+  ::SelectObject(memDc, hOldMemBitmap);
+  ::SelectObject(targetDc, hOldTgtBitmap);
+  ::DeleteDC(memDc);
+  ::DeleteDC(targetDc); 
+  ::DeleteObject(hTargetBitmap); 
+
+  return bmpInfo.bmHeight;
+}
+#endif
+
 nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, PRBool nonBlocking)
 {
   // Check whether the icon requested's a file icon or a stock icon
   nsresult rv = NS_ERROR_NOT_AVAILABLE;
 
   // GetDIBits does not exist on windows mobile.
-#ifndef WINCE
+#ifndef WINCE_WINDOWS_MOBILE
   HICON hIcon = NULL;
 
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN

From b00cdab9dc40bdba0bef20fe11eea678a159c0ed Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Wed, 29 Jul 2009 08:22:12 +0200
Subject: [PATCH 053/175] Bug 506111 - consolidate getService calls in
 browser.js. r=dao

---
 browser/base/content/browser-places.js   |  22 +-
 browser/base/content/browser-textZoom.js |  26 +--
 browser/base/content/browser.js          | 266 ++++++++---------------
 toolkit/content/contentAreaUtils.js      |   2 +-
 4 files changed, 112 insertions(+), 204 deletions(-)

diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index 1fa8f3caf5c..956aea934bc 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -549,9 +549,7 @@ var PlacesCommandHook = {
    *          UnfiledBookmarks and Tags.
    */
   showPlacesOrganizer: function PCH_showPlacesOrganizer(aLeftPaneRoot) {
-    var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
-             getService(Ci.nsIWindowMediator);
-    var organizer = wm.getMostRecentWindow("Places:Organizer");
+    var organizer = gWindowMediator.getMostRecentWindow("Places:Organizer");
     if (!organizer) {
       // No currently open places window, so open one with the specified mode.
       openDialog("chrome://browser/content/places/places.xul", 
@@ -575,18 +573,12 @@ var PlacesCommandHook = {
 
 // Helper object for the history menu.
 var HistoryMenu = {
-  get _ss() {
-    delete this._ss;
-    return this._ss = Cc["@mozilla.org/browser/sessionstore;1"].
-                      getService(Ci.nsISessionStore);
-  },
-
   toggleRecentlyClosedTabs: function PHM_toggleRecentlyClosedTabs() {
     // enable/disable the Recently Closed Tabs sub menu
     var undoPopup = document.getElementById("historyUndoPopup");
 
     // no restorable tabs, so disable menu
-    if (this._ss.getClosedTabCount(window) == 0)
+    if (gSessionStore.getClosedTabCount(window) == 0)
       undoPopup.parentNode.setAttribute("disabled", true);
     else
       undoPopup.parentNode.removeAttribute("disabled");
@@ -617,7 +609,7 @@ var HistoryMenu = {
       undoPopup.removeChild(undoPopup.firstChild);
 
     // no restorable tabs, so make sure menu is disabled, and return
-    if (this._ss.getClosedTabCount(window) == 0) {
+    if (gSessionStore.getClosedTabCount(window) == 0) {
       undoPopup.parentNode.setAttribute("disabled", true);
       return;
     }
@@ -626,7 +618,7 @@ var HistoryMenu = {
     undoPopup.parentNode.removeAttribute("disabled");
 
     // populate menu
-    var undoItems = eval("(" + this._ss.getClosedTabData(window) + ")");
+    var undoItems = eval("(" + gSessionStore.getClosedTabData(window) + ")");
     for (var i = 0; i < undoItems.length; i++) {
       var m = document.createElement("menuitem");
       m.setAttribute("label", undoItems[i].title);
@@ -663,7 +655,7 @@ var HistoryMenu = {
     let undoPopup = document.getElementById("historyUndoWindowPopup");
 
     // no restorable windows, so disable menu
-    if (this._ss.getClosedWindowCount() == 0)
+    if (gSessionStore.getClosedWindowCount() == 0)
       undoPopup.parentNode.setAttribute("disabled", true);
     else
       undoPopup.parentNode.removeAttribute("disabled");
@@ -683,7 +675,7 @@ var HistoryMenu = {
       undoPopup.removeChild(undoPopup.firstChild);
 
     // no restorable windows, so make sure menu is disabled, and return
-    if (this._ss.getClosedWindowCount() == 0) {
+    if (gSessionStore.getClosedWindowCount() == 0) {
       undoPopup.parentNode.setAttribute("disabled", true);
       return;
     }
@@ -692,7 +684,7 @@ var HistoryMenu = {
     undoPopup.parentNode.removeAttribute("disabled");
 
     // populate menu
-    let undoItems = JSON.parse(this._ss.getClosedWindowData());
+    let undoItems = JSON.parse(gSessionStore.getClosedWindowData());
     for (let i = 0; i < undoItems.length; i++) {
       let undoItem = undoItems[i];
       let otherTabsCount = undoItem.tabs.length - 1;
diff --git a/browser/base/content/browser-textZoom.js b/browser/base/content/browser-textZoom.js
index d947ebdd359..ba7a4a00e38 100644
--- a/browser/base/content/browser-textZoom.js
+++ b/browser/base/content/browser-textZoom.js
@@ -77,12 +77,6 @@ var FullZoom = {
                        getService(Ci.nsIContentPrefService);
   },
 
-  get _prefBranch FullZoom_get__prefBranch() {
-    delete this._prefBranch;
-    return this._prefBranch = Cc["@mozilla.org/preferences-service;1"].
-                              getService(Ci.nsIPrefBranch2);
-  },
-
   // browser.zoom.siteSpecific preference cache
   _siteSpecificPref: undefined,
 
@@ -125,9 +119,7 @@ var FullZoom = {
 
     // We disable site-specific preferences in Private Browsing mode, because the
     // content preferences module is disabled
-    let os = Cc["@mozilla.org/observer-service;1"].
-             getService(Ci.nsIObserverService);
-    os.addObserver(this, "private-browsing", true);
+    gObserverService.addObserver(this, "private-browsing", true);
 
     // Retrieve the initial status of the Private Browsing mode.
     this._inPrivateBrowsing = Cc["@mozilla.org/privatebrowsing;1"].
@@ -135,19 +127,17 @@ var FullZoom = {
                               privateBrowsingEnabled;
 
     this._siteSpecificPref =
-      this._prefBranch.getBoolPref("browser.zoom.siteSpecific");
+      gPrefService.getBoolPref("browser.zoom.siteSpecific");
     this.updateBackgroundTabs = 
-      this._prefBranch.getBoolPref("browser.zoom.updateBackgroundTabs");
+      gPrefService.getBoolPref("browser.zoom.updateBackgroundTabs");
     // Listen for changes to the browser.zoom branch so we can enable/disable
     // updating background tabs and per-site saving and restoring of zoom levels.
-    this._prefBranch.addObserver("browser.zoom.", this, true);
+    gPrefService.addObserver("browser.zoom.", this, true);
   },
 
   destroy: function FullZoom_destroy() {
-    let os = Cc["@mozilla.org/observer-service;1"].
-             getService(Ci.nsIObserverService);
-    os.removeObserver(this, "private-browsing");
-    this._prefBranch.removeObserver("browser.zoom.", this);
+    gObserverService.removeObserver(this, "private-browsing");
+    gPrefService.removeObserver("browser.zoom.", this);
     this._cps.removeObserver(this.name, this);
     window.removeEventListener("DOMMouseScroll", this, false);
     delete this._cps;
@@ -213,11 +203,11 @@ var FullZoom = {
         switch(aData) {
           case "browser.zoom.siteSpecific":
             this._siteSpecificPref =
-              this._prefBranch.getBoolPref("browser.zoom.siteSpecific");
+              gPrefService.getBoolPref("browser.zoom.siteSpecific");
             break;
           case "browser.zoom.updateBackgroundTabs":
             this.updateBackgroundTabs =
-              this._prefBranch.getBoolPref("browser.zoom.updateBackgroundTabs");
+              gPrefService.getBoolPref("browser.zoom.updateBackgroundTabs");
             break;
         }
         break;
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 2cae4f4b2d5..8dcba6a119a 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -116,10 +116,20 @@ var gEditUIVisible = true;
   });
 });
 
-__defineGetter__("gPrefService", function() {
-  delete this.gPrefService;
-  return this.gPrefService = Cc["@mozilla.org/preferences-service;1"].
-                             getService(Ci.nsIPrefBranch2);
+[
+  ["gPrefService",       "preferences-service;1",      "nsIPrefBranch2"],
+  ["gPermissionManager", "permissionmanager;1",        "nsIPermissionManager"],
+  ["gObserverService",   "observer-service;1",         "nsIObserverService"],
+  ["gWindowMediator",    "appshell/window-mediator;1", "nsIWindowMediator"],
+  ["gPromptService",     "embedcomp/prompt-service;1", "nsIPromptService"],
+  ["gSearchService",     "browser/search-service;1",   "nsIBrowserSearchService"],
+  ["gSessionStore",      "browser/sessionstore;1",     "nsISessionStore"],
+].forEach(function (service) {
+  let [name, cid, iface] = service;
+  window.__defineGetter__(name, function () {
+    delete window[name];
+    return window[name] = Cc["@mozilla.org/" + cid].getService(Ci[iface]);
+  });
 });
 
 __defineGetter__("PluralForm", function() {
@@ -314,7 +324,6 @@ function findChildShell(aDocument, aDocShell, aSoughtURI) {
 
 const gPopupBlockerObserver = {
   _reportButton: null,
-  _kIPM: Components.interfaces.nsIPermissionManager,
 
   onUpdatePageReport: function (aEvent)
   {
@@ -383,11 +392,9 @@ const gPopupBlockerObserver = {
   toggleAllowPopupsForSite: function (aEvent)
   {
     var currentURI = gBrowser.selectedBrowser.webNavigation.currentURI;
-    var pm = Components.classes["@mozilla.org/permissionmanager;1"]
-                       .getService(this._kIPM);
     var shouldBlock = aEvent.target.getAttribute("block") == "true";
-    var perm = shouldBlock ? this._kIPM.DENY_ACTION : this._kIPM.ALLOW_ACTION;
-    pm.add(currentURI, "popup", perm);
+    var perm = shouldBlock ? gPermissionManager.DENY_ACTION : gPermissionManager.ALLOW_ACTION;
+    gPermissionManager.add(currentURI, "popup", perm);
 
     gBrowser.getNotificationBox().removeCurrentNotification();
   },
@@ -408,8 +415,7 @@ const gPopupBlockerObserver = {
     try {
       blockedPopupAllowSite.removeAttribute("hidden");
 
-      var pm = Cc["@mozilla.org/permissionmanager;1"].getService(this._kIPM);
-      if (pm.testPermission(uri, "popup") == this._kIPM.ALLOW_ACTION) {
+      if (gPermissionManager.testPermission(uri, "popup") == gPermissionManager.ALLOW_ACTION) {
         // Offer an item to block popups for this site, if a whitelist entry exists
         // already for it.
         let blockString = gNavigatorBundle.getFormattedString("popupBlock", [uri.host]);
@@ -524,9 +530,7 @@ const gPopupBlockerObserver = {
                    permissionType : "popup",
                    windowTitle    : bundlePreferences.getString("popuppermissionstitle"),
                    introText      : bundlePreferences.getString("popuppermissionstext") };
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                        .getService(Components.interfaces.nsIWindowMediator);
-    var existingWindow = wm.getMostRecentWindow("Browser:Permissions");
+    var existingWindow = gWindowMediator.getMostRecentWindow("Browser:Permissions");
     if (existingWindow) {
       existingWindow.initWithParams(params);
       existingWindow.focus();
@@ -1023,9 +1027,7 @@ function BrowserStartup() {
 
   // Certain kinds of automigration rely on this notification to complete their
   // tasks BEFORE the browser window is shown.
-  Cc["@mozilla.org/observer-service;1"]
-    .getService(Ci.nsIObserverService)
-    .notifyObservers(null, "browser-window-before-show", "");
+  gObserverService.notifyObservers(null, "browser-window-before-show", "");
 
   // Set a sane starting width/height for all resolutions on new profiles.
   if (!document.documentElement.hasAttribute("width")) {
@@ -1153,8 +1155,7 @@ function prepareForStartup() {
   // progress notifications for back/forward button updating
   webNavigation.sessionHistory = Components.classes["@mozilla.org/browser/shistory;1"]
                                            .createInstance(Components.interfaces.nsISHistory);
-  var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-  os.addObserver(gBrowser.browsers[0], "browser:purge-session-history", false);
+  gObserverService.addObserver(gBrowser.browsers[0], "browser:purge-session-history", false);
 
   // remove the disablehistory attribute so the browser cleans up, as
   // though it had done this work itself
@@ -1183,9 +1184,8 @@ function prepareForStartup() {
 }
 
 function delayedStartup(isLoadingBlank, mustLoadSidebar) {
-  var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-  os.addObserver(gSessionHistoryObserver, "browser:purge-session-history", false);
-  os.addObserver(gXPInstallObserver, "xpinstall-install-blocked", false);
+  gObserverService.addObserver(gSessionHistoryObserver, "browser:purge-session-history", false);
+  gObserverService.addObserver(gXPInstallObserver, "xpinstall-install-blocked", false);
 
   BrowserOffline.init();
   OfflineApps.init();
@@ -1259,13 +1259,10 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
                                                          [brandShortName]);
       var checkboxLabel = shellBundle.getFormattedString("setDefaultBrowserDontAsk",
                                                          [brandShortName]);
-      const IPS = Components.interfaces.nsIPromptService;
-      var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-                                                .getService(IPS);
       var checkEveryTime = { value: shouldCheck };
-      var rv = ps.confirmEx(window, promptTitle, promptMessage,
-                            IPS.STD_YES_NO_BUTTONS,
-                            null, null, null, checkboxLabel, checkEveryTime);
+      var rv = gPromptService.confirmEx(window, promptTitle, promptMessage,
+                                        gPromptService.STD_YES_NO_BUTTONS,
+                                        null, null, null, checkboxLabel, checkEveryTime);
       if (rv == 0)
         shell.setDefaultBrowser(true, false);
       shell.shouldCheckDefaultBrowser = checkEveryTime.value;
@@ -1302,9 +1299,7 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
   // initialize the session-restore service (in case it's not already running)
   if (document.documentElement.getAttribute("windowtype") == "navigator:browser") {
     try {
-      var ss = Cc["@mozilla.org/browser/sessionstore;1"].
-               getService(Ci.nsISessionStore);
-      ss.init(window);
+      gSessionStore.init(window);
     } catch(ex) {
       dump("nsSessionStore could not be initialized: " + ex + "\n");
     }
@@ -1386,10 +1381,8 @@ function BrowserShutdown()
     Components.utils.reportError(ex);
   }
 
-  var os = Components.classes["@mozilla.org/observer-service;1"]
-    .getService(Components.interfaces.nsIObserverService);
-  os.removeObserver(gSessionHistoryObserver, "browser:purge-session-history");
-  os.removeObserver(gXPInstallObserver, "xpinstall-install-blocked");
+  gObserverService.removeObserver(gSessionHistoryObserver, "browser:purge-session-history");
+  gObserverService.removeObserver(gXPInstallObserver, "xpinstall-install-blocked");
 
   try {
     gBrowser.removeProgressListener(window.XULBrowserWindow);
@@ -1413,9 +1406,7 @@ function BrowserShutdown()
   DownloadMonitorPanel.uninit();
   gPrivateBrowsingUI.uninit();
 
-  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
-  var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
-  var enumerator = windowManagerInterface.getEnumerator(null);
+  var enumerator = gWindowMediator.getEnumerator(null);
   enumerator.getNext();
   if (!enumerator.hasMoreElements()) {
     document.persist("sidebar-box", "sidebarcommand");
@@ -1908,8 +1899,6 @@ function getShortcutOrURI(aURL, aPostDataRef) {
   var shortcutURL = null;
   var keyword = aURL;
   var param = "";
-  var searchService = Cc["@mozilla.org/browser/search-service;1"].
-                      getService(Ci.nsIBrowserSearchService);
 
   var offset = aURL.indexOf(" ");
   if (offset > 0) {
@@ -1920,7 +1909,7 @@ function getShortcutOrURI(aURL, aPostDataRef) {
   if (!aPostDataRef)
     aPostDataRef = {};
 
-  var engine = searchService.getEngineByAlias(keyword);
+  var engine = gSearchService.getEngineByAlias(keyword);
   if (engine) {
     var submission = engine.getSubmission(param, null);
     aPostDataRef.value = submission.postData;
@@ -2287,9 +2276,7 @@ function PageProxyClickHandler(aEvent)
 function BrowserImport()
 {
 #ifdef XP_MACOSX
-  var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                     .getService(Components.interfaces.nsIWindowMediator);
-  var win = wm.getMostRecentWindow("Browser:MigrationWizard");
+  var win = gWindowMediator.getMostRecentWindow("Browser:MigrationWizard");
   if (win)
     win.focus();
   else {
@@ -2435,12 +2422,10 @@ function BrowserOnCommand(event) {
  */
 function getMeOutOfHere() {
   // Get the start page from the *default* pref branch, not the user's
-  var prefs = Cc["@mozilla.org/preferences-service;1"]
-             .getService(Ci.nsIPrefService).getDefaultBranch(null);
   var url = "about:blank";
   try {
-    url = prefs.getComplexValue("browser.startup.homepage",
-                                Ci.nsIPrefLocalizedString).data;
+    url = gPrefService.getComplexValue("browser.startup.homepage",
+                                       Ci.nsIPrefLocalizedString).data;
     // If url is a pipe-delimited set of pages, just take the first one.
     if (url.indexOf("|") != -1)
       url = url.split("|")[0];
@@ -2726,12 +2711,11 @@ var homeButtonObserver = {
 
 function openHomeDialog(aURL)
 {
-  var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
   var promptTitle = gNavigatorBundle.getString("droponhometitle");
   var promptMsg   = gNavigatorBundle.getString("droponhomemsg");
-  var pressedVal  = promptService.confirmEx(window, promptTitle, promptMsg,
-                          promptService.STD_YES_NO_BUTTONS,
-                          null, null, null, null, {value:0});
+  var pressedVal  = gPromptService.confirmEx(window, promptTitle, promptMsg,
+                                             gPromptService.STD_YES_NO_BUTTONS,
+                                             null, null, null, null, {value:0});
 
   if (pressedVal == 0) {
     try {
@@ -2983,9 +2967,7 @@ const BrowserSearch = {
     // to the list of hidden engines rather than to the main list.
     // XXX This will need to be changed when engines are identified by URL;
     // see bug 335102.
-    var searchService = Cc["@mozilla.org/browser/search-service;1"].
-                        getService(Ci.nsIBrowserSearchService);
-    if (searchService.getEngineByName(engine.title))
+    if (gSearchService.getEngineByName(engine.title))
       hidden = true;
 
     var engines = (hidden ? browser.hiddenEngines : browser.engines) || [];
@@ -3061,9 +3043,7 @@ const BrowserSearch = {
       searchBar.select();
       searchBar.focus();
     } else {
-      var ss = Cc["@mozilla.org/browser/search-service;1"].
-               getService(Ci.nsIBrowserSearchService);
-      var searchForm = ss.defaultEngine.searchForm;
+      let searchForm = gSearchService.defaultEngine.searchForm;
       loadURI(searchForm, null, null, false);
     }
   },
@@ -3080,16 +3060,14 @@ const BrowserSearch = {
    *        tab.
    */
   loadSearch: function BrowserSearch_search(searchText, useNewTab) {
-    var ss = Cc["@mozilla.org/browser/search-service;1"].
-             getService(Ci.nsIBrowserSearchService);
     var engine;
   
     // If the search bar is visible, use the current engine, otherwise, fall
     // back to the default engine.
     if (isElementVisible(this.searchBar))
-      engine = ss.currentEngine;
+      engine = gSearchService.currentEngine;
     else
-      engine = ss.defaultEngine;
+      engine = gSearchService.defaultEngine;
   
     var submission = engine.getSubmission(searchText, null); // HTML response
 
@@ -3221,9 +3199,7 @@ function BrowserDownloadsUI()
 
 function toOpenWindowByType(inType, uri, features)
 {
-  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
-  var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
-  var topWindow = windowManagerInterface.getMostRecentWindow(inType);
+  var topWindow = gWindowMediator.getMostRecentWindow(inType);
 
   if (topWindow)
     topWindow.focus();
@@ -3235,9 +3211,7 @@ function toOpenWindowByType(inType, uri, features)
 
 function toOpenDialogByTypeAndUrl(inType, relatedUrl, windowUri, features, extraArgument)
 {
-  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
-  var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
-  var windows = windowManagerInterface.getEnumerator(inType);
+  var windows = gWindowMediator.getEnumerator(inType);
 
   // Check for windows matching the url
   while (windows.hasMoreElements()) {
@@ -4255,8 +4229,6 @@ var XULBrowserWindow = {
     gBrowser.mCurrentBrowser.engines = null;    
 
     var uri = aRequest.QueryInterface(Ci.nsIChannel).URI;
-    var observerService = Cc["@mozilla.org/observer-service;1"]
-                            .getService(Ci.nsIObserverService);
 
     if (gURLBar &&
         gURLBar.value == "" &&
@@ -4264,7 +4236,7 @@ var XULBrowserWindow = {
       URLBarSetURI(uri);
 
     try {
-      observerService.notifyObservers(content, "StartDocumentLoad", uri.spec);
+      gObserverService.notifyObservers(content, "StartDocumentLoad", uri.spec);
     } catch (e) {
     }
   },
@@ -4272,12 +4244,9 @@ var XULBrowserWindow = {
   endDocumentLoad: function (aRequest, aStatus) {
     var urlStr = aRequest.QueryInterface(Ci.nsIChannel).originalURI.spec;
 
-    var observerService = Cc["@mozilla.org/observer-service;1"]
-                            .getService(Ci.nsIObserverService);
-
     var notification = Components.isSuccessCode(aStatus) ? "EndDocumentLoad" : "FailDocumentLoad";
     try {
-      observerService.notifyObservers(content, notification, urlStr);
+      gObserverService.notifyObservers(content, notification, urlStr);
     } catch (e) {
     }
   }
@@ -5037,14 +5006,12 @@ function SelectDetector(event, doReload)
     }
 
     try {
-        var pref = Components.classes["@mozilla.org/preferences-service;1"]
-                             .getService(Components.interfaces.nsIPrefBranch);
         var str =  Components.classes["@mozilla.org/supports-string;1"]
                              .createInstance(Components.interfaces.nsISupportsString);
 
         str.data = prefvalue;
-        pref.setComplexValue("intl.charset.detector",
-                             Components.interfaces.nsISupportsString, str);
+        gPrefService.setComplexValue("intl.charset.detector",
+                                     Ci.nsISupportsString, str);
         if (doReload) window.content.location.reload();
     }
     catch (ex) {
@@ -5102,10 +5069,8 @@ function UpdateCharsetDetector()
     var prefvalue;
 
     try {
-        var pref = Components.classes["@mozilla.org/preferences-service;1"]
-                             .getService(Components.interfaces.nsIPrefBranch);
-        prefvalue = pref.getComplexValue("intl.charset.detector",
-                                         Components.interfaces.nsIPrefLocalizedString).data;
+        prefvalue = gPrefService.getComplexValue("intl.charset.detector",
+                                                 Ci.nsIPrefLocalizedString).data;
     }
     catch (ex) {
         prefvalue = "";
@@ -5135,8 +5100,7 @@ function UpdateMenus(event)
 
 function CreateMenu(node)
 {
-  var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-  observerService.notifyObservers(null, "charsetmenu-selected", node);
+  gObserverService.notifyObservers(null, "charsetmenu-selected", node);
 }
 
 function charsetLoadListener (event)
@@ -5257,59 +5221,51 @@ var BrowserOffline = {
     if (!this._uiElement)
       this._uiElement = document.getElementById("goOfflineMenuitem");
 
-    var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-    os.addObserver(this, "network:offline-status-changed", false);
+    gObserverService.addObserver(this, "network:offline-status-changed", false);
 
-    var ioService = Components.classes["@mozilla.org/network/io-service;1"].
-      getService(Components.interfaces.nsIIOService2);
-
-    // if ioService is managing the offline status, then ioservice.offline
-    // is already set correctly. We will continue to allow the ioService
+    // if IO Service is managing the offline status, then IOService.offline
+    // is already set correctly. We will continue to allow the IO Service
     // to manage its offline state until the user uses the "Work Offline" UI.
     
-    if (!ioService.manageOfflineStatus) {
+    if (!ContentAreaUtils.ioService.manageOfflineStatus) {
       // set the initial state
       var isOffline = false;
       try {
         isOffline = gPrefService.getBoolPref("browser.offline");
       }
       catch (e) { }
-      ioService.offline = isOffline;
+      ContentAreaUtils.ioService.offline = isOffline;
     }
     
-    this._updateOfflineUI(ioService.offline);
+    this._updateOfflineUI(ContentAreaUtils.ioService.offline);
   },
 
   uninit: function ()
   {
     try {
-      var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-      os.removeObserver(this, "network:offline-status-changed");
+      gObserverService.removeObserver(this, "network:offline-status-changed");
     } catch (ex) {
     }
   },
 
   toggleOfflineStatus: function ()
   {
-    var ioService = Components.classes["@mozilla.org/network/io-service;1"].
-      getService(Components.interfaces.nsIIOService2);
-
     // Stop automatic management of the offline status
     try {
-      ioService.manageOfflineStatus = false;
+      ContentAreaUtils.ioService.manageOfflineStatus = false;
     } catch (ex) {
     }
   
-    if (!ioService.offline && !this._canGoOffline()) {
+    if (!ContentAreaUtils.ioService.offline && !this._canGoOffline()) {
       this._updateOfflineUI(false);
       return;
     }
 
-    ioService.offline = !ioService.offline;
+    ContentAreaUtils.ioService.offline = !ContentAreaUtils.ioService.offline;
 
     // Save the current state for later use as the initial state
     // (if there is no netLinkService)
-    gPrefService.setBoolPref("browser.offline", ioService.offline);
+    gPrefService.setBoolPref("browser.offline", ContentAreaUtils.ioService.offline);
   },
 
   /////////////////////////////////////////////////////////////////////////////
@@ -5326,18 +5282,15 @@ var BrowserOffline = {
   // BrowserOffline Implementation Methods
   _canGoOffline: function ()
   {
-    var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-    if (os) {
-      try {
-        var cancelGoOffline = Components.classes["@mozilla.org/supports-PRBool;1"].createInstance(Components.interfaces.nsISupportsPRBool);
-        os.notifyObservers(cancelGoOffline, "offline-requested", null);
+    try {
+      let cancelGoOffline = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
+      gObserverService.notifyObservers(cancelGoOffline, "offline-requested", null);
 
-        // Something aborted the quit process.
-        if (cancelGoOffline.data)
-          return false;
-      }
-      catch (ex) {
-      }
+      // Something aborted the quit process.
+      if (cancelGoOffline.data)
+        return false;
+    }
+    catch (ex) {
     }
     return true;
   },
@@ -5358,18 +5311,14 @@ var OfflineApps = {
   // OfflineApps Public Methods
   init: function ()
   {
-    var obs = Cc["@mozilla.org/observer-service;1"].
-              getService(Ci.nsIObserverService);
-    obs.addObserver(this, "dom-storage-warn-quota-exceeded", false);
-    obs.addObserver(this, "offline-cache-update-completed", false);
+    gObserverService.addObserver(this, "dom-storage-warn-quota-exceeded", false);
+    gObserverService.addObserver(this, "offline-cache-update-completed", false);
   },
 
   uninit: function ()
   {
-    var obs = Cc["@mozilla.org/observer-service;1"].
-              getService(Ci.nsIObserverService);
-    obs.removeObserver(this, "dom-storage-warn-quota-exceeded");
-    obs.removeObserver(this, "offline-cache-update-completed");
+    gObserverService.removeObserver(this, "dom-storage-warn-quota-exceeded");
+    gObserverService.removeObserver(this, "offline-cache-update-completed");
   },
 
   handleEvent: function(event) {
@@ -5462,10 +5411,8 @@ var OfflineApps = {
 
     // Now that we've warned once, prevent the warning from showing up
     // again.
-    var pm = Cc["@mozilla.org/permissionmanager;1"].
-             getService(Ci.nsIPermissionManager);
-    pm.add(aURI, "offline-app",
-           Ci.nsIOfflineCacheUpdateService.ALLOW_NO_WARN);
+    gPermissionManager.add(aURI, "offline-app",
+                           Ci.nsIOfflineCacheUpdateService.ALLOW_NO_WARN);
   },
 
   // XXX: duplicated in preferences/advanced.js
@@ -5496,11 +5443,8 @@ var OfflineApps = {
   },
 
   _checkUsage: function(aURI) {
-    var pm = Cc["@mozilla.org/permissionmanager;1"].
-             getService(Ci.nsIPermissionManager);
-
     // if the user has already allowed excessive usage, don't bother checking
-    if (pm.testExactPermission(aURI, "offline-app") !=
+    if (gPermissionManager.testExactPermission(aURI, "offline-app") !=
         Ci.nsIOfflineCacheUpdateService.ALLOW_NO_WARN) {
       var usage = this._getOfflineAppUsage(aURI.asciiHost);
       var warnQuota = gPrefService.getIntPref("offline-apps.quota.warn");
@@ -5522,12 +5466,10 @@ var OfflineApps = {
                                                    aContentWindow);
 
     var currentURI = aContentWindow.document.documentURIObject;
-    var pm = Cc["@mozilla.org/permissionmanager;1"].
-             getService(Ci.nsIPermissionManager);
 
     // don't bother showing UI if the user has already made a decision
-    if (pm.testExactPermission(currentURI, "offline-app") !=
-        Ci.nsIPermissionManager.UNKNOWN_ACTION)
+    if (gPermissionManager.testExactPermission(currentURI, "offline-app") !=
+        gPermissionManager.UNKNOWN_ACTION)
       return;
 
     try {
@@ -5581,10 +5523,8 @@ var OfflineApps = {
   },
 
   allowSite: function(aDocument) {
-    var pm = Cc["@mozilla.org/permissionmanager;1"].
-             getService(Ci.nsIPermissionManager);
-    pm.add(aDocument.documentURIObject, "offline-app",
-           Ci.nsIPermissionManager.ALLOW_ACTION);
+    gPermissionManager.add(aDocument.documentURIObject, "offline-app",
+                           gPermissionManager.ALLOW_ACTION);
 
     // When a site is enabled while loading, manifest resources will
     // start fetching immediately.  This one time we need to do it
@@ -5593,10 +5533,8 @@ var OfflineApps = {
   },
 
   disallowSite: function(aDocument) {
-    var pm = Cc["@mozilla.org/permissionmanager;1"].
-             getService(Ci.nsIPermissionManager);
-    pm.add(aDocument.documentURIObject, "offline-app",
-           Ci.nsIPermissionManager.DENY_ACTION);
+    gPermissionManager.add(aDocument.documentURIObject, "offline-app",
+                           gPermissionManager.DENY_ACTION);
   },
 
   manage: function() {
@@ -5707,9 +5645,7 @@ var MailIntegration = {
 function BrowserOpenAddonsMgr(aPane)
 {
   const EMTYPE = "Extension:Manager";
-  var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                     .getService(Components.interfaces.nsIWindowMediator);
-  var theEM = wm.getMostRecentWindow(EMTYPE);
+  var theEM = gWindowMediator.getMostRecentWindow(EMTYPE);
   if (theEM) {
     theEM.focus();
     if (aPane)
@@ -6200,10 +6136,8 @@ function undoCloseTab(aIndex) {
     blankTabToRemove = gBrowser.selectedTab;
 
   var tab = null;
-  var ss = Cc["@mozilla.org/browser/sessionstore;1"].
-           getService(Ci.nsISessionStore);
-  if (ss.getClosedTabCount(window) > (aIndex || 0)) {
-    tab = ss.undoCloseTab(window, aIndex || 0);
+  if (gSessionStore.getClosedTabCount(window) > (aIndex || 0)) {
+    tab = gSessionStore.undoCloseTab(window, aIndex || 0);
     
     if (blankTabToRemove)
       gBrowser.removeTab(blankTabToRemove);
@@ -6219,13 +6153,11 @@ function undoCloseTab(aIndex) {
  * @returns a reference to the reopened window.
  */
 function undoCloseWindow(aIndex) {
-  let ss = Cc["@mozilla.org/browser/sessionstore;1"].
-           getService(Ci.nsISessionStore);
-  let window = null;
-  if (ss.getClosedWindowCount() > (aIndex || 0))
-    window = ss.undoCloseWindow(aIndex || 0);
+  let win = null;
+  if (gSessionStore.getClosedWindowCount() > (aIndex || 0))
+    win = gSessionStore.undoCloseWindow(aIndex || 0);
 
-  return window;
+  return win;
 }
 
 /**
@@ -6780,14 +6712,11 @@ function getBrowser() gBrowser;
 function getNavToolbox() gNavToolbox;
 
 let gPrivateBrowsingUI = {
-  _observerService: null,
   _privateBrowsingService: null,
   _privateBrowsingAutoStarted: false,
 
   init: function PBUI_init() {
-    this._observerService = Cc["@mozilla.org/observer-service;1"].
-                            getService(Ci.nsIObserverService);
-    this._observerService.addObserver(this, "private-browsing", false);
+    gObserverService.addObserver(this, "private-browsing", false);
 
     this._privateBrowsingService = Cc["@mozilla.org/privatebrowsing;1"].
                                    getService(Ci.nsIPrivateBrowsingService);
@@ -6797,7 +6726,7 @@ let gPrivateBrowsingUI = {
   },
 
   uninit: function PBUI_unint() {
-    this._observerService.removeObserver(this, "private-browsing");
+    gObserverService.removeObserver(this, "private-browsing");
   },
 
   observe: function PBUI_observe(aSubject, aTopic, aData) {
@@ -6835,12 +6764,9 @@ let gPrivateBrowsingUI = {
 #endif
     var message = pbBundle.formatStringFromName("privateBrowsingMessage", [appName], 1);
 
-    var promptService = Cc["@mozilla.org/embedcomp/prompt-service;1"].
-                        getService(Ci.nsIPromptService);
-
-    var flags = promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_0 +
-                promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_1 +
-                promptService.BUTTON_POS_0_DEFAULT;
+    var flags = gPromptService.BUTTON_TITLE_IS_STRING * gPromptService.BUTTON_POS_0 +
+                gPromptService.BUTTON_TITLE_IS_STRING * gPromptService.BUTTON_POS_1 +
+                gPromptService.BUTTON_POS_0_DEFAULT;
 
     var neverAsk = {value:false};
     var button0Title = pbBundle.GetStringFromName("privateBrowsingYesTitle");
@@ -6848,9 +6774,9 @@ let gPrivateBrowsingUI = {
     var neverAskText = pbBundle.GetStringFromName("privateBrowsingNeverAsk");
 
     var result;
-    var choice = promptService.confirmEx(null, dialogTitle, header + message,
-                               flags, button0Title, button1Title, null,
-                               neverAskText, neverAsk);
+    var choice = gPromptService.confirmEx(null, dialogTitle, header + message,
+                                          flags, button0Title, button1Title, null,
+                                          neverAskText, neverAsk);
 
     switch (choice) {
     case 0: // Start Private Browsing
diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js
index 83cbad59841..32a424e3da4 100644
--- a/toolkit/content/contentAreaUtils.js
+++ b/toolkit/content/contentAreaUtils.js
@@ -46,7 +46,7 @@ var ContentAreaUtils = {
     delete this.ioService;
     return this.ioService =
       Components.classes["@mozilla.org/network/io-service;1"]
-                .getService(Components.interfaces.nsIIOService);
+                .getService(Components.interfaces.nsIIOService2);
   }
 }
 

From 72cf09986c898179856af0ce4e47d976228407e9 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Wed, 29 Jul 2009 12:06:34 +0430
Subject: [PATCH 054/175] Bug 501413 - In a right-to-left localization,
 clicking any url in the bookmark sidebar doesn't work (tests); r=mak77

---
 .../places/tests/browser/Makefile.in          |   1 +
 .../browser/browser_sidebarpanels_click.js    | 206 ++++++++++++++++++
 2 files changed, 207 insertions(+)
 create mode 100644 browser/components/places/tests/browser/browser_sidebarpanels_click.js

diff --git a/browser/components/places/tests/browser/Makefile.in b/browser/components/places/tests/browser/Makefile.in
index fcb94ed054f..abfa20b3868 100644
--- a/browser/components/places/tests/browser/Makefile.in
+++ b/browser/components/places/tests/browser/Makefile.in
@@ -62,6 +62,7 @@ _BROWSER_TEST_FILES = \
 	browser_library_middleclick.js \
 	browser_library_views_liveupdate.js \
 	browser_views_liveupdate.js \
+	browser_sidebarpanels_click.js \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/browser/components/places/tests/browser/browser_sidebarpanels_click.js b/browser/components/places/tests/browser/browser_sidebarpanels_click.js
new file mode 100644
index 00000000000..006e68a99b3
--- /dev/null
+++ b/browser/components/places/tests/browser/browser_sidebarpanels_click.js
@@ -0,0 +1,206 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Places test code.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This test makes sure that the items in the bookmarks and history sidebar
+// panels are clickable in both LTR and RTL modes.
+
+function test() {
+  const BOOKMARKS_SIDEBAR_ID = "viewBookmarksSidebar";
+  const BOOKMARKS_SIDEBAR_TREE_ID = "bookmarks-view";
+  const HISTORY_SIDEBAR_ID = "viewHistorySidebar";
+  const HISTORY_SIDEBAR_TREE_ID = "historyTree";
+
+  // Initialization.
+  let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
+           getService(Ci.nsIWindowWatcher);
+  let bs = PlacesUtils.bookmarks;
+  let hs = PlacesUtils.history;
+  let sidebarBox = document.getElementById("sidebar-box");
+  let sidebar = document.getElementById("sidebar");
+  waitForExplicitFinish();
+
+  // If a sidebar is already open, close it.
+  if (!sidebarBox.hidden) {
+    info("Unexpected sidebar found - a previous test failed to cleanup correctly");
+    toggleSidebar();
+  }
+
+  const TEST_URL = "javascript:alert(\"test\");";
+
+  let tests = [];
+  tests.push({
+    _itemID: null,
+    init: function() {
+      // Add a bookmark to the Unfiled Bookmarks folder.
+      this._itemID = bs.insertBookmark(bs.unfiledBookmarksFolder,
+                                       PlacesUtils._uri(TEST_URL),
+                                       bs.DEFAULT_INDEX, "test");
+    },
+    prepare: function() {
+    },
+    selectNode: function(tree) {
+      tree.selectItems([this._itemID]);
+    },
+    cleanup: function() {
+      bs.removeFolderChildren(bs.unfiledBookmarksFolder);
+    },
+    sidebarName: BOOKMARKS_SIDEBAR_ID,
+    treeName: BOOKMARKS_SIDEBAR_TREE_ID,
+    desc: "Bookmarks sidebar test"
+  });
+
+  tests.push({
+    init: function() {
+      // Add a history entry.
+      this.cleanup();
+      hs.addVisit(PlacesUtils._uri(TEST_URL), Date.now() * 1000,
+                  null, hs.TRANSITION_TYPED, false, 0);
+    },
+    prepare: function() {
+      sidebar.contentDocument.getElementById("byvisited").doCommand();
+    },
+    selectNode: function(tree) {
+      tree.selectNode(tree.view.nodeForTreeIndex(0));
+      is(tree.selectedNode.uri, TEST_URL, "The correct visit has been selected");
+      is(tree.selectedNode.itemId, -1, "The selected node is not bookmarked");
+    },
+    cleanup: function() {
+      hs.QueryInterface(Ci.nsIBrowserHistory)
+        .removeAllPages();
+    },
+    sidebarName: HISTORY_SIDEBAR_ID,
+    treeName: HISTORY_SIDEBAR_TREE_ID,
+    desc: "History sidebar test"
+  });
+
+  let currentTest;
+
+  function testPlacesPanel(preFunc, postFunc) {
+    currentTest.init();
+
+    sidebar.addEventListener("load", function() {
+      sidebar.removeEventListener("load", arguments.callee, true);
+
+      let doc = sidebar.contentDocument;
+      let tree = doc.getElementById(currentTest.treeName);
+      let tbo = tree.treeBoxObject;
+
+      executeSoon(function() {
+        currentTest.prepare();
+        if (preFunc)
+          preFunc();
+
+        let observer = {
+          observe: function(aSubject, aTopic, aData) {
+            if (aTopic === "domwindowopened") {
+              ww.unregisterNotification(this);
+              let alertDialog = aSubject.QueryInterface(Ci.nsIDOMWindow);
+              alertDialog.addEventListener("load", function() {
+                alertDialog.removeEventListener("load", arguments.callee, false);
+                info("alert dialog observed as expected");
+                executeSoon(function() {
+                  alertDialog.close();
+                  toggleSidebar(currentTest.sidebarName);
+                  currentTest.cleanup();
+                  postFunc();
+                });
+              }, false);
+            }
+          }
+        };
+        ww.registerNotification(observer);
+
+        // Select the inserted places item.
+        currentTest.selectNode(tree);
+        is(tbo.view.selection.count, 1,
+           "The test node should be successfully selected");
+        // Get its row ID.
+        let min = {}, max = {};
+        tbo.view.selection.getRangeAt(0, min, max);
+        let rowID = min.value;
+        tbo.ensureRowIsVisible(rowID);
+
+        // Calculate the click coordinates.
+        let x = {}, y = {}, width = {}, height = {};
+        tbo.getCoordsForCellItem(rowID, tree.columns[0], "text",
+                                 x, y, width, height);
+        x = x.value + width.value / 2;
+        y = y.value + height.value / 2;
+        // Simulate the click.
+        EventUtils.synthesizeMouse(tree.body, x, y, {}, doc.defaultView);
+        // Now, wait for the domwindowopened observer to catch the alert dialog.
+        // If something goes wrong, the test will time out at this stage.
+        // Note that for the history sidebar, the URL itself is not opened,
+        // and Places will show the load-js-data-url-error prompt as an alert
+        // box, which means that the click actually worked, so it's good enough
+        // for the purpose of this test.
+      });
+    }, true);
+    toggleSidebar(currentTest.sidebarName);
+  }
+
+  function changeSidebarDirection(aDirection) {
+    document.getElementById("sidebar")
+            .contentDocument
+            .documentElement
+            .style.direction = aDirection;
+  }
+
+  function runNextTest() {
+    if (tests.length == 0)
+      finish();
+    else {
+      currentTest = tests.push();
+      testPlacesPanel(function() {
+        changeSidebarDirection("ltr");
+        info("Running " + currentTest.desc + " in LTR mode");
+      }, function() {
+        executeSoon(function() {
+          testPlacesPanel(function() {
+            // Run the test in RTL mode.
+            changeSidebarDirection("rtl");
+            info("Running " + currentTest.desc + " in RTL mode");
+          }, function() {
+            executeSoon(runNextTest);
+          });
+        });
+      });
+    }
+  }
+
+  runNextTest();
+}

From 69c1f8ac9e3a14f90ff531b5f11b60c455d5f989 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Wed, 29 Jul 2009 12:09:38 +0430
Subject: [PATCH 055/175] Bustage fix for the test for bug 501413

---
 .../places/tests/browser/browser_sidebarpanels_click.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/places/tests/browser/browser_sidebarpanels_click.js b/browser/components/places/tests/browser/browser_sidebarpanels_click.js
index 006e68a99b3..343cc3a0cda 100644
--- a/browser/components/places/tests/browser/browser_sidebarpanels_click.js
+++ b/browser/components/places/tests/browser/browser_sidebarpanels_click.js
@@ -184,7 +184,7 @@ function test() {
     if (tests.length == 0)
       finish();
     else {
-      currentTest = tests.push();
+      currentTest = tests.shift();
       testPlacesPanel(function() {
         changeSidebarDirection("ltr");
         info("Running " + currentTest.desc + " in LTR mode");

From ebd45c75d8e6fdf9f1b3608378a0654557555b4c Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wr@rosenauer.org>
Date: Wed, 29 Jul 2009 09:49:27 +0200
Subject: [PATCH 056/175] Bug 506901 - preference advanced pane not updated on
 init; r=gavin

---
 browser/components/preferences/advanced.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
index 8e6af4db533..8cc2746264c 100644
--- a/browser/components/preferences/advanced.js
+++ b/browser/components/preferences/advanced.js
@@ -56,9 +56,8 @@ var gAdvancedPane = {
       advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
     } else {
       var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
-      if (preference.value === null)
-        return;
-      advancedPrefs.selectedIndex = preference.value;
+      if (preference.value !== null)
+        advancedPrefs.selectedIndex = preference.value;
     }
 
 #ifdef MOZ_UPDATER

From 9de24e71977eba15d4b853fbba3ac03e3fd71189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 29 Jul 2009 10:49:59 +0200
Subject: [PATCH 057/175] Backed out changeset 27b53ca1b085

---
 browser/base/content/browser-places.js   |  22 +-
 browser/base/content/browser-textZoom.js |  26 ++-
 browser/base/content/browser.js          | 266 +++++++++++++++--------
 toolkit/content/contentAreaUtils.js      |   2 +-
 4 files changed, 204 insertions(+), 112 deletions(-)

diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index 956aea934bc..1fa8f3caf5c 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -549,7 +549,9 @@ var PlacesCommandHook = {
    *          UnfiledBookmarks and Tags.
    */
   showPlacesOrganizer: function PCH_showPlacesOrganizer(aLeftPaneRoot) {
-    var organizer = gWindowMediator.getMostRecentWindow("Places:Organizer");
+    var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
+             getService(Ci.nsIWindowMediator);
+    var organizer = wm.getMostRecentWindow("Places:Organizer");
     if (!organizer) {
       // No currently open places window, so open one with the specified mode.
       openDialog("chrome://browser/content/places/places.xul", 
@@ -573,12 +575,18 @@ var PlacesCommandHook = {
 
 // Helper object for the history menu.
 var HistoryMenu = {
+  get _ss() {
+    delete this._ss;
+    return this._ss = Cc["@mozilla.org/browser/sessionstore;1"].
+                      getService(Ci.nsISessionStore);
+  },
+
   toggleRecentlyClosedTabs: function PHM_toggleRecentlyClosedTabs() {
     // enable/disable the Recently Closed Tabs sub menu
     var undoPopup = document.getElementById("historyUndoPopup");
 
     // no restorable tabs, so disable menu
-    if (gSessionStore.getClosedTabCount(window) == 0)
+    if (this._ss.getClosedTabCount(window) == 0)
       undoPopup.parentNode.setAttribute("disabled", true);
     else
       undoPopup.parentNode.removeAttribute("disabled");
@@ -609,7 +617,7 @@ var HistoryMenu = {
       undoPopup.removeChild(undoPopup.firstChild);
 
     // no restorable tabs, so make sure menu is disabled, and return
-    if (gSessionStore.getClosedTabCount(window) == 0) {
+    if (this._ss.getClosedTabCount(window) == 0) {
       undoPopup.parentNode.setAttribute("disabled", true);
       return;
     }
@@ -618,7 +626,7 @@ var HistoryMenu = {
     undoPopup.parentNode.removeAttribute("disabled");
 
     // populate menu
-    var undoItems = eval("(" + gSessionStore.getClosedTabData(window) + ")");
+    var undoItems = eval("(" + this._ss.getClosedTabData(window) + ")");
     for (var i = 0; i < undoItems.length; i++) {
       var m = document.createElement("menuitem");
       m.setAttribute("label", undoItems[i].title);
@@ -655,7 +663,7 @@ var HistoryMenu = {
     let undoPopup = document.getElementById("historyUndoWindowPopup");
 
     // no restorable windows, so disable menu
-    if (gSessionStore.getClosedWindowCount() == 0)
+    if (this._ss.getClosedWindowCount() == 0)
       undoPopup.parentNode.setAttribute("disabled", true);
     else
       undoPopup.parentNode.removeAttribute("disabled");
@@ -675,7 +683,7 @@ var HistoryMenu = {
       undoPopup.removeChild(undoPopup.firstChild);
 
     // no restorable windows, so make sure menu is disabled, and return
-    if (gSessionStore.getClosedWindowCount() == 0) {
+    if (this._ss.getClosedWindowCount() == 0) {
       undoPopup.parentNode.setAttribute("disabled", true);
       return;
     }
@@ -684,7 +692,7 @@ var HistoryMenu = {
     undoPopup.parentNode.removeAttribute("disabled");
 
     // populate menu
-    let undoItems = JSON.parse(gSessionStore.getClosedWindowData());
+    let undoItems = JSON.parse(this._ss.getClosedWindowData());
     for (let i = 0; i < undoItems.length; i++) {
       let undoItem = undoItems[i];
       let otherTabsCount = undoItem.tabs.length - 1;
diff --git a/browser/base/content/browser-textZoom.js b/browser/base/content/browser-textZoom.js
index ba7a4a00e38..d947ebdd359 100644
--- a/browser/base/content/browser-textZoom.js
+++ b/browser/base/content/browser-textZoom.js
@@ -77,6 +77,12 @@ var FullZoom = {
                        getService(Ci.nsIContentPrefService);
   },
 
+  get _prefBranch FullZoom_get__prefBranch() {
+    delete this._prefBranch;
+    return this._prefBranch = Cc["@mozilla.org/preferences-service;1"].
+                              getService(Ci.nsIPrefBranch2);
+  },
+
   // browser.zoom.siteSpecific preference cache
   _siteSpecificPref: undefined,
 
@@ -119,7 +125,9 @@ var FullZoom = {
 
     // We disable site-specific preferences in Private Browsing mode, because the
     // content preferences module is disabled
-    gObserverService.addObserver(this, "private-browsing", true);
+    let os = Cc["@mozilla.org/observer-service;1"].
+             getService(Ci.nsIObserverService);
+    os.addObserver(this, "private-browsing", true);
 
     // Retrieve the initial status of the Private Browsing mode.
     this._inPrivateBrowsing = Cc["@mozilla.org/privatebrowsing;1"].
@@ -127,17 +135,19 @@ var FullZoom = {
                               privateBrowsingEnabled;
 
     this._siteSpecificPref =
-      gPrefService.getBoolPref("browser.zoom.siteSpecific");
+      this._prefBranch.getBoolPref("browser.zoom.siteSpecific");
     this.updateBackgroundTabs = 
-      gPrefService.getBoolPref("browser.zoom.updateBackgroundTabs");
+      this._prefBranch.getBoolPref("browser.zoom.updateBackgroundTabs");
     // Listen for changes to the browser.zoom branch so we can enable/disable
     // updating background tabs and per-site saving and restoring of zoom levels.
-    gPrefService.addObserver("browser.zoom.", this, true);
+    this._prefBranch.addObserver("browser.zoom.", this, true);
   },
 
   destroy: function FullZoom_destroy() {
-    gObserverService.removeObserver(this, "private-browsing");
-    gPrefService.removeObserver("browser.zoom.", this);
+    let os = Cc["@mozilla.org/observer-service;1"].
+             getService(Ci.nsIObserverService);
+    os.removeObserver(this, "private-browsing");
+    this._prefBranch.removeObserver("browser.zoom.", this);
     this._cps.removeObserver(this.name, this);
     window.removeEventListener("DOMMouseScroll", this, false);
     delete this._cps;
@@ -203,11 +213,11 @@ var FullZoom = {
         switch(aData) {
           case "browser.zoom.siteSpecific":
             this._siteSpecificPref =
-              gPrefService.getBoolPref("browser.zoom.siteSpecific");
+              this._prefBranch.getBoolPref("browser.zoom.siteSpecific");
             break;
           case "browser.zoom.updateBackgroundTabs":
             this.updateBackgroundTabs =
-              gPrefService.getBoolPref("browser.zoom.updateBackgroundTabs");
+              this._prefBranch.getBoolPref("browser.zoom.updateBackgroundTabs");
             break;
         }
         break;
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 8dcba6a119a..2cae4f4b2d5 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -116,20 +116,10 @@ var gEditUIVisible = true;
   });
 });
 
-[
-  ["gPrefService",       "preferences-service;1",      "nsIPrefBranch2"],
-  ["gPermissionManager", "permissionmanager;1",        "nsIPermissionManager"],
-  ["gObserverService",   "observer-service;1",         "nsIObserverService"],
-  ["gWindowMediator",    "appshell/window-mediator;1", "nsIWindowMediator"],
-  ["gPromptService",     "embedcomp/prompt-service;1", "nsIPromptService"],
-  ["gSearchService",     "browser/search-service;1",   "nsIBrowserSearchService"],
-  ["gSessionStore",      "browser/sessionstore;1",     "nsISessionStore"],
-].forEach(function (service) {
-  let [name, cid, iface] = service;
-  window.__defineGetter__(name, function () {
-    delete window[name];
-    return window[name] = Cc["@mozilla.org/" + cid].getService(Ci[iface]);
-  });
+__defineGetter__("gPrefService", function() {
+  delete this.gPrefService;
+  return this.gPrefService = Cc["@mozilla.org/preferences-service;1"].
+                             getService(Ci.nsIPrefBranch2);
 });
 
 __defineGetter__("PluralForm", function() {
@@ -324,6 +314,7 @@ function findChildShell(aDocument, aDocShell, aSoughtURI) {
 
 const gPopupBlockerObserver = {
   _reportButton: null,
+  _kIPM: Components.interfaces.nsIPermissionManager,
 
   onUpdatePageReport: function (aEvent)
   {
@@ -392,9 +383,11 @@ const gPopupBlockerObserver = {
   toggleAllowPopupsForSite: function (aEvent)
   {
     var currentURI = gBrowser.selectedBrowser.webNavigation.currentURI;
+    var pm = Components.classes["@mozilla.org/permissionmanager;1"]
+                       .getService(this._kIPM);
     var shouldBlock = aEvent.target.getAttribute("block") == "true";
-    var perm = shouldBlock ? gPermissionManager.DENY_ACTION : gPermissionManager.ALLOW_ACTION;
-    gPermissionManager.add(currentURI, "popup", perm);
+    var perm = shouldBlock ? this._kIPM.DENY_ACTION : this._kIPM.ALLOW_ACTION;
+    pm.add(currentURI, "popup", perm);
 
     gBrowser.getNotificationBox().removeCurrentNotification();
   },
@@ -415,7 +408,8 @@ const gPopupBlockerObserver = {
     try {
       blockedPopupAllowSite.removeAttribute("hidden");
 
-      if (gPermissionManager.testPermission(uri, "popup") == gPermissionManager.ALLOW_ACTION) {
+      var pm = Cc["@mozilla.org/permissionmanager;1"].getService(this._kIPM);
+      if (pm.testPermission(uri, "popup") == this._kIPM.ALLOW_ACTION) {
         // Offer an item to block popups for this site, if a whitelist entry exists
         // already for it.
         let blockString = gNavigatorBundle.getFormattedString("popupBlock", [uri.host]);
@@ -530,7 +524,9 @@ const gPopupBlockerObserver = {
                    permissionType : "popup",
                    windowTitle    : bundlePreferences.getString("popuppermissionstitle"),
                    introText      : bundlePreferences.getString("popuppermissionstext") };
-    var existingWindow = gWindowMediator.getMostRecentWindow("Browser:Permissions");
+    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                        .getService(Components.interfaces.nsIWindowMediator);
+    var existingWindow = wm.getMostRecentWindow("Browser:Permissions");
     if (existingWindow) {
       existingWindow.initWithParams(params);
       existingWindow.focus();
@@ -1027,7 +1023,9 @@ function BrowserStartup() {
 
   // Certain kinds of automigration rely on this notification to complete their
   // tasks BEFORE the browser window is shown.
-  gObserverService.notifyObservers(null, "browser-window-before-show", "");
+  Cc["@mozilla.org/observer-service;1"]
+    .getService(Ci.nsIObserverService)
+    .notifyObservers(null, "browser-window-before-show", "");
 
   // Set a sane starting width/height for all resolutions on new profiles.
   if (!document.documentElement.hasAttribute("width")) {
@@ -1155,7 +1153,8 @@ function prepareForStartup() {
   // progress notifications for back/forward button updating
   webNavigation.sessionHistory = Components.classes["@mozilla.org/browser/shistory;1"]
                                            .createInstance(Components.interfaces.nsISHistory);
-  gObserverService.addObserver(gBrowser.browsers[0], "browser:purge-session-history", false);
+  var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+  os.addObserver(gBrowser.browsers[0], "browser:purge-session-history", false);
 
   // remove the disablehistory attribute so the browser cleans up, as
   // though it had done this work itself
@@ -1184,8 +1183,9 @@ function prepareForStartup() {
 }
 
 function delayedStartup(isLoadingBlank, mustLoadSidebar) {
-  gObserverService.addObserver(gSessionHistoryObserver, "browser:purge-session-history", false);
-  gObserverService.addObserver(gXPInstallObserver, "xpinstall-install-blocked", false);
+  var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+  os.addObserver(gSessionHistoryObserver, "browser:purge-session-history", false);
+  os.addObserver(gXPInstallObserver, "xpinstall-install-blocked", false);
 
   BrowserOffline.init();
   OfflineApps.init();
@@ -1259,10 +1259,13 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
                                                          [brandShortName]);
       var checkboxLabel = shellBundle.getFormattedString("setDefaultBrowserDontAsk",
                                                          [brandShortName]);
+      const IPS = Components.interfaces.nsIPromptService;
+      var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+                                                .getService(IPS);
       var checkEveryTime = { value: shouldCheck };
-      var rv = gPromptService.confirmEx(window, promptTitle, promptMessage,
-                                        gPromptService.STD_YES_NO_BUTTONS,
-                                        null, null, null, checkboxLabel, checkEveryTime);
+      var rv = ps.confirmEx(window, promptTitle, promptMessage,
+                            IPS.STD_YES_NO_BUTTONS,
+                            null, null, null, checkboxLabel, checkEveryTime);
       if (rv == 0)
         shell.setDefaultBrowser(true, false);
       shell.shouldCheckDefaultBrowser = checkEveryTime.value;
@@ -1299,7 +1302,9 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
   // initialize the session-restore service (in case it's not already running)
   if (document.documentElement.getAttribute("windowtype") == "navigator:browser") {
     try {
-      gSessionStore.init(window);
+      var ss = Cc["@mozilla.org/browser/sessionstore;1"].
+               getService(Ci.nsISessionStore);
+      ss.init(window);
     } catch(ex) {
       dump("nsSessionStore could not be initialized: " + ex + "\n");
     }
@@ -1381,8 +1386,10 @@ function BrowserShutdown()
     Components.utils.reportError(ex);
   }
 
-  gObserverService.removeObserver(gSessionHistoryObserver, "browser:purge-session-history");
-  gObserverService.removeObserver(gXPInstallObserver, "xpinstall-install-blocked");
+  var os = Components.classes["@mozilla.org/observer-service;1"]
+    .getService(Components.interfaces.nsIObserverService);
+  os.removeObserver(gSessionHistoryObserver, "browser:purge-session-history");
+  os.removeObserver(gXPInstallObserver, "xpinstall-install-blocked");
 
   try {
     gBrowser.removeProgressListener(window.XULBrowserWindow);
@@ -1406,7 +1413,9 @@ function BrowserShutdown()
   DownloadMonitorPanel.uninit();
   gPrivateBrowsingUI.uninit();
 
-  var enumerator = gWindowMediator.getEnumerator(null);
+  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
+  var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
+  var enumerator = windowManagerInterface.getEnumerator(null);
   enumerator.getNext();
   if (!enumerator.hasMoreElements()) {
     document.persist("sidebar-box", "sidebarcommand");
@@ -1899,6 +1908,8 @@ function getShortcutOrURI(aURL, aPostDataRef) {
   var shortcutURL = null;
   var keyword = aURL;
   var param = "";
+  var searchService = Cc["@mozilla.org/browser/search-service;1"].
+                      getService(Ci.nsIBrowserSearchService);
 
   var offset = aURL.indexOf(" ");
   if (offset > 0) {
@@ -1909,7 +1920,7 @@ function getShortcutOrURI(aURL, aPostDataRef) {
   if (!aPostDataRef)
     aPostDataRef = {};
 
-  var engine = gSearchService.getEngineByAlias(keyword);
+  var engine = searchService.getEngineByAlias(keyword);
   if (engine) {
     var submission = engine.getSubmission(param, null);
     aPostDataRef.value = submission.postData;
@@ -2276,7 +2287,9 @@ function PageProxyClickHandler(aEvent)
 function BrowserImport()
 {
 #ifdef XP_MACOSX
-  var win = gWindowMediator.getMostRecentWindow("Browser:MigrationWizard");
+  var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                     .getService(Components.interfaces.nsIWindowMediator);
+  var win = wm.getMostRecentWindow("Browser:MigrationWizard");
   if (win)
     win.focus();
   else {
@@ -2422,10 +2435,12 @@ function BrowserOnCommand(event) {
  */
 function getMeOutOfHere() {
   // Get the start page from the *default* pref branch, not the user's
+  var prefs = Cc["@mozilla.org/preferences-service;1"]
+             .getService(Ci.nsIPrefService).getDefaultBranch(null);
   var url = "about:blank";
   try {
-    url = gPrefService.getComplexValue("browser.startup.homepage",
-                                       Ci.nsIPrefLocalizedString).data;
+    url = prefs.getComplexValue("browser.startup.homepage",
+                                Ci.nsIPrefLocalizedString).data;
     // If url is a pipe-delimited set of pages, just take the first one.
     if (url.indexOf("|") != -1)
       url = url.split("|")[0];
@@ -2711,11 +2726,12 @@ var homeButtonObserver = {
 
 function openHomeDialog(aURL)
 {
+  var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
   var promptTitle = gNavigatorBundle.getString("droponhometitle");
   var promptMsg   = gNavigatorBundle.getString("droponhomemsg");
-  var pressedVal  = gPromptService.confirmEx(window, promptTitle, promptMsg,
-                                             gPromptService.STD_YES_NO_BUTTONS,
-                                             null, null, null, null, {value:0});
+  var pressedVal  = promptService.confirmEx(window, promptTitle, promptMsg,
+                          promptService.STD_YES_NO_BUTTONS,
+                          null, null, null, null, {value:0});
 
   if (pressedVal == 0) {
     try {
@@ -2967,7 +2983,9 @@ const BrowserSearch = {
     // to the list of hidden engines rather than to the main list.
     // XXX This will need to be changed when engines are identified by URL;
     // see bug 335102.
-    if (gSearchService.getEngineByName(engine.title))
+    var searchService = Cc["@mozilla.org/browser/search-service;1"].
+                        getService(Ci.nsIBrowserSearchService);
+    if (searchService.getEngineByName(engine.title))
       hidden = true;
 
     var engines = (hidden ? browser.hiddenEngines : browser.engines) || [];
@@ -3043,7 +3061,9 @@ const BrowserSearch = {
       searchBar.select();
       searchBar.focus();
     } else {
-      let searchForm = gSearchService.defaultEngine.searchForm;
+      var ss = Cc["@mozilla.org/browser/search-service;1"].
+               getService(Ci.nsIBrowserSearchService);
+      var searchForm = ss.defaultEngine.searchForm;
       loadURI(searchForm, null, null, false);
     }
   },
@@ -3060,14 +3080,16 @@ const BrowserSearch = {
    *        tab.
    */
   loadSearch: function BrowserSearch_search(searchText, useNewTab) {
+    var ss = Cc["@mozilla.org/browser/search-service;1"].
+             getService(Ci.nsIBrowserSearchService);
     var engine;
   
     // If the search bar is visible, use the current engine, otherwise, fall
     // back to the default engine.
     if (isElementVisible(this.searchBar))
-      engine = gSearchService.currentEngine;
+      engine = ss.currentEngine;
     else
-      engine = gSearchService.defaultEngine;
+      engine = ss.defaultEngine;
   
     var submission = engine.getSubmission(searchText, null); // HTML response
 
@@ -3199,7 +3221,9 @@ function BrowserDownloadsUI()
 
 function toOpenWindowByType(inType, uri, features)
 {
-  var topWindow = gWindowMediator.getMostRecentWindow(inType);
+  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
+  var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
+  var topWindow = windowManagerInterface.getMostRecentWindow(inType);
 
   if (topWindow)
     topWindow.focus();
@@ -3211,7 +3235,9 @@ function toOpenWindowByType(inType, uri, features)
 
 function toOpenDialogByTypeAndUrl(inType, relatedUrl, windowUri, features, extraArgument)
 {
-  var windows = gWindowMediator.getEnumerator(inType);
+  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
+  var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
+  var windows = windowManagerInterface.getEnumerator(inType);
 
   // Check for windows matching the url
   while (windows.hasMoreElements()) {
@@ -4229,6 +4255,8 @@ var XULBrowserWindow = {
     gBrowser.mCurrentBrowser.engines = null;    
 
     var uri = aRequest.QueryInterface(Ci.nsIChannel).URI;
+    var observerService = Cc["@mozilla.org/observer-service;1"]
+                            .getService(Ci.nsIObserverService);
 
     if (gURLBar &&
         gURLBar.value == "" &&
@@ -4236,7 +4264,7 @@ var XULBrowserWindow = {
       URLBarSetURI(uri);
 
     try {
-      gObserverService.notifyObservers(content, "StartDocumentLoad", uri.spec);
+      observerService.notifyObservers(content, "StartDocumentLoad", uri.spec);
     } catch (e) {
     }
   },
@@ -4244,9 +4272,12 @@ var XULBrowserWindow = {
   endDocumentLoad: function (aRequest, aStatus) {
     var urlStr = aRequest.QueryInterface(Ci.nsIChannel).originalURI.spec;
 
+    var observerService = Cc["@mozilla.org/observer-service;1"]
+                            .getService(Ci.nsIObserverService);
+
     var notification = Components.isSuccessCode(aStatus) ? "EndDocumentLoad" : "FailDocumentLoad";
     try {
-      gObserverService.notifyObservers(content, notification, urlStr);
+      observerService.notifyObservers(content, notification, urlStr);
     } catch (e) {
     }
   }
@@ -5006,12 +5037,14 @@ function SelectDetector(event, doReload)
     }
 
     try {
+        var pref = Components.classes["@mozilla.org/preferences-service;1"]
+                             .getService(Components.interfaces.nsIPrefBranch);
         var str =  Components.classes["@mozilla.org/supports-string;1"]
                              .createInstance(Components.interfaces.nsISupportsString);
 
         str.data = prefvalue;
-        gPrefService.setComplexValue("intl.charset.detector",
-                                     Ci.nsISupportsString, str);
+        pref.setComplexValue("intl.charset.detector",
+                             Components.interfaces.nsISupportsString, str);
         if (doReload) window.content.location.reload();
     }
     catch (ex) {
@@ -5069,8 +5102,10 @@ function UpdateCharsetDetector()
     var prefvalue;
 
     try {
-        prefvalue = gPrefService.getComplexValue("intl.charset.detector",
-                                                 Ci.nsIPrefLocalizedString).data;
+        var pref = Components.classes["@mozilla.org/preferences-service;1"]
+                             .getService(Components.interfaces.nsIPrefBranch);
+        prefvalue = pref.getComplexValue("intl.charset.detector",
+                                         Components.interfaces.nsIPrefLocalizedString).data;
     }
     catch (ex) {
         prefvalue = "";
@@ -5100,7 +5135,8 @@ function UpdateMenus(event)
 
 function CreateMenu(node)
 {
-  gObserverService.notifyObservers(null, "charsetmenu-selected", node);
+  var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+  observerService.notifyObservers(null, "charsetmenu-selected", node);
 }
 
 function charsetLoadListener (event)
@@ -5221,51 +5257,59 @@ var BrowserOffline = {
     if (!this._uiElement)
       this._uiElement = document.getElementById("goOfflineMenuitem");
 
-    gObserverService.addObserver(this, "network:offline-status-changed", false);
+    var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+    os.addObserver(this, "network:offline-status-changed", false);
 
-    // if IO Service is managing the offline status, then IOService.offline
-    // is already set correctly. We will continue to allow the IO Service
+    var ioService = Components.classes["@mozilla.org/network/io-service;1"].
+      getService(Components.interfaces.nsIIOService2);
+
+    // if ioService is managing the offline status, then ioservice.offline
+    // is already set correctly. We will continue to allow the ioService
     // to manage its offline state until the user uses the "Work Offline" UI.
     
-    if (!ContentAreaUtils.ioService.manageOfflineStatus) {
+    if (!ioService.manageOfflineStatus) {
       // set the initial state
       var isOffline = false;
       try {
         isOffline = gPrefService.getBoolPref("browser.offline");
       }
       catch (e) { }
-      ContentAreaUtils.ioService.offline = isOffline;
+      ioService.offline = isOffline;
     }
     
-    this._updateOfflineUI(ContentAreaUtils.ioService.offline);
+    this._updateOfflineUI(ioService.offline);
   },
 
   uninit: function ()
   {
     try {
-      gObserverService.removeObserver(this, "network:offline-status-changed");
+      var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+      os.removeObserver(this, "network:offline-status-changed");
     } catch (ex) {
     }
   },
 
   toggleOfflineStatus: function ()
   {
+    var ioService = Components.classes["@mozilla.org/network/io-service;1"].
+      getService(Components.interfaces.nsIIOService2);
+
     // Stop automatic management of the offline status
     try {
-      ContentAreaUtils.ioService.manageOfflineStatus = false;
+      ioService.manageOfflineStatus = false;
     } catch (ex) {
     }
   
-    if (!ContentAreaUtils.ioService.offline && !this._canGoOffline()) {
+    if (!ioService.offline && !this._canGoOffline()) {
       this._updateOfflineUI(false);
       return;
     }
 
-    ContentAreaUtils.ioService.offline = !ContentAreaUtils.ioService.offline;
+    ioService.offline = !ioService.offline;
 
     // Save the current state for later use as the initial state
     // (if there is no netLinkService)
-    gPrefService.setBoolPref("browser.offline", ContentAreaUtils.ioService.offline);
+    gPrefService.setBoolPref("browser.offline", ioService.offline);
   },
 
   /////////////////////////////////////////////////////////////////////////////
@@ -5282,15 +5326,18 @@ var BrowserOffline = {
   // BrowserOffline Implementation Methods
   _canGoOffline: function ()
   {
-    try {
-      let cancelGoOffline = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
-      gObserverService.notifyObservers(cancelGoOffline, "offline-requested", null);
+    var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+    if (os) {
+      try {
+        var cancelGoOffline = Components.classes["@mozilla.org/supports-PRBool;1"].createInstance(Components.interfaces.nsISupportsPRBool);
+        os.notifyObservers(cancelGoOffline, "offline-requested", null);
 
-      // Something aborted the quit process.
-      if (cancelGoOffline.data)
-        return false;
-    }
-    catch (ex) {
+        // Something aborted the quit process.
+        if (cancelGoOffline.data)
+          return false;
+      }
+      catch (ex) {
+      }
     }
     return true;
   },
@@ -5311,14 +5358,18 @@ var OfflineApps = {
   // OfflineApps Public Methods
   init: function ()
   {
-    gObserverService.addObserver(this, "dom-storage-warn-quota-exceeded", false);
-    gObserverService.addObserver(this, "offline-cache-update-completed", false);
+    var obs = Cc["@mozilla.org/observer-service;1"].
+              getService(Ci.nsIObserverService);
+    obs.addObserver(this, "dom-storage-warn-quota-exceeded", false);
+    obs.addObserver(this, "offline-cache-update-completed", false);
   },
 
   uninit: function ()
   {
-    gObserverService.removeObserver(this, "dom-storage-warn-quota-exceeded");
-    gObserverService.removeObserver(this, "offline-cache-update-completed");
+    var obs = Cc["@mozilla.org/observer-service;1"].
+              getService(Ci.nsIObserverService);
+    obs.removeObserver(this, "dom-storage-warn-quota-exceeded");
+    obs.removeObserver(this, "offline-cache-update-completed");
   },
 
   handleEvent: function(event) {
@@ -5411,8 +5462,10 @@ var OfflineApps = {
 
     // Now that we've warned once, prevent the warning from showing up
     // again.
-    gPermissionManager.add(aURI, "offline-app",
-                           Ci.nsIOfflineCacheUpdateService.ALLOW_NO_WARN);
+    var pm = Cc["@mozilla.org/permissionmanager;1"].
+             getService(Ci.nsIPermissionManager);
+    pm.add(aURI, "offline-app",
+           Ci.nsIOfflineCacheUpdateService.ALLOW_NO_WARN);
   },
 
   // XXX: duplicated in preferences/advanced.js
@@ -5443,8 +5496,11 @@ var OfflineApps = {
   },
 
   _checkUsage: function(aURI) {
+    var pm = Cc["@mozilla.org/permissionmanager;1"].
+             getService(Ci.nsIPermissionManager);
+
     // if the user has already allowed excessive usage, don't bother checking
-    if (gPermissionManager.testExactPermission(aURI, "offline-app") !=
+    if (pm.testExactPermission(aURI, "offline-app") !=
         Ci.nsIOfflineCacheUpdateService.ALLOW_NO_WARN) {
       var usage = this._getOfflineAppUsage(aURI.asciiHost);
       var warnQuota = gPrefService.getIntPref("offline-apps.quota.warn");
@@ -5466,10 +5522,12 @@ var OfflineApps = {
                                                    aContentWindow);
 
     var currentURI = aContentWindow.document.documentURIObject;
+    var pm = Cc["@mozilla.org/permissionmanager;1"].
+             getService(Ci.nsIPermissionManager);
 
     // don't bother showing UI if the user has already made a decision
-    if (gPermissionManager.testExactPermission(currentURI, "offline-app") !=
-        gPermissionManager.UNKNOWN_ACTION)
+    if (pm.testExactPermission(currentURI, "offline-app") !=
+        Ci.nsIPermissionManager.UNKNOWN_ACTION)
       return;
 
     try {
@@ -5523,8 +5581,10 @@ var OfflineApps = {
   },
 
   allowSite: function(aDocument) {
-    gPermissionManager.add(aDocument.documentURIObject, "offline-app",
-                           gPermissionManager.ALLOW_ACTION);
+    var pm = Cc["@mozilla.org/permissionmanager;1"].
+             getService(Ci.nsIPermissionManager);
+    pm.add(aDocument.documentURIObject, "offline-app",
+           Ci.nsIPermissionManager.ALLOW_ACTION);
 
     // When a site is enabled while loading, manifest resources will
     // start fetching immediately.  This one time we need to do it
@@ -5533,8 +5593,10 @@ var OfflineApps = {
   },
 
   disallowSite: function(aDocument) {
-    gPermissionManager.add(aDocument.documentURIObject, "offline-app",
-                           gPermissionManager.DENY_ACTION);
+    var pm = Cc["@mozilla.org/permissionmanager;1"].
+             getService(Ci.nsIPermissionManager);
+    pm.add(aDocument.documentURIObject, "offline-app",
+           Ci.nsIPermissionManager.DENY_ACTION);
   },
 
   manage: function() {
@@ -5645,7 +5707,9 @@ var MailIntegration = {
 function BrowserOpenAddonsMgr(aPane)
 {
   const EMTYPE = "Extension:Manager";
-  var theEM = gWindowMediator.getMostRecentWindow(EMTYPE);
+  var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                     .getService(Components.interfaces.nsIWindowMediator);
+  var theEM = wm.getMostRecentWindow(EMTYPE);
   if (theEM) {
     theEM.focus();
     if (aPane)
@@ -6136,8 +6200,10 @@ function undoCloseTab(aIndex) {
     blankTabToRemove = gBrowser.selectedTab;
 
   var tab = null;
-  if (gSessionStore.getClosedTabCount(window) > (aIndex || 0)) {
-    tab = gSessionStore.undoCloseTab(window, aIndex || 0);
+  var ss = Cc["@mozilla.org/browser/sessionstore;1"].
+           getService(Ci.nsISessionStore);
+  if (ss.getClosedTabCount(window) > (aIndex || 0)) {
+    tab = ss.undoCloseTab(window, aIndex || 0);
     
     if (blankTabToRemove)
       gBrowser.removeTab(blankTabToRemove);
@@ -6153,11 +6219,13 @@ function undoCloseTab(aIndex) {
  * @returns a reference to the reopened window.
  */
 function undoCloseWindow(aIndex) {
-  let win = null;
-  if (gSessionStore.getClosedWindowCount() > (aIndex || 0))
-    win = gSessionStore.undoCloseWindow(aIndex || 0);
+  let ss = Cc["@mozilla.org/browser/sessionstore;1"].
+           getService(Ci.nsISessionStore);
+  let window = null;
+  if (ss.getClosedWindowCount() > (aIndex || 0))
+    window = ss.undoCloseWindow(aIndex || 0);
 
-  return win;
+  return window;
 }
 
 /**
@@ -6712,11 +6780,14 @@ function getBrowser() gBrowser;
 function getNavToolbox() gNavToolbox;
 
 let gPrivateBrowsingUI = {
+  _observerService: null,
   _privateBrowsingService: null,
   _privateBrowsingAutoStarted: false,
 
   init: function PBUI_init() {
-    gObserverService.addObserver(this, "private-browsing", false);
+    this._observerService = Cc["@mozilla.org/observer-service;1"].
+                            getService(Ci.nsIObserverService);
+    this._observerService.addObserver(this, "private-browsing", false);
 
     this._privateBrowsingService = Cc["@mozilla.org/privatebrowsing;1"].
                                    getService(Ci.nsIPrivateBrowsingService);
@@ -6726,7 +6797,7 @@ let gPrivateBrowsingUI = {
   },
 
   uninit: function PBUI_unint() {
-    gObserverService.removeObserver(this, "private-browsing");
+    this._observerService.removeObserver(this, "private-browsing");
   },
 
   observe: function PBUI_observe(aSubject, aTopic, aData) {
@@ -6764,9 +6835,12 @@ let gPrivateBrowsingUI = {
 #endif
     var message = pbBundle.formatStringFromName("privateBrowsingMessage", [appName], 1);
 
-    var flags = gPromptService.BUTTON_TITLE_IS_STRING * gPromptService.BUTTON_POS_0 +
-                gPromptService.BUTTON_TITLE_IS_STRING * gPromptService.BUTTON_POS_1 +
-                gPromptService.BUTTON_POS_0_DEFAULT;
+    var promptService = Cc["@mozilla.org/embedcomp/prompt-service;1"].
+                        getService(Ci.nsIPromptService);
+
+    var flags = promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_0 +
+                promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_1 +
+                promptService.BUTTON_POS_0_DEFAULT;
 
     var neverAsk = {value:false};
     var button0Title = pbBundle.GetStringFromName("privateBrowsingYesTitle");
@@ -6774,9 +6848,9 @@ let gPrivateBrowsingUI = {
     var neverAskText = pbBundle.GetStringFromName("privateBrowsingNeverAsk");
 
     var result;
-    var choice = gPromptService.confirmEx(null, dialogTitle, header + message,
-                                          flags, button0Title, button1Title, null,
-                                          neverAskText, neverAsk);
+    var choice = promptService.confirmEx(null, dialogTitle, header + message,
+                               flags, button0Title, button1Title, null,
+                               neverAskText, neverAsk);
 
     switch (choice) {
     case 0: // Start Private Browsing
diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js
index 32a424e3da4..83cbad59841 100644
--- a/toolkit/content/contentAreaUtils.js
+++ b/toolkit/content/contentAreaUtils.js
@@ -46,7 +46,7 @@ var ContentAreaUtils = {
     delete this.ioService;
     return this.ioService =
       Components.classes["@mozilla.org/network/io-service;1"]
-                .getService(Components.interfaces.nsIIOService2);
+                .getService(Components.interfaces.nsIIOService);
   }
 }
 

From b8240a8c1102a00f0942ea833df8bd9419c705cd Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Wed, 29 Jul 2009 17:01:48 +0800
Subject: [PATCH 058/175] Bug 468659 - Crash [@
 nsAccessNode::GetDocAccessibleFor(nsIDocShellTreeItem*, int) ], r=ginn.chen

---
 accessible/src/base/nsAccessNode.cpp          | 47 +++++------
 accessible/src/base/nsAccessNode.h            |  6 +-
 .../src/base/nsAccessibilityService.cpp       | 77 +++++++++++++------
 accessible/src/base/nsAccessibilityService.h  | 10 +++
 accessible/src/base/nsDocAccessible.cpp       |  4 +-
 accessible/src/msaa/nsAccessNodeWrap.cpp      |  9 +--
 6 files changed, 88 insertions(+), 65 deletions(-)

diff --git a/accessible/src/base/nsAccessNode.cpp b/accessible/src/base/nsAccessNode.cpp
index e8d3c59f069..49ab420022c 100644
--- a/accessible/src/base/nsAccessNode.cpp
+++ b/accessible/src/base/nsAccessNode.cpp
@@ -40,7 +40,7 @@
 #include "nsIAccessible.h"
 #include "nsAccessibilityAtoms.h"
 #include "nsHashtable.h"
-#include "nsIAccessibilityService.h"
+#include "nsAccessibilityService.h"
 #include "nsIAccessibleDocument.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
@@ -82,27 +82,19 @@ nsIStringBundle *nsAccessNode::gStringBundle = 0;
 nsIStringBundle *nsAccessNode::gKeyStringBundle = 0;
 nsITimer *nsAccessNode::gDoCommandTimer = 0;
 nsIDOMNode *nsAccessNode::gLastFocusedNode = 0;
+#ifdef DEBUG
 PRBool nsAccessNode::gIsAccessibilityActive = PR_FALSE;
-PRBool nsAccessNode::gIsShuttingDownApp = PR_FALSE;
+#endif
 PRBool nsAccessNode::gIsCacheDisabled = PR_FALSE;
 PRBool nsAccessNode::gIsFormFillEnabled = PR_FALSE;
 nsAccessNodeHashtable nsAccessNode::gGlobalDocAccessibleCache;
 
 nsApplicationAccessibleWrap *nsAccessNode::gApplicationAccessible = nsnull;
 
-nsIAccessibilityService *nsAccessNode::sAccService = nsnull;
-nsIAccessibilityService *nsAccessNode::GetAccService()
+nsIAccessibilityService*
+nsAccessNode::GetAccService()
 {
-  if (!gIsAccessibilityActive)
-    return nsnull;
-
-  if (!sAccService) {
-    nsresult rv = CallGetService("@mozilla.org/accessibilityService;1",
-                                 &sAccService);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "No accessibility service");
-  }
-
-  return sAccService;
+  return nsAccessibilityService::GetAccessibilityService();
 }
 
 /*
@@ -245,9 +237,7 @@ NS_IMETHODIMP nsAccessNode::GetOwnerWindow(void **aWindow)
 already_AddRefed<nsApplicationAccessibleWrap>
 nsAccessNode::GetApplicationAccessible()
 {
-  if (!gIsAccessibilityActive) {
-    return nsnull;
-  }
+  NS_ASSERTION(gIsAccessibilityActive, "Accessibility wasn't initialized!");
 
   if (!gApplicationAccessible) {
     nsApplicationAccessibleWrap::PreCreate();
@@ -273,9 +263,8 @@ nsAccessNode::GetApplicationAccessible()
 
 void nsAccessNode::InitXPAccessibility()
 {
-  if (gIsAccessibilityActive) {
-    return;
-  }
+  NS_ASSERTION(!gIsAccessibilityActive,
+               "Accessibility was initialized already!");
 
   nsCOMPtr<nsIStringBundleService> stringBundleService =
     do_GetService(NS_STRINGBUNDLE_CONTRACTID);
@@ -297,11 +286,13 @@ void nsAccessNode::InitXPAccessibility()
     prefBranch->GetBoolPref("browser.formfill.enable", &gIsFormFillEnabled);
   }
 
+#ifdef DEBUG
   gIsAccessibilityActive = PR_TRUE;
-  NotifyA11yInitOrShutdown();
+#endif
+  NotifyA11yInitOrShutdown(PR_TRUE);
 }
 
-void nsAccessNode::NotifyA11yInitOrShutdown()
+void nsAccessNode::NotifyA11yInitOrShutdown(PRBool aIsInit)
 {
   nsCOMPtr<nsIObserverService> obsService =
     do_GetService("@mozilla.org/observer-service;1");
@@ -310,7 +301,7 @@ void nsAccessNode::NotifyA11yInitOrShutdown()
     static const PRUnichar kInitIndicator[] = { '1', 0 };
     static const PRUnichar kShutdownIndicator[] = { '0', 0 }; 
     obsService->NotifyObservers(nsnull, "a11y-init-or-shutdown",
-                                gIsAccessibilityActive ? kInitIndicator  : kShutdownIndicator);
+                                aIsInit ? kInitIndicator  : kShutdownIndicator);
   }
 }
 
@@ -320,16 +311,12 @@ void nsAccessNode::ShutdownXPAccessibility()
   // which happens when xpcom is shutting down
   // at exit of program
 
-  if (!gIsAccessibilityActive) {
-    return;
-  }
-  gIsShuttingDownApp = PR_TRUE;
+  NS_ASSERTION(gIsAccessibilityActive, "Accessibility was shutdown already!");
 
   NS_IF_RELEASE(gStringBundle);
   NS_IF_RELEASE(gKeyStringBundle);
   NS_IF_RELEASE(gDoCommandTimer);
   NS_IF_RELEASE(gLastFocusedNode);
-  NS_IF_RELEASE(sAccService);
 
   nsApplicationAccessibleWrap::Unload();
   ClearCache(gGlobalDocAccessibleCache);
@@ -339,8 +326,10 @@ void nsAccessNode::ShutdownXPAccessibility()
   NS_IF_RELEASE(gApplicationAccessible);
   gApplicationAccessible = nsnull;  
 
+#ifdef DEBUG
   gIsAccessibilityActive = PR_FALSE;
-  NotifyA11yInitOrShutdown();
+#endif
+  NotifyA11yInitOrShutdown(PR_FALSE);
 }
 
 PRBool
diff --git a/accessible/src/base/nsAccessNode.h b/accessible/src/base/nsAccessNode.h
index 46f9e2270e5..da3ecb5faf9 100644
--- a/accessible/src/base/nsAccessNode.h
+++ b/accessible/src/base/nsAccessNode.h
@@ -174,21 +174,21 @@ protected:
     /**
      * Notify global nsIObserver's that a11y is getting init'd or shutdown
      */
-    static void NotifyA11yInitOrShutdown();
+    static void NotifyA11yInitOrShutdown(PRBool aIsInit);
 
     // Static data, we do our own refcounting for our static data
     static nsIStringBundle *gStringBundle;
     static nsIStringBundle *gKeyStringBundle;
     static nsITimer *gDoCommandTimer;
+#ifdef DEBUG
     static PRBool gIsAccessibilityActive;
-    static PRBool gIsShuttingDownApp;
+#endif
     static PRBool gIsCacheDisabled;
     static PRBool gIsFormFillEnabled;
 
     static nsAccessNodeHashtable gGlobalDocAccessibleCache;
 
 private:
-  static nsIAccessibilityService *sAccService;
   static nsApplicationAccessibleWrap *gApplicationAccessible;
 };
 
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 4cebad4ac76..116bc73d5e8 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -113,6 +113,7 @@
 #endif
 
 nsAccessibilityService *nsAccessibilityService::gAccessibilityService = nsnull;
+PRBool nsAccessibilityService::gIsShutdown = PR_TRUE;
 
 /**
   * nsAccessibilityService
@@ -120,6 +121,7 @@ nsAccessibilityService *nsAccessibilityService::gAccessibilityService = nsnull;
 
 nsAccessibilityService::nsAccessibilityService()
 {
+  // Add observers.
   nsCOMPtr<nsIObserverService> observerService = 
     do_GetService("@mozilla.org/observer-service;1");
   if (!observerService)
@@ -132,13 +134,15 @@ nsAccessibilityService::nsAccessibilityService()
                                   nsIWebProgress::NOTIFY_STATE_DOCUMENT |
                                   nsIWebProgress::NOTIFY_LOCATION);
   }
+
+  // Initialize accessibility.
   nsAccessNodeWrap::InitAccessibility();
 }
 
 nsAccessibilityService::~nsAccessibilityService()
 {
-  nsAccessibilityService::gAccessibilityService = nsnull;
-  nsAccessNodeWrap::ShutdownAccessibility();
+  NS_ASSERTION(gIsShutdown, "Accessibility wasn't shutdown!");
+  gAccessibilityService = nsnull;
 }
 
 NS_IMPL_THREADSAFE_ISUPPORTS5(nsAccessibilityService, nsIAccessibilityService, nsIAccessibleRetrieval,
@@ -151,6 +155,8 @@ nsAccessibilityService::Observe(nsISupports *aSubject, const char *aTopic,
                          const PRUnichar *aData)
 {
   if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
+
+    // Remove observers.
     nsCOMPtr<nsIObserverService> observerService = 
       do_GetService("@mozilla.org/observer-service;1");
     if (observerService) {
@@ -159,8 +165,8 @@ nsAccessibilityService::Observe(nsISupports *aSubject, const char *aTopic,
     nsCOMPtr<nsIWebProgress> progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID));
     if (progress)
       progress->RemoveProgressListener(static_cast<nsIWebProgressListener*>(this));
-    nsAccessNodeWrap::ShutdownAccessibility();
-    // Cancel and release load timers
+
+    // Cancel and release load timers.
     while (mLoadTimers.Count() > 0 ) {
       nsCOMPtr<nsITimer> timer = mLoadTimers.ObjectAt(0);
       void *closure = nsnull;
@@ -172,7 +178,18 @@ nsAccessibilityService::Observe(nsISupports *aSubject, const char *aTopic,
       timer->Cancel();
       mLoadTimers.RemoveObjectAt(0);
     }
+
+    // Application is going to be closed, shutdown accessibility and mark
+    // accessibility service as shutdown to prevent calls of its methods.
+    // Don't null accessibility service static member at this point to be safe
+    // if someone will try to operate with it.
+
+    NS_ASSERTION(!gIsShutdown, "Accessibility was shutdown already");
+
+    gIsShutdown = PR_TRUE;
+    nsAccessNodeWrap::ShutdownAccessibility();
   }
+
   return NS_OK;
 }
 
@@ -182,7 +199,8 @@ NS_IMETHODIMP nsAccessibilityService::OnStateChange(nsIWebProgress *aWebProgress
 {
   NS_ASSERTION(aStateFlags & STATE_IS_DOCUMENT, "Other notifications excluded");
 
-  if (!aWebProgress || 0 == (aStateFlags & (STATE_START | STATE_STOP))) {
+  if (gIsShutdown || !aWebProgress ||
+      (aStateFlags & (STATE_START | STATE_STOP)) == 0) {
     return NS_OK;
   }
   
@@ -260,23 +278,26 @@ nsAccessibilityService::FireAccessibleEvent(PRUint32 aEvent,
 
 void nsAccessibilityService::StartLoadCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsIAccessibilityService *accService = nsAccessNode::GetAccService();
-  if (accService)
-    accService->ProcessDocLoadEvent(aTimer, aClosure, nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_START);
+  if (gAccessibilityService)
+    gAccessibilityService->
+      ProcessDocLoadEvent(aTimer, aClosure,
+                          nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_START);
 }
 
 void nsAccessibilityService::EndLoadCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsIAccessibilityService *accService = nsAccessNode::GetAccService();
-  if (accService)
-    accService->ProcessDocLoadEvent(aTimer, aClosure, nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_COMPLETE);
+  if (gAccessibilityService)
+    gAccessibilityService->
+      ProcessDocLoadEvent(aTimer, aClosure,
+                          nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_COMPLETE);
 }
 
 void nsAccessibilityService::FailedLoadCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsIAccessibilityService *accService = nsAccessNode::GetAccService();
-  if (accService)
-    accService->ProcessDocLoadEvent(aTimer, aClosure, nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_STOPPED);
+  if (gAccessibilityService)
+    gAccessibilityService->
+      ProcessDocLoadEvent(aTimer, aClosure,
+                          nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_STOPPED);
 }
 
 /* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */
@@ -1315,7 +1336,7 @@ NS_IMETHODIMP nsAccessibilityService::GetAccessible(nsIDOMNode *aNode,
   NS_ENSURE_ARG_POINTER(aAccessible);
   NS_ENSURE_ARG_POINTER(aFrameHint);
   *aAccessible = nsnull;
-  if (!aPresShell || !aWeakShell) {
+  if (!aPresShell || !aWeakShell || gIsShutdown) {
     return NS_ERROR_FAILURE;
   }
 
@@ -2056,22 +2077,28 @@ NS_IMETHODIMP nsAccessibilityService::InvalidateSubtreeFor(nsIPresShell *aShell,
 nsresult 
 nsAccessibilityService::GetAccessibilityService(nsIAccessibilityService** aResult)
 {
-  NS_PRECONDITION(aResult != nsnull, "null ptr");
-  if (! aResult)
-      return NS_ERROR_NULL_POINTER;
-
+  NS_ENSURE_TRUE(aResult, NS_ERROR_NULL_POINTER);
   *aResult = nsnull;
-  if (!nsAccessibilityService::gAccessibilityService) {
+
+  if (!gAccessibilityService) {
     gAccessibilityService = new nsAccessibilityService();
-    if (!gAccessibilityService ) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
+    NS_ENSURE_TRUE(gAccessibilityService, NS_ERROR_OUT_OF_MEMORY);
+
+    gIsShutdown = PR_FALSE;
   }
-  *aResult = nsAccessibilityService::gAccessibilityService;
-  NS_ADDREF(*aResult);
+
+  NS_ADDREF(*aResult = gAccessibilityService);
   return NS_OK;
 }
 
+nsIAccessibilityService*
+nsAccessibilityService::GetAccessibilityService()
+{
+  NS_ASSERTION(!gIsShutdown,
+               "Going to deal with shutdown accessibility service!");
+  return gAccessibilityService;
+}
+
 nsresult
 NS_GetAccessibilityService(nsIAccessibilityService** aResult)
 {
diff --git a/accessible/src/base/nsAccessibilityService.h b/accessible/src/base/nsAccessibilityService.h
index 6b673d5c13b..9bd43b7bfc9 100644
--- a/accessible/src/base/nsAccessibilityService.h
+++ b/accessible/src/base/nsAccessibilityService.h
@@ -84,6 +84,16 @@ public:
    */
   static nsresult GetAccessibilityService(nsIAccessibilityService** aResult);
 
+  /**
+   * Return cached accessibility service.
+   */
+  static nsIAccessibilityService* GetAccessibilityService();
+
+  /**
+   * Indicates whether accessibility service was shutdown.
+   */
+  static PRBool gIsShutdown;
+
 private:
   /**
    * Return presentation shell, DOM node for the given frame.
diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp
index 5da571d6bed..0977c237408 100644
--- a/accessible/src/base/nsDocAccessible.cpp
+++ b/accessible/src/base/nsDocAccessible.cpp
@@ -39,7 +39,7 @@
 #include "nsRootAccessible.h"
 #include "nsAccessibilityAtoms.h"
 #include "nsAccessibleEventData.h"
-#include "nsIAccessibilityService.h"
+#include "nsAccessibilityService.h"
 #include "nsIMutableArray.h"
 #include "nsICommandManager.h"
 #include "nsIDocShell.h"
@@ -670,7 +670,7 @@ nsDocAccessible::Shutdown()
   // Remove from the cache after other parts of Shutdown(), so that Shutdown() procedures
   // can find the doc or root accessible in the cache if they need it.
   // We don't do this during ShutdownAccessibility() because that is already clearing the cache
-  if (!gIsShuttingDownApp)
+  if (!nsAccessibilityService::gIsShutdown)
     gGlobalDocAccessibleCache.Remove(static_cast<void*>(kungFuDeathGripDoc));
 
   return NS_OK;
diff --git a/accessible/src/msaa/nsAccessNodeWrap.cpp b/accessible/src/msaa/nsAccessNodeWrap.cpp
index c0d5b581a52..c58d57e74fc 100644
--- a/accessible/src/msaa/nsAccessNodeWrap.cpp
+++ b/accessible/src/msaa/nsAccessNodeWrap.cpp
@@ -593,9 +593,8 @@ __try {
  
 void nsAccessNodeWrap::InitAccessibility()
 {
-  if (gIsAccessibilityActive) {
-    return;
-  }
+  NS_ASSERTION(!gIsAccessibilityActive,
+               "Accessibility was initialized already!");
 
   nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
   if (prefBranch) {
@@ -623,9 +622,7 @@ void nsAccessNodeWrap::ShutdownAccessibility()
   NS_IF_RELEASE(gTextEvent);
   ::DestroyCaret();
 
-  if (!gIsAccessibilityActive) {
-    return;
-  }
+  NS_ASSERTION(gIsAccessibilityActive, "Accessibility was shutdown already!");
 
   nsAccessNode::ShutdownXPAccessibility();
 }

From ec8032047d181f8f71d5bbdbabe11dea9edea738 Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Wed, 29 Jul 2009 17:03:20 +0800
Subject: [PATCH 059/175] Bug 494815 - Accessible name subtree computation
 should ignore whitespace when determining whether to strip user-entered
 value, r=davidb

---
 accessible/src/base/nsTextEquivUtils.cpp  | 38 +++++++++++++++--------
 accessible/tests/mochitest/test_name.html | 26 ++++++++++++++--
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/accessible/src/base/nsTextEquivUtils.cpp b/accessible/src/base/nsTextEquivUtils.cpp
index ec73a3fe580..a1ca0c23a4d 100644
--- a/accessible/src/base/nsTextEquivUtils.cpp
+++ b/accessible/src/base/nsTextEquivUtils.cpp
@@ -336,21 +336,33 @@ nsTextEquivUtils::AppendFromValue(nsIAccessible *aAccessible,
       NS_OK : NS_OK_NO_NAME_CLAUSE_HANDLED;
   }
 
-  nsCOMPtr<nsIAccessible> nextSibling;
-  aAccessible->GetNextSibling(getter_AddRefs(nextSibling));
-  if (nextSibling) {
-    nsCOMPtr<nsIAccessible> parent;
-    aAccessible->GetParent(getter_AddRefs(parent));
-    if (parent) {
-      nsCOMPtr<nsIAccessible> firstChild;
-      parent->GetFirstChild(getter_AddRefs(firstChild));
-      if (firstChild && firstChild != aAccessible) {
-        nsresult rv = aAccessible->GetValue(text);
-        NS_ENSURE_SUCCESS(rv, rv);
+  nsRefPtr<nsAccessible> acc = nsAccUtils::QueryAccessible(aAccessible);
+  nsCOMPtr<nsIDOMNode> node;
+  acc->GetDOMNode(getter_AddRefs(node));
+  NS_ENSURE_STATE(node);
 
-        return AppendString(aString, text) ?
-          NS_OK : NS_OK_NO_NAME_CLAUSE_HANDLED;
+  nsCOMPtr<nsIContent> content(do_QueryInterface(node));
+  NS_ENSURE_STATE(content);
+
+  nsCOMPtr<nsIContent> parent = content->GetParent();
+  PRInt32 indexOf = parent->IndexOf(content);
+
+  for (PRInt32 i = indexOf - 1; i >= 0; i--) {
+    // check for preceding text...
+    if (!parent->GetChildAt(i)->TextIsOnlyWhitespace()) {
+      PRUint32 childCount = parent->GetChildCount();
+      for (PRUint32 j = indexOf + 1; j < childCount; j++) {
+        // .. and subsequent text
+        if (!parent->GetChildAt(j)->TextIsOnlyWhitespace()) {
+          nsresult rv = aAccessible->GetValue(text);
+          NS_ENSURE_SUCCESS(rv, rv);
+
+          return AppendString(aString, text) ?
+            NS_OK : NS_OK_NO_NAME_CLAUSE_HANDLED;
+          break;
+        }
       }
+      break;
     }
   }
 
diff --git a/accessible/tests/mochitest/test_name.html b/accessible/tests/mochitest/test_name.html
index 07041fb2e9a..d97db17ac26 100644
--- a/accessible/tests/mochitest/test_name.html
+++ b/accessible/tests/mochitest/test_name.html
@@ -139,13 +139,13 @@
 
       // textarea's name should have the value, which initially is specified by
       // a text child.
-      testName("textareawithchild", "Story: Foo");
+      testName("textareawithchild", "Story Foo is ended.");
 
       // new textarea name should reflect the value change. 
       var elem = document.getElementById("textareawithchild");
       elem.value = "Bar";
 
-      testName("textareawithchild", "Story: Bar");
+      testName("textareawithchild", "Story Bar is ended.");
 
       /////////////////////////////////////////////////////////////////////////
       // label with nested combobox (test for 'f' item of name computation guide)
@@ -153,6 +153,9 @@
       testName("comboinstart", "One day(s).");
       testName("combo3", "day(s).");
 
+      testName("textboxinstart", "Two days.");
+      testName("textbox1", "days.");
+
       testName("comboinmiddle", "Subscribe to ATOM feed.");
       testName("combo4", "Subscribe to ATOM feed.");
 
@@ -163,6 +166,9 @@
       testName("comboinend", "This day was sunny");
       testName("combo6", "This day was");
 
+      testName("textboxinend", "This day was sunny");
+      testName("textbox2", "This day was");
+
       SimpleTest.finish();
     }
 
@@ -345,13 +351,15 @@
 
   <!-- A textarea nested in a label with a text child (bug #453371). -->
   <form>
-    <label>Story: 
+    <label>Story
       <textarea id="textareawithchild" name="name">Foo</textarea>
+      is ended.
     </label>
   </form>
 
   <!-- a label with a nested control in the start, middle and end -->
   <form>
+    <!-- at the start (without and with whitespaces) -->
     <label id="comboinstart"><select id="combo3">
         <option>One</option>
         <option>Two</option>
@@ -359,6 +367,12 @@
       day(s).
     </label>
 
+    <label id="textboxinstart">
+      <input id="textbox1" value="Two">
+      days.
+    </label>
+
+    <!-- in the middle -->
     <label id="comboinmiddle">
       Subscribe to
       <select id="combo4" name="occupation">
@@ -377,12 +391,18 @@
     </label>
     <input id="checkbox" type="checkbox" />
 
+    <!-- at the end (without and with whitespaces) -->
     <label id="comboinend">
       This day was
       <select id="combo6" name="occupation">
         <option>sunny</option>
         <option>rainy</option>
       </select></label>
+
+    <label id="textboxinend">
+      This day was
+      <input id="textbox2" value="sunny">
+    </label>
   </form>
 
 </body>

From 1164b263668268b54fcae28acb83251165e84e39 Mon Sep 17 00:00:00 2001
From: Ginn Chen <ginn.chen@sun.com>
Date: Wed, 29 Jul 2009 17:40:33 +0800
Subject: [PATCH 060/175] Bug 505678: Downloadable font feature is broken with
 Sun Studio compiler r=jdaggett

---
 gfx/thebes/src/gfxFontUtils.cpp | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/src/gfxFontUtils.cpp b/gfx/thebes/src/gfxFontUtils.cpp
index b3ce803a1ca..51b06505305 100644
--- a/gfx/thebes/src/gfxFontUtils.cpp
+++ b/gfx/thebes/src/gfxFontUtils.cpp
@@ -516,7 +516,12 @@ nsresult gfxFontUtils::MakeUniqueUserFontName(nsAString& aName)
 #pragma pack(1)
 
 struct AutoSwap_PRUint16 {
+#ifdef __SUNPRO_CC
+    AutoSwap_PRUint16& operator = (const PRUint16 aValue)
+      { this->value = NS_SWAP16(aValue); return *this; }
+#else
     AutoSwap_PRUint16(PRUint16 aValue) { value = NS_SWAP16(aValue); }
+#endif
     operator PRUint16() const { return NS_SWAP16(value); }
     operator PRUint32() const { return NS_SWAP16(value); }
     operator PRUint64() const { return NS_SWAP16(value); }
@@ -524,20 +529,35 @@ struct AutoSwap_PRUint16 {
 };
 
 struct AutoSwap_PRInt16 {
+#ifdef __SUNPRO_CC
+    AutoSwap_PRInt16& operator = (const PRInt16 aValue)
+      { this->value = NS_SWAP16(aValue); return *this; }
+#else
     AutoSwap_PRInt16(PRInt16 aValue) { value = NS_SWAP16(aValue); }
+#endif
     operator PRInt16() const { return NS_SWAP16(value); }
     operator PRUint32() const { return NS_SWAP16(value); }
     PRInt16  value;
 };
 
 struct AutoSwap_PRUint32 {
+#ifdef __SUNPRO_CC
+    AutoSwap_PRUint32& operator = (const PRUint32 aValue)
+      { this->value = NS_SWAP32(aValue); return *this; }
+#else
     AutoSwap_PRUint32(PRUint32 aValue) { value = NS_SWAP32(aValue); }
+#endif
     operator PRUint32() const { return NS_SWAP32(value); }
     PRUint32  value;
 };
 
 struct AutoSwap_PRUint64 {
+#ifdef __SUNPRO_CC
+    AutoSwap_PRUint64& operator = (const PRUint64 aValue)
+      { this->value = NS_SWAP64(aValue); return *this; }
+#else
     AutoSwap_PRUint64(PRUint64 aValue) { value = NS_SWAP64(aValue); }
+#endif
     operator PRUint64() const { return NS_SWAP64(value); }
     PRUint64  value;
 };
@@ -1641,4 +1661,4 @@ gfxFontUtils::MakeEOTHeader(const PRUint8 *aFontData, PRUint32 aFontDataLength,
     return NS_OK;
 }
 
-#endif
\ No newline at end of file
+#endif

From 9bbf2bc96ac425f40976592555e5cd6bb809616e Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Wed, 29 Jul 2009 14:38:36 +0200
Subject: [PATCH 061/175] Bug 492717 - nsNTLMAuthModule.cpp ParseType2Msg():
 need to check |offset| value; (Av1) offset and length; r=(kaie + rrelyea)
 no_sr

---
 security/manager/ssl/src/nsNTLMAuthModule.cpp | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/security/manager/ssl/src/nsNTLMAuthModule.cpp b/security/manager/ssl/src/nsNTLMAuthModule.cpp
index 0653b0383b7..0bd544d14d9 100644
--- a/security/manager/ssl/src/nsNTLMAuthModule.cpp
+++ b/security/manager/ssl/src/nsNTLMAuthModule.cpp
@@ -534,18 +534,34 @@ ParseType2Msg(const void *inBuf, PRUint32 inLen, Type2Msg *msg)
   // verify NTLMSSP signature
   if (memcmp(cursor, NTLM_SIGNATURE, sizeof(NTLM_SIGNATURE)) != 0)
     return NS_ERROR_UNEXPECTED;
+
   cursor += sizeof(NTLM_SIGNATURE);
 
   // verify Type-2 marker
   if (memcmp(cursor, NTLM_TYPE2_MARKER, sizeof(NTLM_TYPE2_MARKER)) != 0)
     return NS_ERROR_UNEXPECTED;
+
   cursor += sizeof(NTLM_TYPE2_MARKER);
 
-  // read target name security buffer
-  msg->targetLen = ReadUint16(cursor);
-  ReadUint16(cursor); // discard next 16-bit value
-  PRUint32 offset = ReadUint32(cursor); // get offset from inBuf
-  msg->target = ((const PRUint8 *) inBuf) + offset;
+  // Read target name security buffer: ...
+  // ... read target length.
+  PRUint32 targetLen = ReadUint16(cursor);
+  // ... skip next 16-bit "allocated space" value.
+  ReadUint16(cursor);
+  // ... read offset from inBuf.
+  PRUint32 offset = ReadUint32(cursor);
+  // Check the offset / length combo is in range of the input buffer, including
+  // integer overflow checking.
+  if (NS_LIKELY(offset < offset + targetLen && offset + targetLen <= inLen)) {
+    msg->targetLen = targetLen;
+    msg->target = ((const PRUint8 *) inBuf) + offset;
+  }
+  else
+  {
+    // Do not error out, for (conservative) backward compatibility.
+    msg->targetLen = 0;
+    msg->target = NULL;
+  }
 
   // read flags
   msg->flags = ReadUint32(cursor);

From d5c1d3cef6853b6bb77f899ca8806d349c5c3bce Mon Sep 17 00:00:00 2001
From: Tyler Downer <tyler.downer@gmail.com>
Date: Wed, 29 Jul 2009 14:41:32 +0200
Subject: [PATCH 062/175] Bug 470575 - Move PyXPCOM docs to dmo; r=mhammond

---
 extensions/python/xpcom/doc/advanced.html     | 176 -----------
 extensions/python/xpcom/doc/architecture.html | 116 -------
 extensions/python/xpcom/doc/configure.html    | 196 ------------
 extensions/python/xpcom/doc/credits.html      |  86 ------
 extensions/python/xpcom/doc/tutorial.html     | 286 ------------------
 extensions/python/xpcom/readme.html           | 121 --------
 6 files changed, 981 deletions(-)
 delete mode 100644 extensions/python/xpcom/doc/advanced.html
 delete mode 100644 extensions/python/xpcom/doc/architecture.html
 delete mode 100644 extensions/python/xpcom/doc/configure.html
 delete mode 100644 extensions/python/xpcom/doc/credits.html
 delete mode 100644 extensions/python/xpcom/doc/tutorial.html
 delete mode 100644 extensions/python/xpcom/readme.html

diff --git a/extensions/python/xpcom/doc/advanced.html b/extensions/python/xpcom/doc/advanced.html
deleted file mode 100644
index ab6994fcc8d..00000000000
--- a/extensions/python/xpcom/doc/advanced.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is PyXPCOM.
-   -
-   - The Initial Developer of the Original Code is
-   - ActiveState Tool Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2000-2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Python XPCOM Advanced Topics</title>
-</head>
-
-<body>
-
-<h1>Python XPCOM Advanced Topics</h1>
-
-<p>This document contains a series of tidbits that don't fit
-anywhere else. As the Python XPCOM Package documentation matures, most of
-these topics will have another home.</p>
-
-<h2>XPCOM Services</h2>
-<p>An XPCOM service is simply a singleton registered by name.&nbsp; Python has
-full support for both using and implementing XPCOM services.&nbsp; To use a
-service, use <i>xpcom.components.services</i> just like the JavaScript
-counterpart.&nbsp; There is nothing special about implementing a service in
-Python; see the standard XPCOM documentation on services for more information.</p>
-
-<h2>nsIVariant</h2>
-
-<p>There is (almost) full support for <i>nsIVariant</i>.&nbsp; Any <i>nsIVariant</i>
-parameters will automatically be translated to and from regular Python objects
-giving, in effect, a multi-type parameter.&nbsp; This should be automatic, so
-there is not much else to say!&nbsp; Note that if you really want, you can
-create and pass your own <i>nsIVariant</i> object instead of a regular Python
-object, thereby allowing explicit control over the type of variant created.</p>
-
-<h2>nsISupports Primitives.</h2>
-
-<p>There is a set of interfaces described in <i>nsISupportsPrimitives.idl</i>, which I
-term collectively the <i>nsISupports Primitives Interfaces</i>.&nbsp; These
-are a set of interfaces a component can support to allow automatic conversion to
-and from many basic types.&nbsp; For example, an interface can define that it
-supports the <i>nsISupportsCString</i> interface, and this could be used by any
-program that wishes to get a string representation of the object.&nbsp; If an
-interface wishes to expose itself as a &quot;boolean value&quot;, it may choose
-to support the <i>nsISupportsPRBool</i> interface.</p>
-<p>When you call an XPCOM object (i.e., you have an XPCOM interface you are
-calling), you can use
-the builtin functions <i>str()</i>, <i>int()</i>, <i>long()</i> etc., on the
-object<i>.</i>&nbsp; In the
-case of <i>str()</i>, if the object does not support the <i>nsISupportsCString</i>
-or <i>nsISupportsString</i> interfaces, the default string <i>str()</i> for the
-object will be returned (i.e., what is normally returned for most XPCOM objects -
-support for these interface is not very common!).&nbsp; In the case of the numeric functions, a <i>ValueError</i>
-exception will be raised if the objects do not support any interface that can be
-used for the conversion.&nbsp;<i>ValueError</i> is used instead of <i>TypeError</i>,
-as the type itself (i.e., an XPCOM object) can sometimes be used in this context -
-hence it is the specific <i>value</i> of the object that is the problem.</p>
-<p>The use of <i>repr()</i> on an XPCOM interface object prevents support
-attempts for these interfaces, and allows you to see the
-&quot;real&quot; object, rather than what the object wants you to see!</p>
-<p>When you implement an XPCOM object, you have two choices for implementation
-of these interfaces:</p>
-<ul>
-  <li>You can explicitly handle these interfaces like any other interface.&nbsp;
-    In this case, you have full control.&nbsp; However, if you
-    implement only one of these standard interfaces, then you are only
-    overriding the default behavior for that specific interface - all other
-    interfaces not explicitly listed in your class will still get the behavior
-    described below.<br>
-  </li>
-  <li>If your class does not define support for these interfaces, the framework
-    will use standard Python class semantics to implement them - i.e., if your
-    class provides a <i>__str__</i> method, it will be used to implement <i>nsISupportsCString</i>
-    and <i>nsISupportsString</i>, if you provide <i>__int__</i>, <i>__long__</i>,
-    <i>__float__</i> etc., methods, they will be used to implement the numeric
-    interfaces.&nbsp; If your class defines no such special methods, then the <i>
-    QueryInterface()</i> for those interfaces fails (rather than the QI succeeding
-    and the operation to fetch the data failing).</li>
-</ul>
-<blockquote>
-<p>This allows for an interesting feature that would not normally be
-possible.&nbsp; Consider Python code that does a <i>str()</i> on an&nbsp; XPCOM
-interface, and where the XPCOM interface itself is implemented in Python and
-provides a <i>__str__</i> method.&nbsp; The <i>str()</i> on the original
-interface queries for the <i>nsISupportsCString</i> interface.&nbsp; The
-Python implemented object responds to this interface and delegates to the <i>__str__</i>
-method. At the end of all this, <i>str()</i> returns the same result
-as if the objects were native Python objects with no XPCOM layer in between.</p>
-
-</blockquote>
-
-<h2>Enumerators</h2>
-
-<p>The primary enumerator used by XPCOM is <i>nsISimpleEnumerator</i>.
-Although the Python XPCOM package has full support for <i>nsIEnumerator</i>,
-since this interface is not &quot;scriptable&quot;, you should avoided using it in interfaces
-you design.</p>
-
-<p>When you use <i>nsISimpleEnumerator</i> from Python, the following enhancements
-are available:</p>
-<ul>
-  <li>The <i>GetNext()</i> method takes an optional IID as a parameter. If
-    this is specified, the returned object will be of this interface.&nbsp; This
-    prevents the manual <i>QueryInterface()</i> generally required from other
-    languages.</li>
-  <li>There is a <i>FetchBlock(num, [iid])</i> method, which fetches the
-    specified number of elements in one operation and returns a Python
-    list. This can be useful for large enumerator sets, so the loop
-    iterating the elements runs at full C++ speed.</li>
-</ul>
-<p><i>nsIEnumerator</i> has similar enhancements.</p>
-<p>When implementing a Python XPCOM object, the Python class <i>xpcom.server.enumerator.SimpleEnumerator()</i>
-can be used.&nbsp; You can pass a standard Python sequence (list, etc), and it
-will be correctly wrapped in an <i>nsISimpleEnumerator</i> interface.</p>
-<h2>Files</h2>
-<p>The Python XPCOM package provides an <i> xpcom.file</i> module.&nbsp; This implements
-a Python-like file object on top of the XPCOM/Mozilla stream interfaces.&nbsp;
-When run from within the Mozilla environment, this allows you to open almost any
-URL supported by Mozilla (including &quot;chrome://&quot; etc.,).</p>
-<p>See this module for more information, including test code.</p>
-<h2>XPCOM Object Identity</h2>
-<p>XPCOM has defined rules for object identity and for how objects must behave
-in their <i> QueryInterface()</i> implementations.&nbsp; The Python XPCOM framework
-manages this for you; your code can return new Python instances etc., when
-responding to new interfaces, and the framework itself will ensure the XPCOM
-semantics are followed.&nbsp; Critically, the framework provides no mechanism
-for breaking these rules.</p>
-<h2>Policies</h2>
-<p>The Python XPCOM framework has the concept of &quot;policies&quot; that
-define how XPCOM semantics are mapped to Python objects.&nbsp; It is the policy
-that implements delegation of <i> QueryInterface()</i>, translates property
-references into direct property references, and failing that, &quot;get_name&quot;
-and &quot;set_name&quot; calls, decides how to handle exceptions in the
-component, and so on.</p>
-<p>The default policy is very flexible and suitable for most purposes.
-Indeed, the Komodo project has never had to implement a custom policy.
-However, you should be aware the feature exists should you wish to do some
-bizarre things, such as using Python as a bridge between XPCOM and some other
-component technology.</p>
-
-</body>
-
-</html>
diff --git a/extensions/python/xpcom/doc/architecture.html b/extensions/python/xpcom/doc/architecture.html
deleted file mode 100644
index d12a2a76dee..00000000000
--- a/extensions/python/xpcom/doc/architecture.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is PyXPCOM.
-   -
-   - The Initial Developer of the Original Code is
-   - ActiveState Tool Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2000-2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Architecture</title>
-</head>
-
-<body>
-
-<h1>Python XPCOM Package Architecture</h1>
-<h2><a name="Architecture">Architecture</a></h2>
-<p>Much of the design for the Python XPCOM Package has been borrowed from the Python MS-COM
-extensions in <i>win32com</i>. Most of the major limitations and drawbacks in the <i>win32com</i>
-design have been addressed, mainly &quot;auto-wrapping&quot; of
-interface objects, which is not supported by <i>win32com</i>.</p>
-<p>Like <i>win32com</i>, this architecture includes the concept of <i>client COM</i> and <i>server
-COM.</i> </p>
-<p>Client COM:</p>
-<ul>
-  <li>calls other interfaces</li>
-  <li>is supported by <i>PyInterfaces</i> implemented in C++, which assists
-in making the COM calls</li>
-  <li>is supported by <i>PyGateways</i>, which assists in receiving
-external COM calls and dispatching them to the correct Python object</li>
-  <li> is supported in the <i>xpcom/client</i>  package</li>
-</ul>
-<p>Server COM:</p>
-<ul>
-  <li>implements interfaces for use by other XPCOM applications or components</li>
-  <li> is
-supported in the <i>xpcom/server</i>  package</li>
-</ul>
-<p>The XPConnect framework is very powerful, and far exceeds what COM's <i>
-IDispatch</i> can offer.&nbsp; Thus, we are able to get by with far fewer interfaces
-supported in the C++ level, and defer most things to the Python code that uses
-XPConnect.&nbsp; As a result, the requirement for a huge number of interfaces to
-exist in the <i>.pyd</i> does not exist.&nbsp; There are, however, a number of
-interfaces that do require native C++ support: these are interfaces
-required to &quot;boot&quot; the XPConnect support (i.e., the interfaces that are
-used to get information about interfaces), and also two gateways that need to
-work without interface information available. This last requirement is
-due to the XPCOM shutdown-ordering - it may be a bug, but is not an unreasonable
-amount of code anyway.</p>
-<p><b>Auto-wrapping</b> of COM objects is supported by both client COM and
-server COM.&nbsp;For client COM, auto-wrapping means that the
-Python programmer always sees Python &quot;component&quot; objects, rather than
-raw C++ interface objects; to the user, it all appears to &quot;just
-work&quot;.&nbsp; This is a major source of frustration in the <i>win32com</i>
-framework.</p>
-<p>For server COM, auto-wrapping means that you can
-pass Python instances wherever a COM object is expected. If the Python
-instance supports COM interfaces, by virtue of having a <i>_com_interfaces_</i>
-attribute that lists the interface requested, it will be automatically wrapped
-in the correct COM object.&nbsp;</p>
-<p><b>Error Handling:</b> The C++ framework has good error handling support,
-and uses the XPCOM console service to log debug messages, Python exceptions and
-tracebacks.&nbsp; <i>win32com</i> does not have good exception/traceback support
-at the C++ level, mainly because COM does not define a service like
-the console where debug messages can go.&nbsp; This does mean that in Mozilla
-release builds, these debug messages are likely to be lost, but the <i>--console</i>
-command line option to a release Mozilla will get them back.&nbsp; Therefore,
-the other error-support utilities, such as the error callbacks made on the
-policy object, may be used.</p>
-<p><b>Component Loader, Modules and Factories:</b>&nbsp; XPCOM has the concept
-of a component loader - a module used to load all components of a
-particular type.&nbsp; For example, the <i>moz.jsloader.1</i> component loads all
-the JavaScript components.&nbsp;Similarly, the <i>moz.pyloader.1</i>
-component loads all Python components.&nbsp; However, unlike
-JavaScript, the Python component loader is actually implemented in Python
-itself!&nbsp;Since the Python component loader can not be used to load
-itself, this component has some special code, <i>pyloader.dll,</i>  to boot-strap itself.</p>
-<p>This means is that all XPCOM components, including the Python loader itself and all
-XPCOM module and factory interfaces, are implemented in
-Python.&nbsp;<b>There are no components or interfaces implemented purely in C++
-in this entire package!</b></p>
-
-</body>
-
-</html>
diff --git a/extensions/python/xpcom/doc/configure.html b/extensions/python/xpcom/doc/configure.html
deleted file mode 100644
index e2b5d416b6e..00000000000
--- a/extensions/python/xpcom/doc/configure.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is PyXPCOM.
-   -
-   - The Initial Developer of the Original Code is
-   - ActiveState Tool Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2000-2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Configuring your Environment</title>
-</head>
-
-<body>
-
-<h1>Building, Configuring and Testing Python XPCOM Package</h1>
-<p>This document attempts to explain how to build, configure and test the
-Python XPCOM Package. This document assumes you have already successfully
-built
-Mozilla from source and your environment is currently set up for such a build -
-see the <a href="http://www.mozilla.org/build/">Mozilla build documentation</a>
-for more information.</p>
-<p>PyXPCOM can be built on Windows using either the <i>nmake makefile.win</i>
-process, or the <i>configure; gmake</i> process used by Linux.</p>
-<h2>configure; gmake Instructions</h2>
-<h3>Preparing for the build</h3>
-<ul>
-  <li>Apply the patch in <a href="http://bugzilla.mozilla.org/show_bug.cgi?id=129216">bugzilla
-    bug 129216</a>. (If this bug is marked as &quot;FIXED&quot;, it probably
-    means there is no need to apply the patch and that these docs are out of
-    date)</li>
-  <li>On Linux, you must have Python built for dynamic linking.&nbsp; <a href="http://aspn.activestate.com/ASPN/Python">ActivePython</a>
-    2.1 is one such build.</li>
-  <li>On Windows, you must have a Python source tree installed and built.&nbsp;
-    Patches gratefully accepted that allow an installed Python to be used (it
-    should not be hard!)</li>
-  <li>Ensure the Python interpreter you wish to use is on your path, such that
-    &quot;python&quot; will execute it correctly.&nbsp; The configure process
-    uses this to locate the Python support files.</li>
-</ul>
-<h3>Building</h3>
-<ul>
-  <li>From the top-level Mozilla directory, execute <i>./configure
-    --enable-extensions=python/xpcom</i>. As per the Mozilla build
-    instructions, you may add this option to your <i>.mozconfig</i> file.&nbsp;
-    If you wish to enable debugging, just enable it as you would normally for
-    Mozilla; PyXPCOM will pick up the same settings.<br>
-    (On Windows you will need to execute <i>sh ./configure ...</i> if running
-    from a Command Prompt.&nbsp; See the <a href="http://www.mozilla.org/build/win32.html#ss2.2b">Mozilla
-    win32 specific gmake build instructions</a> for more details.</li>
-  <li>Build the Mozilla tree as normal; PyXPCOM will automatically be
-    built.&nbsp; Alternatively, change to the top-level PyXPCOM directory and
-    execute <i>gmake</i> in that directory.</li>
-</ul>
-<h2>PyXPCOM outside Mozilla</h2>
-<p>When you are using PyXPCOM from inside mozilla, no additional configuration
-options should be necessary.&nbsp; However, if you wish to use PyXPCOM from
-stand-alone Python (ie, so you can write simple Python scripts that can be
-executed normally and use XPCOM), then additional environment variables must be
-setup.</p>
-<ul>
-  <li><a name="PYTHONPATH"><b>PYTHONPATH</b></a> - <tt>PYTHONPATH</tt>  needs to
-    be set appropriately.&nbsp;You must manually ensure that the <i>mozilla/dist/bin/python</i>
-    directory (which is where PyXPCOM was installed during the build process) is
-    listed.&nbsp; Note that when PyXPCOM is used from within Mozilla (or any
-    other xpcom process), this path will automatically be added to sys.path.&nbsp;
-    It is only when Python directly uses xpcom that this step is necessary.<br>
-    If anything is wrong here you should get a normal <tt>ImportError</tt>.</li>
-</ul>
-<blockquote>
-  <p>Note that on Windows, the PYTHONPATH is generally maintained in the
-  Registry; however, you can set this variable at a DOS prompt, and it will still be
-added to the core PYTHONPATH.
-</blockquote>
-<ul>
-  <li><b><a name="PATH">PATH</a>, LD_LIBRARY_PATH, etc</b> - On Windows, you
-    must ensure that the Mozilla bin directory is listed on your PATH, or that
-    you execute your scripts with the Mozilla bin directory as the current
-    directory.<br>
-    On Linux, you must set your PATH and LD_LIBRARY_PATH variables
-    appropriately.&nbsp; However, you may find it simpler and easier to use the <i>run-mozilla.sh</i>
-    script in the Mozilla bin directory.&nbsp; For example, changing to the
-    Mozilla bin directory and executing:<br>
-    <i>./run-mozilla.sh python ~/src/mozilla/extensions/python/xpcom/test/regrtest.py</i><br>
-    should setup a correct environment and execute the PyXPCOM test suite.</li>
-</ul>
-<h2><a name="RunningTheTests">Testing your Setup</a></h2>
-<p>The Python XPCOM Package has a complete test suite.</p>
-<p>In the rest of this section, we walk through some simpler tests a step at a time,
-to help diagnose any problems.</p>
-<p><b>Note:</b> We recommend you do all your testing outside of <i> mozilla.exe</i>; it is far simpler to test all of
-this using the PyXPCOM package stand-alone.</p>
-<p><b>Note:</b> On Windows, if you use a debug build of Mozilla (i.e., in <i>dist\WIN32_D.OBJ\bin)</i>,
-    you <b>must</b> use <i>python_d.exe</i>; if you use a release build (i.e., in
-    a <i>dist\WIN32_O.OBJ\bin</i> directory), you must use <i>python.exe</i>.&nbsp;
-<i>makefile.stupid.win</i> handles this automatically.</p>
-<p>To test your setup:</p>
-<ol>
-  <li>Start Python, and check<br>
-    &gt;&gt;&gt; <i>import xpcom</i><br>
-    works. If not, <a href="#PYTHONPATH">check your PYTHONPATH</a> - the
-    main PyXPCOM package can not be located.&nbsp; Also check your <a href="#PATH">PATH</a>,
-    and if you are on Linux, remember that executing ./run-mozilla.sh python is
-    the easiest way.</li>
-  <li>Check<i><br>
-    &gt;&gt;&gt; import xpcom._xpcom</i><br>
-
-works. If not, then most likely your <a href="#PATH">Mozilla
-    directory is not on your path</a>, or something is wrong with <i>_xpcom(_d).pyd/_xpcommodule.so</i>.</li>
-
-  <li>Next run a simple test: <i>test/test_misc.py</i>.&nbsp;With a Windows debug build, the command may look like:<br>
-    <i>C:\Anywhere&gt; python_d \src\python\xpcom\test\test_misc.py<br>
-    </i>or on Linux<br>
-    <i>/home/user/src/mozilla/dist/bin$ python /home/user/src/python/xpcom/test/test_misc.py</i></li>
-</ol>
-<p>If you can't get this going, you won't get much further! (You may see a few
-errors - that is OK, as long as it appears something worked!).&nbsp; If
-everything looks OK, the
-next step is to register our test component and run our full test suite.</p>
-<h2><a name="Registration">Registering the Loader and Test Component</a></h2>
-<p>First register the generic Python loader. For instructions, see the <a href="file:///F:/src/as/Komodo/src/pyxpcom/xpcom/doc/architecture.html">architecture
-document</a>.&nbsp;Do this only once, regardless of how many
-Python components you have.&nbsp; Then install the test component itself, and
-finally you can test it!</p>
-<h3>Registering the Python Loader and Component</h3>
-<p>To register the Python Loader and Component:</p>
-<ol>
-  <li>Ensure the build process has put <i>pyloader.dll </i>(or <i>modpyloader.so</i>
-    for Unix), and the files <i> py_test_component.py </i> and <i> py_test_component.idl</i> into
-    the Mozilla <i>bin/components</i> directory.&nbsp; If not, copy the files
-    there manually.</li>
-  <li>Run <i>regxpcom </i>(or .<i>/run-mozilla.sh ./regxpcom</i> if appropriate).&nbsp;<i>regxpcom</i> is a standard Mozilla
-    executable, found in the <i>bin</i>  directory, that detects the new DLL and
-    .py
-    files and registers them accordingly.&nbsp; You should
-    see a few messages that include the following:</li>
-</ol>
-<blockquote>
-  <pre>Registering: PythonComponentLoader
-Registered 1 Python components in pyloader.dll
-nsNativeComponentLoader: autoregistering succeeded
-Auto-registering all Python components in F:\src\mozilla\dist\WIN32_D.OBJ\bin\components
-Registering: PythonTestComponent
-Registered 1 Python components in py_test_component.py</pre>
-</blockquote>
-<p>If so (or you see no message at all), you are ready to run the test suite.</p>
-<p><b>Note</b>: If you execute this same step a second time, you will not
-see any of the above mentioned messages.&nbsp;XPCOM knows that nothing has
-changed since you last ran <i>regxpcom</i>, so nothing is registered.&nbsp; If
-you do not see these messages the first time you run it, there is the
-possibility that some other process, possibly the build process, has already
-executed this step.</p>
-<h2><b>Running the Test Suite</b></h2>
-<p>Before running the test suite, you should change to the <i>mozilla/xpcom/sample</i>
-directory and build it.&nbsp; This will build and install a sample component
-which is used by the test suite.&nbsp; If you do not have this component
-available, some of the Python tests will fail.</p>
-
-<p>To run the test suite, run <i>xpcom/test/regrtest.py.</i>&nbsp; This runs the
-tests and ensures that the test output is as expected.&nbsp; If all tests
-pass, you have a fully functioning Python XPCOM package.&nbsp; Enjoy!</p>
-
-</body>
-
-</html>
diff --git a/extensions/python/xpcom/doc/credits.html b/extensions/python/xpcom/doc/credits.html
deleted file mode 100644
index 2be7809fd1f..00000000000
--- a/extensions/python/xpcom/doc/credits.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is PyXPCOM.
-   -
-   - The Initial Developer of the Original Code is
-   - ActiveState Tool Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2000-2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<head>
-<meta http-equiv="Content-Language" content="en-au">
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Credits and Acknowledgements</title>
-</head>
-
-<body>
-
-<h1>Credits and Acknowledgements</h1>
-<h2>ActiveState Tool Corporation</h2>
-<p>The Python XPCOM Package was developed primarily by <a href="mailto:markh@activestate.com">Mark
-Hammond</a> of <a href="http://www.ActiveState.com">ActiveState Tool Corporation</a>.</p>
-<p>The developers on the <a href="http://www.ActiveState.com/Products/Komodo">Komodo
-project</a> deserve high praise for putting up with early versions when almost
-nothing worked, and for believing in Python as a viable XPCOM language.&nbsp;
-Their feedback and patience has allowed the first public release to be amazingly
-functional and bug-free.</p>
-<h3>Komodo Development Team (at December 2000)</h3>
-<p><a href="mailto:davida@activestate.com">David Ascher</a>, <a href="mailto:aaronb@ActiveState.com">Aaron Bingham</a>,
-<a href="mailto:bindu@activestate.com">Bin Du</a>, <a href="mailto:markh@activestate.com">Mark
-Hammond</a>, <a href="mailto:trentm@activestate.com">Trent Mick (build god)</a>,&nbsp;
-<a href="mailto:paulp@activestate.com">Paul Prescod</a>,&nbsp; <a href="mailto:ericp@ActiveState.com">Eric Promislow</a>,
-<a href="mailto:kens@ActiveState.com">Ken Simpson</a>, <a href="mailto:neilw@ActiveState.com">Neil Watkiss</a>,
-<a href="mailto:AudreyS@ActiveState.com">Audrey Schumacher</a>.</p>
-<h2>Mozilla/Netscape</h2>
-<p>The following people at <a href="http://www.netscape.com">Netscape</a> and <a href="http://www.mozilla.org">Mozilla</a>
-(or not there but still heavily involved in the project) have provided enormous
-help in getting things integrated with their build system, answering us on the
-newsgroup, teaching us the finer points of XPCOM, gently slapping us for accidentally
-referring to <i>jscript</i>, etc., and otherwise lending us a clue in the
-Mozilla/Netscape/XPCOM world.</p>
-<p><a href="mailto:jband@netscape.com">John Bandhauer</a>, <a href="mailto:brendan@meer.net">Brendan
-Eich</a>, <a href="mailto:shaver@zeroknowledge.com">Mike Shaver</a>, <a href="mailto:evaughan@netscape.com">Eric Vaughan</a>,
-<a href="mailto:hyatt@netscape.com">David Hyatt</a></p>
-<h2>External Contributors</h2>
-<p>The following people have made contributions to the project, simply because
-they find it useful and enjoy supporting Open Source projects.</p>
-<p><a href="mailto:cmeerw@web.de">Christof Meerwald</a></p>
-<h2>Documentation Credits</h2>
-<p>The following people have contributed to the Python XPCOM Package
-documentation&nbsp;</p>
-<p><a href="mailto:markh@activestate.com">Mark
-Hammond</a>, <a href="mailto:AudreyS@ActiveState.com">Audrey Schumacher</a></p>
-
-</body>
-
-</html>
diff --git a/extensions/python/xpcom/doc/tutorial.html b/extensions/python/xpcom/doc/tutorial.html
deleted file mode 100644
index 808d4c06f50..00000000000
--- a/extensions/python/xpcom/doc/tutorial.html
+++ /dev/null
@@ -1,286 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is PyXPCOM.
-   -
-   - The Initial Developer of the Original Code is
-   - ActiveState Tool Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2000-2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Python XPCOM Package Tutorial</title>
-</head>
-
-<body>
-
-<h1>Python XPCOM Package Tutorial</h1>
-<p>This is a quick introduction to the Python XPCOM Package. We assume that you have a good understanding of Python and <a href="http://www.mozilla.org/projects/xpcom/">XPCOM</a>,
-and have experience both using and implementing XPCOM objects in some other
-language (e.g., C++ or JavaScript). We <b><i>do not</i></b> attempt to
-provide a tutorial to XPCOM or Python itself, only to using Python <i>and</i>
- XPCOM.</p>
-<p>This tutorial contains the following sections:</p>
-<ul>
-  <li><a href="#Using">Using XPCOM Objects and Interfaces</a> - when you wish to
-    <i>use</i> a component written by anyone else in any XPCOM supported
-    language.</li>
-  <li><a href="#Implementing">Implementing XPCOM Objects and Interfaces</a> -
-    when you wish to implement a component for use by anyone else in any xpcom
-    supported language.</li>
-  <li><a href="#Parameters">Parameters and Types</a> - useful information
-    regarding how Python translates XPCOM types, and handles byref parameters.</li>
-</ul>
-<p>For anything not covered here, try the <a href="advanced.html">advanced
-documentation</a>, and if that fails, use the source, Luke!</p>
-<h2><a name="Using">Using XPCOM object and interfaces.</a></h2>
-<p>The techniques for using XPCOM in Python have been borrowed from JavaScript -
-thus, the model described here should be quite familiar to existing JavaScript
-XPCOM programmers.</p>
-<h3>xpcom.components module</h3>
-<p>When using an XPCOM object, the primary module used is the <u><i>xpcom.components</i></u>
- module.&nbsp; Using this module, you can get a Python object that supports any
-scriptable XPCOM interface. Once you have this Python object, you can
-simply call XPCOM methods on the object, as normal.</p>
-<p>The <u><i>xpcom.components</i></u> module defines the following public
-members:</p>
-<table border="1" width="100%">
-  <tr>
-    <td width="16%"><b>Name</b></td>
-    <td width="84%"><b>Description</b></td>
-  </tr>
-  <tr>
-    <td width="16%">classes</td>
-    <td width="84%">A mapping (dictionary-like object) used to get XPCOM
-      &quot;classes&quot;.&nbsp; These are indexed by XPCOM contract ID, just
-      like the JavaScript object of the same name.&nbsp;&nbsp;
-      <p>Example:</p>
-      <pre>cls = components.classes[&quot;@mozilla.org/sample;1&quot;]
-ob = cls.createInstance() # Now have an nsISupports</pre>
-    </td>
-  </tr>
-  <tr>
-    <td width="16%">interfaces</td>
-    <td width="84%">An object that exposes all XPCOM interface IDs (IIDs).&nbsp;
-      Like the JavaScript object of the same name, this object uses
-      &quot;dot&quot; notation, as demonstrated below.
-      <p>Example:</p>
-      <pre>ob = cls.createInstance(components.interfaces.nsISample) 
-# Now have an nsISample</pre>
-    </td>
-  </tr>
-</table>
-<p>For many people, this is all you need to know. Consider the Mozilla Sample Component.&nbsp; The Mozilla Sample
-Component has a contract ID of <i>@mozilla.org/sample;1</i>,
-and implements the <i>nsISample</i> interface.</p>
-<p>Thus, a complete Python program that uses this component is shown below.</p>
-<pre>from xpcom import components
-cls = components.classes[&quot;@mozilla.org/sample;1&quot;]
-ob = cls.createInstance() # no need to specify an IID for most components
-# nsISample defines a &quot;value&quot; property - let's use it!
-ob.value = &quot;new value&quot;
-if ob.value != &quot;new value&quot;:
-    print &quot;Eeek - what happened?&quot;</pre>
-<p>And that is it - a complete Python program that uses XPCOM.</p>
-<h2><a name="Implementing">Implementing XPCOM Objects and Interfaces.</a></h2>
-<p>Implementing XPCOM objects is almost as simple as using them. The
-basic strategy is this:</p>
-<ol>
-  <li>Create a standard Python source file, with a standard Python class.</li>
-  <li>Add some special <a href="#Attributes"> attributes</a> to your class for use by the Python XPCOM
-    framework. This controls the XPCOM behavior of your object.</li>
-  <li>Implement the XPCOM <a href="#Properties"> properties</a> and methods of your classes as normal.</li>
-  <li>Put the Python source file in the Mozilla <i> components</i> directory.</li>
-  <li>Run <i> regxpcom.</i></li>
-</ol>
-<p>Your component is now ready to be used.</p>
-<h3><a name="Attributes">Attributes</a></h3>
-<p>There are two classes of attributes: those used at runtime to define the object
-behavior and those used at registration time to control object
-registration.&nbsp; Not all objects require registration, thus not all
-Python XPCOM objects will have registration-related attributes.</p>
-<table border="1" width="100%">
-  <tr>
-    <td width="17%"><b>Attribute</b></td>
-    <td width="83%"><b>Description</b></td>
-  </tr>
-  <tr>
-    <td width="17%">_com_interfaces_</td>
-    <td width="83%">The interface IDs (IIDs) supported by the component.&nbsp;
-      For simplicity, this may be either a single IID, or a list of IIDs.&nbsp;
-      There is no need to specify base interfaces, as all parent interfaces are
-      automatically supported. Thus, it is never necessary to nominate <i>
-      nsISupports</i> in the list of interfaces.
-      <p>This attribute is required. Objects without such an attribute are
-      deemed unsuitable for use as a XPCOM object.</td>
-  </tr>
-  <tr>
-    <td width="17%">_reg_contractid_</td>
-    <td width="83%">The contract ID of the component.&nbsp; Required if the
-      component requires registration (i.e., exists in the components directory).</td>
-  </tr>
-  <tr>
-    <td width="17%">_reg_clsid_</td>
-    <td width="83%">The Class ID (CLSID) of the component, as a string in the
-      standard &quot;{XXX-XXX-XXX-XXX}&quot; format. Required if the
-      component requires registration (i.e., exists in the components directory).</td>
-  </tr>
-  <tr>
-    <td width="17%">_reg_registrar_</td>
-    <td width="83%">Nominates a function that is called at registration
-      time. The default is for no extra function to be called. This can
-      be useful if a component has special registration requirements and needs
-      to hook into the registration process.</td>
-  </tr>
-  <tr>
-    <td width="17%">_reg_desc_</td>
-    <td width="83%">The description of the XPCOM object. This may be used by
-      browsers or other such objects.&nbsp; If not specified, the contract ID
-      is used.</td>
-  </tr>
-</table>
-<h3><a name="Properties">Properties</a></h3>
-<p>A Python class can support XPCOM properties in one of two ways.&nbsp; Either
-a standard Python property of the same name can exist - our sample
-component demonstrates this with the <i>boolean_value</i> property.&nbsp;
-Alternatively, the class can provide the <i>get_propertyName(self)</i> and <i>set_propertyName(self,
-value)</i>  functions (with <i>propertyName</i> changed to the appropriate value for the
-property), and these functions will be called instead.</p>
-<h4>Example:&nbsp; The Python XPCOM Test Component</h4>
-<p>As an example, examine the Python XPCOM Test Component.&nbsp; This
-code can be found in <i>py_test_component.py</i>.</p>
-<pre>from xpcom import components
-
-class PythonTestComponent:
-    _com_interfaces_ = components.interfaces.nsIPythonTestInterface
-    _reg_clsid_ = &quot;{7EE4BDC6-CB53-42c1-A9E4-616B8E012ABA}&quot;
-    _reg_contractid_ = &quot;Python.TestComponent&quot;
-    def __init__(self):
-        self.boolean_value = 1
-        ...
-    def do_boolean(self, p1, p2):
-        ret = p1 ^ p2
-        return ret, not ret, ret
-...</pre>
-<p><b>Note:</b> This component only specifies the mandatory attributes - <i>_com_interfaces</i>,
-<i>_reg_clsid_</i> and <i>_reg_contractid_</i>.</p>
-<p>This sample code demonstrates supporting the <i>boolean_value</i> attribute,
-supported implicitly, as it is defined in the IDL and exists as a real Python
-attribute of that name, and a method called <i>do_boolean</i>.</p>
-<h4>Tip: The xpcom/xpt.py Script</h4>
-<p> The xpcom/xpt.py script is a useful script that can generate the skeleton of a class for
-any XPCOM interface.&nbsp; Just specify the interface name on the command-line,
-and paste the output into your source file.</p>
-<p>This is the output of running this program over the <i>nsISample</i>
-interface (i.e., assuming we wanted to implement a component that supported this
-interface):</p>
-<pre>class nsISample:
-    _com_interfaces_ = xpcom.components.interfaces.nsISample
-    # If this object needs to be registered, the following 2 are also needed.
-    # _reg_clsid_ = {a new clsid generated for this object}
-    # _reg_contractid_ = &quot;The.Object.Name&quot;
-
-    def get_value( self ):
-        # Result: string
-        pass
-    def set_value( self, param0 ):
-        # Result: void - None
-        # In: param0: string
-        pass
-    def writeValue( self, param0 ):
-        # Result: void - None
-        # In: param0: string
-        pass
-    def poke( self, param0 ):
-        # Result: void - None
-        # In: param0: string
-        pass</pre>
-<p><b>Note:</b> The types of the parameters and the function itself are included in
-the comments.&nbsp;You need to implement the functions
-themselves.&nbsp; Another advantage of this script is that the <a href="#HiddenParams">hidden
-parameters</a> are handled for you; the comments indicate when parameters
-have been hidden.</p>
-<h2><a name="Parameters">Parameters and Types</a></h2>
-<p>This section briefly describes the XPCOM type support in
-Python.</p>
-<p>All XPCOM interfaces define parameters of a specific type.&nbsp; There is
-currently no concept of a variant, or union of all types. Thus, the
-conversion rules are very straightforward, and generally surprise free: for
-any given XPCOM method, there is only one possible type for a given parameter.</p>
-<h3>Type Conversion Rules:</h3>
-<ul>
-  <li>All numeric types will attempt to be coerced to the correct type.&nbsp;
-    Thus, you can pass a Python float to an XPCOM method expecting an integer,
-    or vice-versa. Specifically, when an integer is required, you can pass
-    any Python object for which <i>int()</i> would succeed; for a Python float,
-    any object for which <i>float()</i> would succeed is acceptable.&nbsp; This
-    means that you can pass a Python string object as an integer, as long as the
-    string was holding a valid integer.</li>
-  <li>Strings and Unicode objects are interchangeable, but no other automatic
-    string conversions are performed.&nbsp; Thus, you can not pass an integer
-    where a string is expected, even though the reverse is true.</li>
-  <li>Any sequence object can be passed as an array.&nbsp; List objects are
-    always returned for arrays.</li>
-  <li>Any Python instance suitable for use as a XPCOM object (i.e., with the
-    <a href="#Implementing">necessary annotations</a>) can be
-    passed as a XPCOM object. No special wrapping step is needed to turn a
-    Python instance into a XPCOM object.&nbsp; Note you must pass a class <i>instance</i>,
-    not the class itself.</li>
-  <li><a name="HiddenParams">Many XPCOM <b> method signatures</b> specify
-    &quot;count&quot; or &quot;size&quot; parameters.&nbsp; For example, every
-    time an array is passed via XPCOM, the method signature will always specify
-    an integer that holds the count of the array.&nbsp; These parameters are
-    always hidden in Python.&nbsp; As the size param can be implied from the
-    length of the Python sequence passed, the Python programmer need never pass
-    these parameters;&nbsp;in contrast, JavaScript requires these redundant parameters.</a></li>
-</ul>
-
-<h2>Interface Flattening</h2>
-<p>Most people can ignore this information - Python XPCOM objects just
-work.&nbsp; However, if you are familiar with xpcom from C++ and the concept of <i>QueryInterface</i>,
-you may like to read this.</p>
-<p>Most components support the concept of &quot;interface
-flattening&quot;.&nbsp; Such objects can report the interfaces they support,
-allowing languages such as Python and Javascript avoid using <i>QueryInterface</i>.&nbsp;
-When you are using an XPCOM object from Python, you can just call methods and
-reference properties without regard for the interface that implements it.</p>
-<p>When multiple interfaces share the same method or property name, you can use
-the name of the interface as a differentiator.&nbsp; Thus, <i>ob.nsIFoo.close()</i>
-will call close on <i>ob</i>'s <i>nsIFoo</i> interface, while <i>ob.nsIBar.close()</i>
-will use the <i>nsIBar</i> interface.&nbsp; <i>ob.close()</i> is not defined.</p>
-
-</body>
-
-</html>
-
-
diff --git a/extensions/python/xpcom/readme.html b/extensions/python/xpcom/readme.html
deleted file mode 100644
index 112f43e0cf4..00000000000
--- a/extensions/python/xpcom/readme.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is PyXPCOM.
-   -
-   - The Initial Developer of the Original Code is
-   - ActiveState Tool Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2000-2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Python XPCOM module</title>
-</head>
-
-<body>
-
-<h1>Python XPCOM Package</h1>
-
-<p>Mozilla CVS Version - Last updated May 2002</p>
-<p>This is the readme for the Python interface to <b>XPCOM</b>.</p>
-<p><b>XPCOM </b>is an acronym for &quot;Cross Platform COM&quot;.&nbsp; It has
-come out of the <a href="http://www.mozilla.org">Mozilla</a>  project, which
-maintains the <a href="http://www.mozilla.org/projects/xpcom/">main XPCOM
-project pages.</a>&nbsp; The Python XPCOM package is a set of Python bindings to
-XPCOM, allowing a Python programmer to both use and implement XPCOM
-interfaces.&nbsp; If you don't know what <a href="http://www.python.org">Python</a>
-is, then none of this probably interests you at all!</p>
-<p>This readme has links to the following information:</p>
-<ul>
-  <li><a href="doc/configure.html">Building, Configuring and
-   Testing the Python
-    XPCOM Package</a></li>
-  <li><a href="doc/tutorial.html">A tutorial for the Python XPCOM package</a></li>
-  <li>Some <a href="doc/advanced.html">advanced
-    topics and other miscellaneous information</a></li>
-  <li><a href="doc/architecture.html">Information on the architecture</a></li>
-  <li>A list of the <a href="#KnownBugs">known issues and bugs</a>, the <a href="#ReleaseHistory">release
-    history</a> and the <a href="doc/credits.html">PyXPCOM acknowledgements</a></li>
-</ul>
-<p>Note: <b>This package requires Python 1.6 or later</b>; we recommend using
-the latest
-official Python version.&nbsp; This package works
-very well with the latest <a href="http://www.ActiveState.com/Products/ActivePython">ActivePython</a>,
-and does not require any external modules or packages beyond what is provided in
-the core Python release for each platform.</p>
-<h2>About the Python XPCOM Package</h2>
-<p>The Python XPCOM Package was developed by <a href="http://www.ActiveState.com">ActiveState
-Tool Corporation</a>, and came out of their <a href="http://www.ActiveState.com/Products/Komodo">Komodo
-project</a>.&nbsp; The Python XPCOM package is released under the <a href="http://www.mozilla.org/MPL/">Mozilla
-Public License (MPL)</a></p>
-<p>Please see the <a href="doc/credits.html">credits file</a> for a list of
-contributors. </p>
-<h2><a name="KnownBugs">Known Bugs</a>/Issues</h2>
-<ul>
-  <li>No attempt is made to recurse sub-directories of the main
-&quot;components&quot; directory.&nbsp; This is because we may decide on some
-smart scheme for recursion (similar to Python packages), and don't want people
-to rely on simple recursive searches.</li>
-  <li>No unregistration support at all.&nbsp;The main Python Component Loader supports
-    unregistration, but the actual Python objects themselves do not support unregistration.&nbsp;It is unclear if the Component Loader
-    unregistration process needs to manually remove each component it is responsible
-for.</li>
-  <li>All Python-implemented components unconditionally support
-weak-references.&nbsp; There is no way to disable this feature for any or all
-components.&nbsp; It is unclear if there is a need to prevent this, but it is
-documented here just in case!</li>
-</ul>
-<h2><a name="ReleaseHistory">Release History</a></h2>
-<h3>Version 0.90 - January 2001</h3>
-<ul>
-  <li>First public release.</li>
-</ul>
-<h3>Version 0.91 - January 2001</h3>
-<ul>
-  <li>Fix a seg fault on Linux when PYTHONPATH is not set.</li>
-  <li>Changes to allow building with stand-alone XPCOM.</li>
-</ul>
-
-<h3>Version 0.92 - May 2001</h3>
-<p>Implement interface flattening.&nbsp; You should (almost) never need to use <i>QueryInterface()</i>!&nbsp;
-We are still 100% backwards compatible, so usage of QI still works - just is
-generally not necessary.</p>
-
-<h3>Version 0.93 - May 2002</h3>
-
-<p>Implement <i>nsIVariant</i> and all new string types.&nbsp; Complete move to
-autoconf build system.</p>
-
-</body>
-
-</html>

From 650edb130c76c7dc83f278e9dcb5733331d90d7c Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Wed, 29 Jul 2009 08:53:27 -0400
Subject: [PATCH 063/175] Relanding bug 496823 in the hopes that it's not
 causing the XP Txul issue.

--HG--
extra : rebase_source : 593d43b5c229e077e4454d848dba59265dee6b58
---
 layout/base/nsCSSFrameConstructor.cpp |  4 ++--
 layout/generic/nsBlockFrame.cpp       | 14 ++++++++++++++
 layout/generic/nsBlockFrame.h         |  1 +
 layout/generic/nsFrame.cpp            |  6 ++++++
 layout/generic/nsIFrame.h             | 10 ++++++++++
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 4c518979b84..58682106cc0 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -5669,13 +5669,13 @@ AdjustAppendParentForAfterContent(nsPresContext* aPresContext,
 static nsIFrame*
 FindAppendPrevSibling(nsIFrame* aParentFrame, nsIFrame* aAfterFrame)
 {
-  nsFrameList childList(aParentFrame->GetFirstChild(nsnull));
   if (aAfterFrame) {
+    nsFrameList childList(aParentFrame->GetFirstChild(nsnull));
     NS_ASSERTION(aAfterFrame->GetParent() == aParentFrame, "Wrong parent");
     return childList.GetPrevSiblingFor(aAfterFrame);
   }
 
-  return childList.LastChild();
+  return aParentFrame->GetLastChild(nsnull);
 }
 
 /**
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 9e1e2658c69..c61f89eed78 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -541,6 +541,20 @@ nsBlockFrame::GetChildList(nsIAtom* aListName) const
   return nsContainerFrame::GetChildList(aListName);
 }
 
+nsIFrame*
+nsBlockFrame::GetLastChild(nsIAtom* aListName) const
+{
+  if (aListName) {
+    return nsBlockFrameSuper::GetLastChild(aListName);
+  }
+
+  if (mLines.empty()) {
+    return nsnull;
+  }
+
+  return mLines.back()->LastChild();
+}
+
 #define NS_BLOCK_FRAME_OVERFLOW_OOF_LIST_INDEX  (NS_CONTAINER_LIST_COUNT_INCL_OC + 0)
 #define NS_BLOCK_FRAME_FLOAT_LIST_INDEX         (NS_CONTAINER_LIST_COUNT_INCL_OC + 1)
 #define NS_BLOCK_FRAME_BULLET_LIST_INDEX        (NS_CONTAINER_LIST_COUNT_INCL_OC + 2)
diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h
index e51d9acc518..dedf6db4490 100644
--- a/layout/generic/nsBlockFrame.h
+++ b/layout/generic/nsBlockFrame.h
@@ -177,6 +177,7 @@ public:
   NS_IMETHOD  RemoveFrame(nsIAtom*        aListName,
                           nsIFrame*       aOldFrame);
   virtual nsFrameList GetChildList(nsIAtom* aListName) const;
+  virtual nsIFrame* GetLastChild(nsIAtom* aListName) const;
   virtual nscoord GetBaseline() const;
   virtual nsIAtom* GetAdditionalChildListName(PRInt32 aIndex) const;
   virtual void Destroy();
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index dee9e530a42..bd49f69a088 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -1667,6 +1667,12 @@ nsIFrame::CreateWidgetForView(nsIView* aView)
   return aView->CreateWidget(kWidgetCID);
 }
 
+nsIFrame*
+nsIFrame::GetLastChild(nsIAtom* aListName) const
+{
+  return nsLayoutUtils::GetLastSibling(GetFirstChild(aListName));
+}
+
 /**
   *
  */
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index b5143e6d072..def82baab31 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -868,6 +868,16 @@ public:
     return GetChildList(aListName).FirstChild();
   }
 
+  /**
+   * Get the last child frame from the specified child list.
+   *
+   * @param   aListName the name of the child list. A NULL pointer for the atom
+   *            name means the unnamed principal child list
+   * @return  the child frame, or NULL if there is no such child
+   * @see     #GetAdditionalListName()
+   */
+  virtual nsIFrame* GetLastChild(nsIAtom* aListName) const;
+
   /**
    * Child frames are linked together in a singly-linked list
    */

From d931760247a72a910b2d3085ad9f8833e515d7a9 Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Tue, 28 Jul 2009 16:28:24 -0400
Subject: [PATCH 064/175] Remove all of embedding/qa: it's completely unused
 and broken beyond repair. Checked with bc and a few others to make sure
 jstests weren't still in use by somebody.

---
 embedding/qa/Makefile.in                      |   46 -
 embedding/qa/jstests/ComponentListTest.txt    |  320 ----
 embedding/qa/jstests/EmbedSmokeTest.txt       |  397 ----
 .../accessibility/html/htmlanchor.html        |  183 --
 .../accessibility/html/htmlanchortext.html    |  175 --
 .../accessibility/html/htmlbutton.html        |  194 --
 .../accessibility/html/htmlbuttontext.html    |  151 --
 .../html/htmlcheckboxchecked.html             |  203 --
 .../html/htmlcheckboxunchecked.html           |  204 ---
 .../html/htmlfieldsetwithlegend.html          |  160 --
 .../html/htmlfieldsetwithoutlegend.html       |  159 --
 .../html/htmlradiobuttonchecked.html          |  204 ---
 .../html/htmlradiobuttonunchecked.html        |  201 --
 .../accessibility/html/htmlselect.html        |  180 --
 .../accessibility/html/htmlselectoption.html  |  189 --
 .../jstests/accessibility/html/htmltable.html |  154 --
 .../accessibility/html/htmltablecaption.html  |  127 --
 .../html/htmltablecaptiontext.html            |  156 --
 .../accessibility/html/htmltablecell.html     |  154 --
 .../accessibility/html/htmltablecelltext.html |  155 --
 .../accessibility/html/htmltablerow.html      |  126 --
 .../accessibility/html/htmltextarea.html      |  179 --
 .../accessibility/xul/xularrowscrollbox.xul   |  123 --
 .../qa/jstests/accessibility/xul/xulbox.xul   |  102 --
 .../jstests/accessibility/xul/xulbutton.xul   |  190 --
 .../accessibility/xul/xulcheckboxchecked.xul  |  190 --
 .../xul/xulcheckboxunchecked.xul              |  190 --
 .../qa/jstests/accessibility/xul/xuldeck.xul  |  118 --
 .../accessibility/xul/xuldescription.xul      |  137 --
 .../qa/jstests/accessibility/xul/xulgrid.xul  |  130 --
 .../jstests/accessibility/xul/xulgroupbox.xul |  144 --
 .../qa/jstests/accessibility/xul/xulimage.xul |  111 --
 .../qa/jstests/accessibility/xul/xullabel.xul |  142 --
 .../jstests/accessibility/xul/xullistbox.xul  |  176 --
 .../jstests/accessibility/xul/xullistitem.xul |  194 --
 .../jstests/accessibility/xul/xulmenubar.xul  |  171 --
 .../jstests/accessibility/xul/xulmenuitem.xul |  197 --
 .../jstests/accessibility/xul/xulmenulist.xul |  181 --
 .../accessibility/xul/xulprogressmeter.xul    |  145 --
 .../xul/xulradiobuttonchecked.xul             |  190 --
 .../xul/xulradiobuttonunchecked.xul           |  190 --
 .../accessibility/xul/xulradiogroup.xul       |  146 --
 .../accessibility/xul/xulscrollbar.xul        |  111 --
 .../qa/jstests/accessibility/xul/xulstack.xul |  116 --
 .../qa/jstests/accessibility/xul/xultab.xul   |  176 --
 .../jstests/accessibility/xul/xultabbox.xul   |  166 --
 .../jstests/accessibility/xul/xultabpanel.xul |  123 --
 .../accessibility/xul/xultabpanels.xul        |  156 --
 .../qa/jstests/accessibility/xul/xultabs.xul  |  155 --
 .../jstests/accessibility/xul/xultextbox.xul  |  168 --
 .../jstests/accessibility/xul/xultoolbar.xul  |  158 --
 .../jstests/accessibility/xul/xultoolbox.xul  |  158 --
 .../qa/jstests/accessibility/xul/xultree.xul  |  190 --
 .../jstests/accessibility/xul/xultreecol.xul  |  177 --
 .../jstests/accessibility/xul/xultreecols.xul |  158 --
 .../jstests/accessibility/xul/xultreeitem.xul |  200 --
 embedding/qa/jstests/bridge.js                |  115 --
 .../qa/jstests/content/nsISelection.html      |  340 ----
 embedding/qa/jstests/dom/nsIDOMWindow.html    |  291 ---
 .../networking/nsIFileProtocolHandler.html    |  192 --
 .../networking/nsIFileProtocolHandler.js      |  163 --
 .../qa/jstests/networking/nsIIOService.html   |  280 ---
 .../qa/jstests/networking/nsIIOService.js     |  385 ----
 .../networking/nsIProtocolHandler.html        |  229 ---
 .../jstests/networking/nsIProtocolHandler.js  |  265 ---
 embedding/qa/jstests/networking/nsIURI.html   |  374 ----
 embedding/qa/jstests/networking/nsIURI.js     |  813 ---------
 embedding/qa/jstests/nsIDocCharsetTest.txt    |  236 ---
 embedding/qa/jstests/nsIPrefBranchTest.txt    |  138 --
 embedding/qa/jstests/nsIPromptTest.txt        |  157 --
 embedding/qa/jstests/nsIURITest.txt           |  141 --
 embedding/qa/jstests/nsIURLTest.txt           |  107 --
 .../qa/jstests/nsIWebBrowserPersistTest1.txt  |  221 ---
 .../qa/jstests/nsIWebBrowserPersistTest2.txt  |  200 --
 .../qa/jstests/nsIWebBrowserPersistTest3.txt  |  204 ---
 embedding/qa/jstests/plugins.txt              |  149 --
 embedding/qa/jstests/profile/nsiprofile.html  |  343 ----
 .../sHistory/NsISHistoryTestCase1.html        |  151 --
 .../jstests/sHistory/NsISHistoryTestCase1.txt |  148 --
 .../qa/jstests/sHistory/SHListenerTest.html   |  242 ---
 .../qa/jstests/sHistory/loadHistoryPage.html  |   48 -
 .../jstests/sHistory/nsISHListenerTestLib.js  |  130 --
 .../qa/jstests/sHistory/nsISHistoryTestLib.js |  259 ---
 .../qa/jstests/webNav/nsIWebNavTestCase1.html |  252 ---
 .../qa/jstests/webNav/nsIWebNavTestCase1.txt  |  186 --
 .../qa/jstests/webNav/nsIWebNavTestLib.js     |  288 ---
 embedding/qa/jstests/xpcom/nsILocalFile.html  |  400 ----
 embedding/qa/jstests/xpcom/nsIProperties.html |  232 ---
 embedding/qa/mozembed/Makefile.in             |   49 -
 embedding/qa/mozembed/makefile.win            |   43 -
 embedding/qa/mozembed/public/Makefile.in      |   53 -
 embedding/qa/mozembed/public/makefile.win     |   54 -
 .../qa/mozembed/public/nsIQABrowserChrome.idl |   54 -
 .../qa/mozembed/public/nsIQABrowserUIGlue.idl |   76 -
 .../qa/mozembed/public/nsIQABrowserView.idl   |   56 -
 embedding/qa/mozembed/src/Makefile.in         |   92 -
 embedding/qa/mozembed/src/SMALL.ICO           |  Bin 318 -> 0 bytes
 embedding/qa/mozembed/src/StdAfx.cpp          |   44 -
 embedding/qa/mozembed/src/StdAfx.h            |   68 -
 embedding/qa/mozembed/src/makefile.win        |  108 --
 embedding/qa/mozembed/src/mozEmbed.ICO        |  Bin 1078 -> 0 bytes
 embedding/qa/mozembed/src/mozEmbed.cpp        | 1503 ---------------
 embedding/qa/mozembed/src/mozEmbed.h          |   46 -
 embedding/qa/mozembed/src/mozEmbed.rc         |  263 ---
 embedding/qa/mozembed/src/nsQABrowserCID.h    |   54 -
 .../qa/mozembed/src/nsQABrowserChrome.cpp     |  405 ----
 embedding/qa/mozembed/src/nsQABrowserChrome.h |  104 --
 .../qa/mozembed/src/nsQABrowserModule.cpp     |  199 --
 embedding/qa/mozembed/src/nsQABrowserUIGlue.h |   76 -
 embedding/qa/mozembed/src/nsQABrowserView.cpp |  172 --
 embedding/qa/mozembed/src/nsQABrowserView.h   |   83 -
 .../qa/mozembed/src/nsQAWindowCreator.cpp     |   67 -
 embedding/qa/mozembed/src/nsQAWindowCreator.h |   55 -
 embedding/qa/mozembed/src/resource.h          |   71 -
 embedding/qa/testembed/BrowserFrameGlue.cpp   |  426 -----
 embedding/qa/testembed/BrowserFrm.cpp         |  326 ----
 embedding/qa/testembed/BrowserFrm.h           |  212 ---
 embedding/qa/testembed/BrowserImpl.cpp        |  739 --------
 embedding/qa/testembed/BrowserImpl.h          |   95 -
 .../qa/testembed/BrowserImplCtxMenuLstnr.cpp  |   58 -
 .../qa/testembed/BrowserImplHistoryLstnr.cpp  |  159 --
 embedding/qa/testembed/BrowserImplPrompt.cpp  |  165 --
 .../qa/testembed/BrowserImplWebPrgrsLstnr.cpp |  345 ----
 embedding/qa/testembed/BrowserToolTip.cpp     |  152 --
 embedding/qa/testembed/BrowserToolTip.h       |   93 -
 embedding/qa/testembed/BrowserView.cpp        | 1066 -----------
 embedding/qa/testembed/BrowserView.cpp.mod    | 1625 -----------------
 embedding/qa/testembed/BrowserView.h          |  200 --
 embedding/qa/testembed/Dialogs.cpp            |  122 --
 embedding/qa/testembed/Dialogs.h              |   68 -
 embedding/qa/testembed/DomWindow.cpp          |  509 ------
 embedding/qa/testembed/DomWindow.h            |   74 -
 embedding/qa/testembed/IBrowserFrameGlue.h    |  116 --
 embedding/qa/testembed/Makefile.in            |  167 --
 embedding/qa/testembed/MostRecentUrls.cpp     |  151 --
 embedding/qa/testembed/MostRecentUrls.h       |   56 -
 embedding/qa/testembed/Preferences.cpp        |  114 --
 embedding/qa/testembed/Preferences.h          |  125 --
 .../qa/testembed/PrintProgressDialog.cpp      |  265 ---
 embedding/qa/testembed/PrintProgressDialog.h  |   67 -
 embedding/qa/testembed/ProfileMgr.cpp         |  208 ---
 embedding/qa/testembed/ProfileMgr.h           |   72 -
 embedding/qa/testembed/ProfilesDlg.cpp        |  299 ---
 embedding/qa/testembed/ProfilesDlg.h          |  120 --
 embedding/qa/testembed/QaFindDlg.cpp          |   45 -
 embedding/qa/testembed/QaFindDlg.h            |   46 -
 embedding/qa/testembed/QaUtils.cpp            |  508 ------
 embedding/qa/testembed/QaUtils.h              |  115 --
 embedding/qa/testembed/README.TXT             |  221 ---
 embedding/qa/testembed/Selection.cpp          |  619 -------
 embedding/qa/testembed/Selection.h            |   83 -
 embedding/qa/testembed/StdAfx.cpp             |   46 -
 embedding/qa/testembed/StdAfx.h               |  139 --
 embedding/qa/testembed/TestEmbed.cpp          |  703 -------
 embedding/qa/testembed/TestEmbed.h            |  137 --
 embedding/qa/testembed/Tests.cpp              | 1132 ------------
 embedding/qa/testembed/Tests.h                |  173 --
 embedding/qa/testembed/UrlDialog.cpp          |  177 --
 embedding/qa/testembed/UrlDialog.h            |   58 -
 embedding/qa/testembed/WebProgDlg.cpp         |  103 --
 embedding/qa/testembed/WebProgDlg.h           |   49 -
 embedding/qa/testembed/components/Dialogs.cpp |  437 -----
 embedding/qa/testembed/components/Dialogs.h   |  197 --
 embedding/qa/testembed/components/Dialogs.rc  |  214 ---
 embedding/qa/testembed/components/Makefile.in |   82 -
 .../qa/testembed/components/PromptService.cpp |  472 -----
 .../qa/testembed/components/PromptService.h   |   60 -
 embedding/qa/testembed/components/resource.h  |   52 -
 embedding/qa/testembed/components/stdafx.h    |   60 -
 embedding/qa/testembed/nsICmdParams.cpp       |  333 ----
 embedding/qa/testembed/nsICmdParams.h         |   73 -
 embedding/qa/testembed/nsICommandMgr.cpp      |  285 ---
 embedding/qa/testembed/nsICommandMgr.h        |  115 --
 embedding/qa/testembed/nsIEditSession.cpp     |  225 ---
 embedding/qa/testembed/nsIEditSession.h       |  106 --
 embedding/qa/testembed/nsIFile.cpp            |  246 ---
 embedding/qa/testembed/nsIFile.h              |   68 -
 embedding/qa/testembed/nsIObserServ.cpp       |  302 ---
 embedding/qa/testembed/nsIObserServ.h         |   78 -
 embedding/qa/testembed/nsIWebBrow.cpp         |  282 ---
 embedding/qa/testembed/nsIWebBrow.h           |  105 --
 embedding/qa/testembed/nsIWebBrowFind.cpp     |  338 ----
 embedding/qa/testembed/nsIWebBrowFind.h       |  113 --
 embedding/qa/testembed/nsIWebNav.cpp          |  505 -----
 embedding/qa/testembed/nsIWebNav.h            |  107 --
 embedding/qa/testembed/nsIWebProg.cpp         |  274 ---
 embedding/qa/testembed/nsIWebProg.h           |  110 --
 embedding/qa/testembed/nsIclipboardcmd.cpp    |  242 ---
 embedding/qa/testembed/nsIclipboardcmd.h      |   70 -
 embedding/qa/testembed/nsProfile.cpp          |  350 ----
 embedding/qa/testembed/nsProfile.h            |   73 -
 embedding/qa/testembed/nsiDirServ.cpp         |  175 --
 embedding/qa/testembed/nsiDirServ.h           |   82 -
 embedding/qa/testembed/nsiHistory.cpp         |  533 ------
 embedding/qa/testembed/nsiHistory.h           |   93 -
 embedding/qa/testembed/nsichanneltests.cpp    |  497 -----
 embedding/qa/testembed/nsichanneltests.h      |  118 --
 .../qa/testembed/nsihttpchanneltests.cpp      |  530 ------
 embedding/qa/testembed/nsihttpchanneltests.h  |   79 -
 embedding/qa/testembed/nsirequest.cpp         |  354 ----
 embedding/qa/testembed/nsirequest.h           |  109 --
 embedding/qa/testembed/res/Toolbar.bmp        |  Bin 838 -> 0 bytes
 embedding/qa/testembed/res/testembed.ico      |  Bin 1078 -> 0 bytes
 embedding/qa/testembed/res/testembed.rc2      |   13 -
 embedding/qa/testembed/res/toolbar1.bmp       |  Bin 238 -> 0 bytes
 embedding/qa/testembed/resource.h             |  333 ----
 embedding/qa/testembed/testembed.aps          |  Bin 101408 -> 0 bytes
 embedding/qa/testembed/testembed.dsp          |  393 ----
 embedding/qa/testembed/testembed.dsw          |   29 -
 embedding/qa/testembed/testembed.htm          |   58 -
 embedding/qa/testembed/testembed.rc           | 1307 -------------
 .../qa/testembed/winEmbedFileLocProvider.cpp  |  380 ----
 .../qa/testembed/winEmbedFileLocProvider.h    |   69 -
 213 files changed, 44544 deletions(-)
 delete mode 100644 embedding/qa/Makefile.in
 delete mode 100644 embedding/qa/jstests/ComponentListTest.txt
 delete mode 100644 embedding/qa/jstests/EmbedSmokeTest.txt
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlanchor.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlanchortext.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlbutton.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlbuttontext.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlcheckboxchecked.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlcheckboxunchecked.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlfieldsetwithlegend.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlfieldsetwithoutlegend.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlradiobuttonchecked.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlradiobuttonunchecked.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlselect.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmlselectoption.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmltable.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmltablecaption.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmltablecaptiontext.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmltablecell.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmltablecelltext.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmltablerow.html
 delete mode 100644 embedding/qa/jstests/accessibility/html/htmltextarea.html
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xularrowscrollbox.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulbox.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulbutton.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulcheckboxchecked.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulcheckboxunchecked.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xuldeck.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xuldescription.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulgrid.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulgroupbox.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulimage.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xullabel.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xullistbox.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xullistitem.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulmenubar.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulmenuitem.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulmenulist.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulprogressmeter.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulradiobuttonchecked.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulradiobuttonunchecked.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulradiogroup.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulscrollbar.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xulstack.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultab.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultabbox.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultabpanel.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultabpanels.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultabs.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultextbox.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultoolbar.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultoolbox.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultree.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultreecol.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultreecols.xul
 delete mode 100644 embedding/qa/jstests/accessibility/xul/xultreeitem.xul
 delete mode 100644 embedding/qa/jstests/bridge.js
 delete mode 100644 embedding/qa/jstests/content/nsISelection.html
 delete mode 100644 embedding/qa/jstests/dom/nsIDOMWindow.html
 delete mode 100644 embedding/qa/jstests/networking/nsIFileProtocolHandler.html
 delete mode 100644 embedding/qa/jstests/networking/nsIFileProtocolHandler.js
 delete mode 100644 embedding/qa/jstests/networking/nsIIOService.html
 delete mode 100644 embedding/qa/jstests/networking/nsIIOService.js
 delete mode 100644 embedding/qa/jstests/networking/nsIProtocolHandler.html
 delete mode 100644 embedding/qa/jstests/networking/nsIProtocolHandler.js
 delete mode 100644 embedding/qa/jstests/networking/nsIURI.html
 delete mode 100644 embedding/qa/jstests/networking/nsIURI.js
 delete mode 100644 embedding/qa/jstests/nsIDocCharsetTest.txt
 delete mode 100644 embedding/qa/jstests/nsIPrefBranchTest.txt
 delete mode 100644 embedding/qa/jstests/nsIPromptTest.txt
 delete mode 100644 embedding/qa/jstests/nsIURITest.txt
 delete mode 100644 embedding/qa/jstests/nsIURLTest.txt
 delete mode 100644 embedding/qa/jstests/nsIWebBrowserPersistTest1.txt
 delete mode 100644 embedding/qa/jstests/nsIWebBrowserPersistTest2.txt
 delete mode 100644 embedding/qa/jstests/nsIWebBrowserPersistTest3.txt
 delete mode 100644 embedding/qa/jstests/plugins.txt
 delete mode 100644 embedding/qa/jstests/profile/nsiprofile.html
 delete mode 100644 embedding/qa/jstests/sHistory/NsISHistoryTestCase1.html
 delete mode 100644 embedding/qa/jstests/sHistory/NsISHistoryTestCase1.txt
 delete mode 100644 embedding/qa/jstests/sHistory/SHListenerTest.html
 delete mode 100644 embedding/qa/jstests/sHistory/loadHistoryPage.html
 delete mode 100644 embedding/qa/jstests/sHistory/nsISHListenerTestLib.js
 delete mode 100644 embedding/qa/jstests/sHistory/nsISHistoryTestLib.js
 delete mode 100644 embedding/qa/jstests/webNav/nsIWebNavTestCase1.html
 delete mode 100644 embedding/qa/jstests/webNav/nsIWebNavTestCase1.txt
 delete mode 100644 embedding/qa/jstests/webNav/nsIWebNavTestLib.js
 delete mode 100644 embedding/qa/jstests/xpcom/nsILocalFile.html
 delete mode 100644 embedding/qa/jstests/xpcom/nsIProperties.html
 delete mode 100644 embedding/qa/mozembed/Makefile.in
 delete mode 100644 embedding/qa/mozembed/makefile.win
 delete mode 100644 embedding/qa/mozembed/public/Makefile.in
 delete mode 100644 embedding/qa/mozembed/public/makefile.win
 delete mode 100644 embedding/qa/mozembed/public/nsIQABrowserChrome.idl
 delete mode 100644 embedding/qa/mozembed/public/nsIQABrowserUIGlue.idl
 delete mode 100644 embedding/qa/mozembed/public/nsIQABrowserView.idl
 delete mode 100644 embedding/qa/mozembed/src/Makefile.in
 delete mode 100644 embedding/qa/mozembed/src/SMALL.ICO
 delete mode 100644 embedding/qa/mozembed/src/StdAfx.cpp
 delete mode 100644 embedding/qa/mozembed/src/StdAfx.h
 delete mode 100644 embedding/qa/mozembed/src/makefile.win
 delete mode 100644 embedding/qa/mozembed/src/mozEmbed.ICO
 delete mode 100644 embedding/qa/mozembed/src/mozEmbed.cpp
 delete mode 100644 embedding/qa/mozembed/src/mozEmbed.h
 delete mode 100644 embedding/qa/mozembed/src/mozEmbed.rc
 delete mode 100644 embedding/qa/mozembed/src/nsQABrowserCID.h
 delete mode 100644 embedding/qa/mozembed/src/nsQABrowserChrome.cpp
 delete mode 100644 embedding/qa/mozembed/src/nsQABrowserChrome.h
 delete mode 100644 embedding/qa/mozembed/src/nsQABrowserModule.cpp
 delete mode 100644 embedding/qa/mozembed/src/nsQABrowserUIGlue.h
 delete mode 100644 embedding/qa/mozembed/src/nsQABrowserView.cpp
 delete mode 100644 embedding/qa/mozembed/src/nsQABrowserView.h
 delete mode 100644 embedding/qa/mozembed/src/nsQAWindowCreator.cpp
 delete mode 100644 embedding/qa/mozembed/src/nsQAWindowCreator.h
 delete mode 100644 embedding/qa/mozembed/src/resource.h
 delete mode 100644 embedding/qa/testembed/BrowserFrameGlue.cpp
 delete mode 100644 embedding/qa/testembed/BrowserFrm.cpp
 delete mode 100644 embedding/qa/testembed/BrowserFrm.h
 delete mode 100644 embedding/qa/testembed/BrowserImpl.cpp
 delete mode 100644 embedding/qa/testembed/BrowserImpl.h
 delete mode 100644 embedding/qa/testembed/BrowserImplCtxMenuLstnr.cpp
 delete mode 100644 embedding/qa/testembed/BrowserImplHistoryLstnr.cpp
 delete mode 100644 embedding/qa/testembed/BrowserImplPrompt.cpp
 delete mode 100644 embedding/qa/testembed/BrowserImplWebPrgrsLstnr.cpp
 delete mode 100644 embedding/qa/testembed/BrowserToolTip.cpp
 delete mode 100644 embedding/qa/testembed/BrowserToolTip.h
 delete mode 100644 embedding/qa/testembed/BrowserView.cpp
 delete mode 100644 embedding/qa/testembed/BrowserView.cpp.mod
 delete mode 100644 embedding/qa/testembed/BrowserView.h
 delete mode 100644 embedding/qa/testembed/Dialogs.cpp
 delete mode 100644 embedding/qa/testembed/Dialogs.h
 delete mode 100644 embedding/qa/testembed/DomWindow.cpp
 delete mode 100644 embedding/qa/testembed/DomWindow.h
 delete mode 100644 embedding/qa/testembed/IBrowserFrameGlue.h
 delete mode 100644 embedding/qa/testembed/Makefile.in
 delete mode 100644 embedding/qa/testembed/MostRecentUrls.cpp
 delete mode 100644 embedding/qa/testembed/MostRecentUrls.h
 delete mode 100644 embedding/qa/testembed/Preferences.cpp
 delete mode 100644 embedding/qa/testembed/Preferences.h
 delete mode 100644 embedding/qa/testembed/PrintProgressDialog.cpp
 delete mode 100644 embedding/qa/testembed/PrintProgressDialog.h
 delete mode 100644 embedding/qa/testembed/ProfileMgr.cpp
 delete mode 100644 embedding/qa/testembed/ProfileMgr.h
 delete mode 100644 embedding/qa/testembed/ProfilesDlg.cpp
 delete mode 100644 embedding/qa/testembed/ProfilesDlg.h
 delete mode 100644 embedding/qa/testembed/QaFindDlg.cpp
 delete mode 100644 embedding/qa/testembed/QaFindDlg.h
 delete mode 100644 embedding/qa/testembed/QaUtils.cpp
 delete mode 100644 embedding/qa/testembed/QaUtils.h
 delete mode 100644 embedding/qa/testembed/README.TXT
 delete mode 100644 embedding/qa/testembed/Selection.cpp
 delete mode 100644 embedding/qa/testembed/Selection.h
 delete mode 100644 embedding/qa/testembed/StdAfx.cpp
 delete mode 100644 embedding/qa/testembed/StdAfx.h
 delete mode 100644 embedding/qa/testembed/TestEmbed.cpp
 delete mode 100644 embedding/qa/testembed/TestEmbed.h
 delete mode 100644 embedding/qa/testembed/Tests.cpp
 delete mode 100644 embedding/qa/testembed/Tests.h
 delete mode 100644 embedding/qa/testembed/UrlDialog.cpp
 delete mode 100644 embedding/qa/testembed/UrlDialog.h
 delete mode 100644 embedding/qa/testembed/WebProgDlg.cpp
 delete mode 100644 embedding/qa/testembed/WebProgDlg.h
 delete mode 100644 embedding/qa/testembed/components/Dialogs.cpp
 delete mode 100644 embedding/qa/testembed/components/Dialogs.h
 delete mode 100644 embedding/qa/testembed/components/Dialogs.rc
 delete mode 100644 embedding/qa/testembed/components/Makefile.in
 delete mode 100644 embedding/qa/testembed/components/PromptService.cpp
 delete mode 100644 embedding/qa/testembed/components/PromptService.h
 delete mode 100644 embedding/qa/testembed/components/resource.h
 delete mode 100644 embedding/qa/testembed/components/stdafx.h
 delete mode 100644 embedding/qa/testembed/nsICmdParams.cpp
 delete mode 100644 embedding/qa/testembed/nsICmdParams.h
 delete mode 100644 embedding/qa/testembed/nsICommandMgr.cpp
 delete mode 100644 embedding/qa/testembed/nsICommandMgr.h
 delete mode 100644 embedding/qa/testembed/nsIEditSession.cpp
 delete mode 100644 embedding/qa/testembed/nsIEditSession.h
 delete mode 100644 embedding/qa/testembed/nsIFile.cpp
 delete mode 100644 embedding/qa/testembed/nsIFile.h
 delete mode 100644 embedding/qa/testembed/nsIObserServ.cpp
 delete mode 100644 embedding/qa/testembed/nsIObserServ.h
 delete mode 100644 embedding/qa/testembed/nsIWebBrow.cpp
 delete mode 100644 embedding/qa/testembed/nsIWebBrow.h
 delete mode 100644 embedding/qa/testembed/nsIWebBrowFind.cpp
 delete mode 100644 embedding/qa/testembed/nsIWebBrowFind.h
 delete mode 100644 embedding/qa/testembed/nsIWebNav.cpp
 delete mode 100644 embedding/qa/testembed/nsIWebNav.h
 delete mode 100644 embedding/qa/testembed/nsIWebProg.cpp
 delete mode 100644 embedding/qa/testembed/nsIWebProg.h
 delete mode 100644 embedding/qa/testembed/nsIclipboardcmd.cpp
 delete mode 100644 embedding/qa/testembed/nsIclipboardcmd.h
 delete mode 100644 embedding/qa/testembed/nsProfile.cpp
 delete mode 100644 embedding/qa/testembed/nsProfile.h
 delete mode 100644 embedding/qa/testembed/nsiDirServ.cpp
 delete mode 100644 embedding/qa/testembed/nsiDirServ.h
 delete mode 100644 embedding/qa/testembed/nsiHistory.cpp
 delete mode 100644 embedding/qa/testembed/nsiHistory.h
 delete mode 100644 embedding/qa/testembed/nsichanneltests.cpp
 delete mode 100644 embedding/qa/testembed/nsichanneltests.h
 delete mode 100644 embedding/qa/testembed/nsihttpchanneltests.cpp
 delete mode 100644 embedding/qa/testembed/nsihttpchanneltests.h
 delete mode 100644 embedding/qa/testembed/nsirequest.cpp
 delete mode 100644 embedding/qa/testembed/nsirequest.h
 delete mode 100644 embedding/qa/testembed/res/Toolbar.bmp
 delete mode 100644 embedding/qa/testembed/res/testembed.ico
 delete mode 100644 embedding/qa/testembed/res/testembed.rc2
 delete mode 100644 embedding/qa/testembed/res/toolbar1.bmp
 delete mode 100644 embedding/qa/testembed/resource.h
 delete mode 100644 embedding/qa/testembed/testembed.aps
 delete mode 100644 embedding/qa/testembed/testembed.dsp
 delete mode 100644 embedding/qa/testembed/testembed.dsw
 delete mode 100644 embedding/qa/testembed/testembed.htm
 delete mode 100644 embedding/qa/testembed/testembed.rc
 delete mode 100644 embedding/qa/testembed/winEmbedFileLocProvider.cpp
 delete mode 100644 embedding/qa/testembed/winEmbedFileLocProvider.h

diff --git a/embedding/qa/Makefile.in b/embedding/qa/Makefile.in
deleted file mode 100644
index d5e70eb116d..00000000000
--- a/embedding/qa/Makefile.in
+++ /dev/null
@@ -1,46 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla QA Tests.
-#
-# The Initial Developer of the Original Code is
-# Josh Soref.
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS=mozembed testembed/components testembed
-
-include $(topsrcdir)/config/rules.mk
diff --git a/embedding/qa/jstests/ComponentListTest.txt b/embedding/qa/jstests/ComponentListTest.txt
deleted file mode 100644
index 0217a08e685..00000000000
--- a/embedding/qa/jstests/ComponentListTest.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is Netscape Communications
-   - Corp.  Portions created by Netscape Communications Corp. are
-   - Copyright (C) 1999 Netscape Communications Corp.  All
-   - Rights Reserved.
-   -
-   - Contributor(s):
-   -   dsirnapalli@netscape.com
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> Component List </title>
-<!-- Descrpt: Component List Test
-     Author: dsirnapalli@netscape.com
-     Revs: 10.12.01 - Created
-  -->
-<head>
-
-<!-- script below is ngdriverspecific  -->
-<script TYPE="text/javascript" SRC="http://bubblegum/ngdriver/suites/testlib.js">
-</script>
-
-<script TYPE="text/javascript">
-function getBrowserVersion()
-{
-  var res = "";
-  res = res + '<b><h3><font color="#CC6600"> Browser Info </font></h3></b>' + '\n';
-  res = res + '<table BORDER COLS=2 WIDTH="70%">' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td WIDTH="30%"><b> App Name: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.appName + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td><b> User Agent: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.userAgent + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td><b> Code Name:: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.appCodeName + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td><b> App Version: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.appVersion + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td><b> Language: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.language + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td><b> Platform: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.platform + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + '</table>' + '\n';
-  return res;
-}
-</script>
-
-<script TYPE="text/javascript">
-function getShortPluginsList()
-{
-  var res="";
-
-  navigator.plugins.refresh(false);
-  var numPlugins = navigator.plugins.length;
-
-  res = res + '<b><h3><font color="#CC6600"> Plugins </font></h3></b>' + '\n';
-  res = res + 'For Complete description of Plugins ';
-  res = res + '<a href="plugins.html">Click here</a>';
-  res = res + '<br><br>';
-  res = res + '<table BORDER COLS=1 WIDTH="30%">' + '\n';
-  if(numPlugins > 0)
-    res = res + '<caption><b><h3> Installed plug-ins </h3></b></caption>' + '\n';
-  else
-  {
-    res = res + '<caption><b><h3> No plug-ins are installed. </h3></b></caption>' + '\n';
-    res = res + ' <tr>' + '\n';
-    res = res + '  <td> Empty </td>' + '\n';
-    res = res + ' </tr>' + '\n';
-  }
-  for (var i=0;i<numPlugins;i++)
-  {
-    var plugin = navigator.plugins[i];
-    res = res + ' <tr>' + '\n';
-    res = res + '  <td>' + plugin.name + '</td>' + '\n';
-    res = res + ' </tr>' + '\n';
-  }
-  res = res + '</table>' + '\n';
-  return res;
-}
-</script>
-
-<script TYPE="text/javascript">
-complist = new Array();
-noncomplist = new Array();
-i = 0;
-j = 0;
-
-function getComponentList()
-{
-  var servicecontractidlist = new Array("@mozilla.org/cookieService;1",
-                                        "@mozilla.org/file/directory_service;1",
-                                        "@mozilla.org/browser/global-history;1",
-                                        "@mozilla.org/preferences-service;1",
-                                        "@mozilla.org/embedcomp/window-watcher;1",
-                                        "@mozilla.org/embedcomp/prompt-service;1");
-
-  var serviceinterfacelist = new Array("nsICookieService",
-                                       "nsIDirectoryService",
-                                       "nsIGlobalHistory",
-                                       "nsIPrefService",
-                                       "nsIWindowWatcher",
-                                       "nsIPromptService");
-
-  var contractidlist = new Array("@mozilla.org/network/standard-url;1",
-                                 "@mozilla.org/network/standard-url;1",
-                                 "@mozilla.org/browser/shistory;1",
-                                 "@mozilla.org/helperapplauncherdialog;1",
-                                 "@mozilla.org/file/local;1",
-                                 "@mozilla.org/xpcom/observer;1",
-                                 "@mozilla.org/preferences-service;1",
-                                 "@mozilla.org/gfx/fontlist;1");
-
-  var interfacelist = new Array("nsIURI",
-                                "nsIURL",
-                                "nsISHistory",
-                                "nsIHelperAppLauncherDialog",
-                                "nsILocalFile",
-                                "nsIObserver",
-                                "nsIPrefBranch");
-
-  for (var m=0; m<serviceinterfacelist.length; m++)
-    checkservice(servicecontractidlist[m], serviceinterfacelist[m]);
-
-  for (var n=0; n<interfacelist.length; n++)
-    checkinterface(contractidlist[n], interfacelist[n]);
-}
-
-function getAdditionalComponentList()
-{
-  // additional interface objects which cannot be got directly.
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var domWindow = window.QueryInterface(Components.interfaces.nsIDOMWindow);
-    if (domWindow)
-     complist[i++] = "nsIDOMWindow";
-  }
-  catch(e){
-    noncomplist[j++] = "nsIDOMWindow";
-  }
-  try
-  {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var charsetObj = domWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                              .getInterface(Components.interfaces.nsIDocCharset);
-    if (charsetObj)
-      complist[i++] = "nsIDocCharset";
-  }
-  catch(e){
-    noncomplist[j++] = "nsIDocCharset";
-  }
-}
-
-function checkservice(contractid, interfacename)
-{
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var iID = Components.interfaces[interfacename];
-    var obj = Components.classes[contractid].getService(iID);
-    if (obj)
-      complist[i++] = interfacename;
-  }
-  catch(e){
-    noncomplist[j++] = interfacename;
-  }
-}
-
-function checkinterface(contractid, interfacename)
-{
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var iID = Components.interfaces[interfacename];
-    var obj = Components.classes[contractid].createInstance(iID);
-    if (obj)
-      complist[i++] = interfacename;
-  }
-  catch(e){
-    noncomplist[j++] = interfacename;
-  }
-}
-
-function getComponentResults()
-{
-  var res = "";
-
-  res = res + '<b><h3><font color="#CC6600"> Embedding Components </font></h3></b>' + '\n';
-  res = res + '<table BORDER COLS=1 WIDTH="30%">' + '\n';
-  res = res + '<caption><b><h3> Components Available </h3></b></caption>' + '\n';
-  for (var i=0; i<complist.length; i++)
-  {
-    res = res + ' <tr>' + '\n';
-    res = res + '  <td>' + complist[i] + '</td>' + '\n';
-    res = res + ' </tr>' + '\n';
-  }
-  if(complist.length == 0)
-  {
-    res = res + ' <tr>' + '\n';
-    res = res + '  <td> Empty </td>' + '\n';
-    res = res + ' </tr>' + '\n';
-  }
-  res = res + '</table>' + '\n';
-
-  res = res + '<br>' + '\n';
-  res = res + '<table BORDER COLS=1 WIDTH="30%">' + '\n';
-  res = res + '<caption><b><h3> Components Not Available </h3></b></caption>' + '\n';
-  for (var j=0; j<noncomplist.length; j++)
-  {
-    res = res + ' <tr>' + '\n';
-    res = res + '  <td>' + noncomplist[j] + '</td>' + '\n';
-    res = res + ' </tr>' + '\n';
-  }
-  if(noncomplist.length == 0)
-  {
-    res = res + ' <tr>' + '\n';
-    res = res + '  <td> Empty </td>' + '\n';
-    res = res + ' </tr>' + '\n';
-  }
-  res = res + '</table>' + '\n';
-  return res;
-}
-</script>
-
-<script TYPE="text/javascript">
-function displayResults(results)
-{
-  document.results.textarea.value = results;
-  if (top.name == "testWindow")
-  {
- 	fixSubmit();
-  }
-  else
-  {
-  	document.write(document.results.textarea.value);
-  }
-}
-</script>
-
-</head>
-<body>
-
-<!-- form below is ngdriverspecific  -->
-<form name="results" action="/ngdriver/cgi-bin/writeresults.cgi" method="post">
-<script TYPE="text/javascript">
-document.write('<input name="resultsfile" type="hidden" value="' + window.opener.document.resultsform.resultsfile.value + '">');
-</script>
-<input type="hidden" name="textarea">
-</form>
-
-<script TYPE="text/javascript">
-var result = "";
-
-result = result + "<font color='#CC6600'> NOTE: </font>" + "<br>";
-result = result + "For the Test Case to run correctly include the following line into your prefs.js file." + "<br>";
-result = result + 'user_pref("signed.applets.codebase_principal_support", true);' + "<br>";
-result = result + 'prefs.js can be found at' + '<br>';
-result = result + 'WINNT:C:\\WINNT\\Profiles\\profileyouareusing\\Application Data\\MfcEmbed\\Profiles\\default\\somefolder.slt\\prefs.js' + '<br>';
-result = result + 'WIN98:C:\\WINDOWS\\Application Data\\MfcEmbed\\Profiles\\default\\somefolder.slt\\prefs.js' + '<br>';
-result = result + '<br><hr ALIGN=LEFT SIZE=5 NOSHADE WIDTH="80%">' + '\n';
-
-browserres = getBrowserVersion();
-result = result + browserres;
-result = result + '<br><hr ALIGN=LEFT SIZE=5 NOSHADE WIDTH="80%">' + '\n';
-pluginres = getShortPluginsList();
-result = result + pluginres;
-result = result + '<br><hr ALIGN=LEFT SIZE=5 NOSHADE WIDTH="80%">' + '\n';
-getComponentList();
-getAdditionalComponentList();
-componentres = getComponentResults();
-result = result + componentres;
-result = result + '<br><hr ALIGN=LEFT SIZE=5 NOSHADE WIDTH="80%">' + '\n';
-displayResults(result);
-</script>
-
-</body>
-</html>
diff --git a/embedding/qa/jstests/EmbedSmokeTest.txt b/embedding/qa/jstests/EmbedSmokeTest.txt
deleted file mode 100644
index 74519e5a549..00000000000
--- a/embedding/qa/jstests/EmbedSmokeTest.txt
+++ /dev/null
@@ -1,397 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> Embed Smoke Test </title>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<head>
-
-<!-- script below is ngdriverspecific  -->
-<script TYPE="text/javascript" SRC="http://bubblegum/ngdriver/suites/testlib.js">
-</script>
-
-<script TYPE="text/javascript">
-var linkclick = "Fail";
-var urlload = "Fail";
-var fileurlload = "Fail";
-var mozload  = "Fail";
-var seamonkeyload = "Fail";
-executeAllTestCases = "false";
-mozimageload = "false";
-seamonkeyimageload = "false";
-
-function createCookie(name,value,days)
-{
-  if (days)
-  {
-    var date = new Date();
-    date.setTime(date.getTime()+(days*24*60*60*1000));
-    var expires = "; expires="+date.toGMTString();
-  }
-  else expires = "";
-
-  document.cookie = name+"="+value+expires+"; path=/";
-}
-
-function readCookie(name)
-{
-  var nameEQ = name + "=";
-  var ca = document.cookie.split(';');
-  for(var i=0;i < ca.length;i++)
-  {
-    var c = ca[i];
-    while (c.charAt(0)==' ')
-      c = c.substring(1,c.length);
-    if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
-  }
-  return null;
-}
-
-function eraseCookie(name)
-{
-  createCookie(name,"",-1);
-}
-
-function linkfun()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var val = win.document.getElementsByTagName("title").item(0);
-  if(val)
-  {
-   var val1 = val.firstChild.data;
-   if(val1)
-   {
-     linkclick = "Pass";
-   }
-  }
- }
- catch(e)
- {
-  alert("exception: " + e);
- }
- win.close();
- linkwin.close();
-}
-
-function urlloaded()
-{
-// if(scrollbarsvisible)
-// {
-  try{
-   netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-   var val = loadurlwin.document.getElementsByTagName("title").item(0);
-   if(val)
-   {
-     var val1 = val.firstChild.data;
-     if(val1)
-     {
-       urlload = "Pass";
-     }
-   }
-  }
-  catch(e)
-  {
-    alert("exception: " + e);
-  }
-// }
- loadurlwin.close();
-}
-
-function fileurlloaded()
-{
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var file = fileurl.document.getElementsByTagName("h2").item(0);
-    if(file)
-    {
-      if(file.firstChild.data == "This is a test file")
-        fileurlload = "Pass";
-    }
-  }
-  catch(e)
-  {
-    alert("exception: " + e);
-  }
-  fileurl.close();
-}
-
-function mozillaimageLoaded()
-{
-  mozimageload = "true";
-}
-
-function seamonkeyimageLoaded()
-{
-  seamonkeyimageload = "true";
-}
-
-function constructResults()
-{
-  var results = "";
-  var linkclickcolor = "white";
-  var urlloadcolor = "white";
-  var fileurlloadcolor = "white";
-  var mozloadcolor  = "white";
-  var seamonkeyloadcolor = "white";
-
-  results = results + "<html><br>";
-  results = results + "  <table bgcolor='white' border='4'>";
-  results = results + "  <tbody>";
-  results = results + "  <caption> <center> <b> Embed SmokeTest Results </b> </center> </caption>";
-  results = results + "    <tr>";
-  results = results + "      <td> <b> Description </b> </td>";
-  results = results + "      <td> <b> Result </b> </td>";
-  results = results + "      <td> <b> Comments </b> </td>";
-  results = results + "    </tr>";
-  if( (document.form1.linkclickcheckbox.checked==true) || (executeAllTestCases=="true") )
-  {
-    if (linkclick == "Fail") linkclickcolor = "red";
-    results = results + "    <tr bgcolor = '" + linkclickcolor + "'>";
-    results = results + "      <td> Link Clicking </td>";
-    results = results + "      <td>" + linkclick + "</td>";
-    if (linkclick == "Fail")
-     results = results + "      <td>" + "Link could not be clicked" + "</td>";
-    results = results + "    </tr>";
-  }
-  if( (document.form1.loadurlcheckbox.checked==true) || (executeAllTestCases=="true") )
-  {
-    if (urlload == "Fail") urlloadcolor = "red";
-    results = results + "    <tr bgcolor = '" + urlloadcolor + "'>";
-    results = results + "      <td> URL Loading </td>";
-    results = results + "      <td>" + urlload + "</td>";
-    if (urlload == "Fail")
-      results = results + "      <td>" + "Either the URL could not be loaded or the Scrollbars donot appear" + "</td>";
-    results = results + "    </tr>";
-  }
-  if( (document.form1.loadfileurlcheckbox.checked==true) || (executeAllTestCases=="true") )
-  {
-    if (fileurlload == "Fail") fileurlloadcolor = "red";
-    results = results + "    <tr bgcolor = '" + fileurlloadcolor + "'>";
-    results = results + "      <td> File URL Loading </td>";
-    results = results + "      <td>" + fileurlload + "</td>";
-    if (fileurlload == "Fail")
-      results = results + "      <td>" + "Either the file could not be found or the content is not displayed" + "</td>";
-    results = results + "    </tr>";
-  }
-  if( (document.form1.mozillaloadcheckbox.checked==true) || (executeAllTestCases=="true") )
-  {
-    if (mozload == "Fail") mozloadcolor = "red";
-    results = results + "    <tr bgcolor = '" + mozloadcolor + "'>";
-    results = results + "      <td> Load GIF Image </td>";
-    results = results + "      <td>" + mozload + "</td>";
-    if (mozload == "Fail")
-      results = results + "      <td>" + "Image could not be found or Image could not be loaded properly" + "</td>";
-    results = results + "    </tr>";
-  }
-  if( (document.form1.seamonkeyloadcheckbox.checked==true) || (executeAllTestCases=="true") )
-  {
-    if (seamonkeyload == "Fail") seamonkeyloadcolor = "red";
-    results = results + "    <tr bgcolor = '" + seamonkeyloadcolor + "'>";
-    results = results + "      <td> Load JPEG Image </td>";
-    results = results + "      <td>" + seamonkeyload + "</td>";
-    if (seamonkeyload == "Fail")
-      results = results + "      <td>" + "Image could not be found or Image could not be loaded properly" + "</td>";
-    results = results + "    </tr>";
-  }
-
-  results = results + "  </tbody>";
-  results = results + "  </table>";
-  results = results + "</html>";
-
-  createCookie("embedsmoketest", results, 14);
-  window.location.reload();
-}
-
-function displayResults(results)
-{
-  document.results.textarea.value = results;
-  if (top.name == "testWindow")
-  {
- 	fixSubmit();
-  }
-  else
-  {
-  	document.write(document.results.textarea.value);
-  }
-}
-
-function onSubmitAll()
-{
-  executeAllTestCases = "true";
-  onSubmit();
-}
-
-function onSubmit()
-{
- if( (document.form1.linkclickcheckbox.checked==true) || (executeAllTestCases=="true") )
- {
-  // link clicking
-  try
-  {
-   netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-   linkwin = window.open("");
-   if(linkwin)
-   {
-    linkwin.document.write("<a href='http://www.mozilla.org'> Click here to go to Mozilla site </a><br><br>");
-    var link1 = linkwin.document.getElementsByTagName("a").item(0);
-    if (link1)
-    {
-     win = window.open(link1);
-     if (win)
-     {
-      win.onload = setTimeout("linkfun();", 1000);
-     }
-    }
-   }
-  }
-  catch(e)
-  {
-   alert("exception:" + e);
-  }
- }
- if( (document.form1.loadurlcheckbox.checked==true) || (executeAllTestCases=="true") )
- {
-  // Loading new window
-  try
-  {
-   netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-   loadurlwin = window.open("http://www.mozilla.org");
-   if (loadurlwin)
-   {
-    //scrollbarsvisible = loadurlwin.scrollbars.visible;
-    loadurlwin.onload = setTimeout("urlloaded();", 1000);
-   }
-  }
-  catch(e)
-  {
-   alert("exception:" + e);
-  }
- }
- if( (document.form1.loadfileurlcheckbox.checked==true) || (executeAllTestCases=="true") )
- {
-  fileurl = window.open("test.html");
-  if (fileurl)
-  {
-   fileurl.onload = setTimeout("fileurlloaded();", 1000);
-  }
- }
- if( (document.form1.mozillaloadcheckbox.checked==true) || (executeAllTestCases=="true") )
- {
-   if(mozimageload=="true")
-     mozload = "Pass";
- }
- if( (document.form1.seamonkeyloadcheckbox.checked==true) || (executeAllTestCases=="true") )
- {
-   if(seamonkeyimageload=="true")
-     seamonkeyload = "Pass";
- }
-
- setTimeout("constructResults();", 6000);
-}
-
-</script>
-</head>
-<body>
-
-<!-- form below is ngdriverspecific  -->
-<form name="results" action="/ngdriver/cgi-bin/writeresults.cgi" method="post">
-<script TYPE="text/javascript">
-document.write('<input name="resultsfile" type="hidden" value="' + window.opener.document.resultsform.resultsfile.value + '">');
-</script>
-<input type="hidden" name="textarea">
-</form>
-
-<script TYPE="text/javascript">
-if(readCookie("embedsmoketest") == null)
-{
-  document.write("<h2> Choose the test cases you want to run: </h2>");
-  document.write("<br><br>");
-  document.write("<form NAME='form1'>");
-  document.write("<input type='checkbox' name='linkclickcheckbox'><b> Click a Link on a Page </b></input>");
-  document.write("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-  document.write(" [");
-  document.write("<a href='http://mozilla.org/quality/embed/plans/EmbedSmokeTestPlan.html#first'>Click to see description</a> ");
-  document.write("]<br>");
-  document.write("<input type='checkbox' name='loadurlcheckbox'><b> Load a URL </b></input>");
-  document.write("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-  document.write(" [");
-  document.write("<a href='http://mozilla.org/quality/embed/plans/EmbedSmokeTestPlan.html#second'>Click to see description</a> ");
-  document.write("]<br>");
-  document.write("<input type='checkbox' name='loadfileurlcheckbox'><b> Load a File URL [Content Loading]</b></input>");
-  document.write("&nbsp;");
-  document.write(" [");
-  document.write("<a href='http://mozilla.org/quality/embed/plans/EmbedSmokeTestPlan.html#third'>Click to see description</a> ");
-  document.write("]<br>");
-  document.write("<input type='checkbox' name='mozillaloadcheckbox'><b> Load GIF Image</b></input>");
-  document.write("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-  document.write(" [");
-  document.write("<a href='http://mozilla.org/quality/embed/plans/EmbedSmokeTestPlan.html#fourth'>Click to see description</a> ");
-  document.write("]<br>");
-  document.write("<input type='checkbox' name='seamonkeyloadcheckbox'><b> Load JPEG Image</b></input>");
-  document.write("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-  document.write(" [");
-  document.write("<a href='http://mozilla.org/quality/embed/plans/EmbedSmokeTestPlan.html#fifth'>Click to see description</a> ");
-  document.write("]<br>");
-  document.write("</form>");
-  document.write("<br>");
-  document.write("<button type='button' onClick='onSubmit()'> Execute Selected Testcases </button>");
-  document.write("  ");
-  document.write("<button type='button' onClick='onSubmitAll()'> Execute All Testcases </button>");
-
-  document.write('<img src="images/mozilla-banner.gif" height=0 width=0 onLoad = "mozillaimageLoaded();">');
-  document.write('<img src="images/seamonkey.jpg" height=0 width=0 onLoad = "seamonkeyimageLoaded();">');
-
-}
-else
-{
-  cookieValue = readCookie("embedsmoketest");
-  eraseCookie("embedsmoketest");
-  displayResults(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/html/htmlanchor.html b/embedding/qa/jstests/accessibility/html/htmlanchor.html
deleted file mode 100644
index b2fdafd492e..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlanchor.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML ANCHOR Node
-     Author: dsirnapalli@netscape.com
-     Created:01.13.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeAnchor()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("a").item(0);
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeAnchor();
-  domNode.addEventListener('focus',nodeFocused,true);
-
-  accNode = getAccessibleNode(domNode);
-  tempaccNode = accNode;
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    accNode.accTakeFocus();
-  }
-  catch(e){
-    alert("Exception**: " + e);
-  }
-  setTimeout("constructResults();", 2000);
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-  {
-    varaccFocused = "Focused";
-  }
-  else
-  {
-    varaccFocused = "Not Focused";
-  }
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var numActions = getNumActions();
-  if(numActions > 1)
-    alert("When i last modified the test case numActions was 1. Now numActions is more than 1. Add tests for other numActions");
-  var actionName = getActionName();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName          = "External Link";
-  var expectedRole          = "30";
-  var expectedState         = "13631492";
-  var expectedValue         = "http://home.netscape.com";
-  var expectednodeFocus     = "Focused";
-  var expectedaccFocused    = "Focused";
-  var expectednumActions    = "1";
-  var expectedactionName    = "Jump";
-  var expectedkeyboardShortcut = "Alt+a";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-  var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-  var row7 = new Array("accNumActions->", expectednumActions, numActions);
-  var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-  var row9 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-  if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-  if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-  if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row9[3] = "PASS"; else row9[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-nodeFocus = "Not Focused";
-
-cookieName = "nsIAccessibleTestAnchorNode";
-var res = "<b><u> Results for HTML Anchor Node:</u></b><br><br>";
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Anchor -->
-  <!-- Anchor linking to external file -->
-  document.write('Testing HTML Link' + '<br>');
-  document.write('<a href="http://home.netscape.com" accesskey="a">External Link</a>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/html/htmlanchortext.html b/embedding/qa/jstests/accessibility/html/htmlanchortext.html
deleted file mode 100644
index 9ff905ae4cc..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlanchortext.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML ANCHOR TEXT Node
-     Author: dsirnapalli@netscape.com
-     Created:01.13.02
-     Last Updated:09.16.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeAnchorText()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("a").item(0);
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeAnchorText();
-  domNode.addEventListener('focus',nodeFocused,true);
-
-  domNode = domNode.firstChild;
-  accNode = getAccessibleNode(domNode);
-
-  tempaccNode = accNode;
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    // Even though you tell it to focus the textnode, the focus doesnot happen to the
-    // text node, the focus happens to the link node. textnodes cannot get focus
-    // by design. That's the reason I attached focus listener to the anchor node above.
-    accNode.accTakeFocus();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-   }
-   catch(e){
-     alert("Exception**: " + e);
-   }
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var numActions = getNumActions();
-  var actionName = getActionName();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName          = "External Link";
-  var expectedRole          = "42";
-  var expectedState         = "15728708";
-  var expectedValue         = "http://home.netscape.com";
-  var expectednodeFocus     = "Focused";
-  var expectednumActions    = "1";
-  var expectedactionName    = "Jump";
-  var expectedkeyboardShortcut = "Alt+a";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-  var row6 = new Array("accNumActions->", expectednumActions, numActions);
-  var row7 = new Array("getAccActionName()->", expectedactionName, actionName);
-  var row8 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-  if (numActions == expectednumActions)     row6[3] = "PASS"; else row6[3] = "FAIL";
-  if (actionName == expectedactionName)     row7[3] = "PASS"; else row7[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row8[3] = "PASS"; else row8[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-nodeFocus = "Not Focused";
-cookieName = "nsIAccessibleTestAnchorTextNode";
-var res = "<b><u> Results for HTML Anchor Text Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Anchor -->
-  <!-- Anchor linking to external file -->
-  document.write('Testing Link' + '<br>');
-  document.write('<a href="http://home.netscape.com" accesskey="a">External Link</a>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/html/htmlbutton.html b/embedding/qa/jstests/accessibility/html/htmlbutton.html
deleted file mode 100644
index b2321b6ea16..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlbutton.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML BUTTON Node
-     Author: dsirnapalli@netscape.com
-     Created:01.08.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeButton()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("button").item(0);
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeButton();
-  domNode.addEventListener('focus',nodeFocused,true);
-  domNode.addEventListener('click', nodeClicked,true);
-
-  accNode = getAccessibleNode(domNode);
-  tempaccNode = accNode;
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    accNode.accTakeFocus();
-  }
-  catch(e){
-    alert("Exception**: " + e);
-  }
-  setTimeout("constructResults();", 2000);
-}
-
-function nodeClicked()
-{
-  nodeClick = "Button Pressed";
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-  {
-    varaccFocused = "Focused";
-  }
-  else
-  {
-    varaccFocused = "Not Focused";
-  }
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var numActions = getNumActions();
-  if(numActions > 1)
-    alert("When i last modified the test case numActions was 1. Now numActions is more than 1. Add tests for other numActions");
-  var actionName = getActionName();
-  var action = doAction();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName          = "Submit";
-  var expectedRole          = "43";
-  var expectedState         = "1048580";
-  var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-  var expectednodeFocus     = "Focused";
-  var expectedaccFocused    = "Focused";
-  var expectednumActions    = "1";
-  var expectedactionName    = "Press";
-  var expectednodeClick     = "Button Pressed";
-  var expectedkeyboardShortcut = "Alt+b";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-  var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-  var row7 = new Array("accNumActions->", expectednumActions, numActions);
-  var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-  var row9 = new Array("accDoAction()->", expectednodeClick, nodeClick);
-  var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-  if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-  if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-  if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-  if (nodeClick == expectednodeClick)       row9[3] = "PASS"; else row9[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row10[3] = "PASS"; else row10[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-nodeFocus = "Not Focused";
-nodeClick = "Button Not Pressed";
-cookieName = "nsIAccessibleTestButtonNode";
-res = "<b><u> Results for HTML Button Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Button -->
-  document.write('<br>');
-  document.write('<b>Testing HTML Button for Accessibility..</b><br><br>');
-  document.write('<button value="submit" accesskey="b"> Submit </button>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
diff --git a/embedding/qa/jstests/accessibility/html/htmlbuttontext.html b/embedding/qa/jstests/accessibility/html/htmlbuttontext.html
deleted file mode 100644
index 8134436973a..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlbuttontext.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML BUTTON TEXT Node
-     Author: dsirnapalli@netscape.com
-     Created:01.08.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeButtonText()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("button").item(0);
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeButtonText();
-  accNode = getAccessibleNode(domNode);
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    accNode.accTakeFocus();
-    domNode = domNode.firstChild;
-    accNode = getAccessibleNode(domNode);
-
-    setTimeout("constructResults();", 2000);
-   }
-   catch(e){
-     alert("Exception**: " + e);
-   }
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var name = getName(accNode);
-  var role = getRole(accNode);
-  var state = getState(accNode);
-  var value = getValue(accNode);
-  var newvalue = value.toString();
-
-  var expectedName   = "Submit";
-  var expectedRole   = "42";
-  var expectedState  = "2097216";
-  var expectedValue  = "NS_ERROR_NOT_IMPLEMENTED";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-
-  row = new Array(row0, row1, row2, row3, row4);
-
-  if (name == expectedName)           row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)           row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)         row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))  row4[3] = "PASS"; else row4[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestButtonNodeText";
-var res = "<b><u> Results for HTML Button Text Node:</u></b><br><br>";
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Button -->
-  document.write('<br>');
-  document.write('<b>Testing Button Text for Accessibility..</b><br><br>');
-  document.write('<button value="submit">Submit</button>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/html/htmlcheckboxchecked.html b/embedding/qa/jstests/accessibility/html/htmlcheckboxchecked.html
deleted file mode 100644
index 0d2af93d6f1..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlcheckboxchecked.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML CHECKBOX CHECKED Node
-     Author: dsirnapalli@netscape.com
-     Created:01.18.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeCheckBoxChecked()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("form").item(0);
-  arr = new Array(5);
-  arr = node.elements;
-  return arr[0];
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeCheckBoxChecked();
-  domNode.addEventListener('focus',nodeFocused,true);
-  domNode.addEventListener('click', nodeUnChecked,true);
-
-  accNode = getAccessibleNode(domNode);
-  tempaccNode = accNode;
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    accNode.accTakeFocus();
-  }
-  catch(e){
-    alert("Exception**: " + e);
-  }
-  setTimeout("constructResults();", 2000);
-}
-
-function nodeUnChecked()
-{
-  nodeCheck = "Check Box Not Checked";
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-  {
-    varaccFocused = "Focused";
-  }
-  else
-  {
-    varaccFocused = "Not Focused";
-  }
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var numActions = getNumActions();
-  if(numActions > 1)
-    alert("When i last modified the test case numActions was 1. Now numActions is more than 1. Add tests for other numActions");
-  var actionName = getActionName();
-  var action = doAction();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName      = null;
-  var expectedRole      = "44";
-  var expectedState     = "1048596";
-  var expectedValue     = "NS_ERROR_NOT_IMPLEMENTED";
-  var expectednodeFocus     = "Focused";
-  var expectedaccFocused    = "Focused";
-  var expectednumActions    = "1";
-  var expectedactionName    = "Uncheck";
-  var expectednodeCheck     = "Check Box Not Checked";
-  var expectedkeyboardShortcut = "Alt+c";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-  var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-  var row7 = new Array("accNumActions->", expectednumActions, numActions);
-  var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-  var row9 = new Array("accDoAction()->", expectednodeCheck, nodeCheck);
-  var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-  if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-  if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-  if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-  if (nodeCheck == expectednodeCheck)       row9[3] = "PASS"; else row9[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row10[3] = "PASS"; else row10[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-nodeFocus = "Not Focused";
-nodeCheck = "Check Box Checked";
-cookieName = "nsIAccessibleTestCheckBoxCheckedNode";
-var res = "<b><u> Results for HTML Check Box Checked Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
- <!-- Test Form -->
-  document.write('<br><br><b> Testing Check Box Checked </b><br><br>');
-  document.write('<form>');
-
-  document.write('Is your age: <br>');
-  document.write('<input type="checkbox" name="sex" checked accesskey="c" onClick="nodeUnChecked();" onFocus="nodeFocused();"> Above 30');
-  document.write('<input type="checkbox" name="sex"> Below 30');
-
-  document.write('</form>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
-
-
diff --git a/embedding/qa/jstests/accessibility/html/htmlcheckboxunchecked.html b/embedding/qa/jstests/accessibility/html/htmlcheckboxunchecked.html
deleted file mode 100644
index afd97c2f5ac..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlcheckboxunchecked.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML CHECKBOX UNCHECKED Node
-     Author: dsirnapalli@netscape.com
-     Created:01.18.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeCheckBoxUnchecked()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("form").item(0);
-  arr = new Array(5);
-  arr = node.elements;
-  return arr[0];
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeCheckBoxUnchecked();
-  domNode.addEventListener('focus',nodeFocused,true);
-  domNode.addEventListener('click', nodeChecked,true);
-
-  accNode = getAccessibleNode(domNode);
-  tempaccNode = accNode;
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    accNode.accTakeFocus();
-  }
-  catch(e){
-    alert("Exception**: " + e);
-  }
-  setTimeout("constructResults();", 2000);
-}
-
-function nodeChecked()
-{
-  nodeCheck = "Check Box Checked";
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-  {
-    varaccFocused = "Focused";
-  }
-  else
-  {
-    varaccFocused = "Not Focused";
-  }
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var numActions = getNumActions();
-  if(numActions > 1)
-    alert("When i last modified the test case numActions was 1. Now numActions is more than 1. Add tests for other numActions");
-  var actionName = getActionName();
-  var action = doAction();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName      = null;
-  var expectedRole      = "44";
-  var expectedState     = "1048580";
-  var expectedValue     = "NS_ERROR_NOT_IMPLEMENTED";
-  var expectednodeFocus     = "Focused";
-  var expectedaccFocused    = "Focused";
-  var expectednumActions    = "1";
-  var expectedactionName    = "Check";
-  var expectednodeCheck     = "Check Box Checked";
-  var expectedkeyboardShortcut = "Alt+c";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-  var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-  var row7 = new Array("accNumActions->", expectednumActions, numActions);
-  var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-  var row9 = new Array("accDoAction()->", expectednodeCheck, nodeCheck);
-  var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-  if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-  if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-  if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-  if (nodeCheck == expectednodeCheck)       row9[3] = "PASS"; else row9[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row10[3] = "PASS"; else row10[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-nodeFocus = "Not Focused";
-nodeCheck = "Check Box Not Checked";
-cookieName = "nsIAccessibleTestCheckBoxNode";
-var res = "<b><u> Results for HTML Check Box Unchecked Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
- <!-- Test Form -->
-  document.write('<br><br><b> Testing Check Box Unchecked for Accessibility </b><br><br>');
-  document.write('<form>');
-
-  document.write('Is your age: <br>');
-  document.write('<input type="checkbox" name="sex" accesskey="c"> Above 30');
-  document.write('<input type="checkbox" name="sex"> Below 30');
-
-  document.write('</form>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
-
-
-
diff --git a/embedding/qa/jstests/accessibility/html/htmlfieldsetwithlegend.html b/embedding/qa/jstests/accessibility/html/htmlfieldsetwithlegend.html
deleted file mode 100644
index ac4530b2fa4..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlfieldsetwithlegend.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML FIELDSET WITH LEGEND Node
-     Author: dsirnapalli@netscape.com
-     Created:03.01.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeFieldset()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("form").item(0);
-  arr = new Array(5);
-  arr = node.elements;
-  return arr[0];
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeFieldset();
-  accNode = getAccessibleNode(domNode);
-  setTimeout("constructResults();", 2000);
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName      = "Customer Identification";
-  var expectedRole      = "20";
-  var expectedState     = "0";
-  var expectedValue     = "NS_ERROR_NOT_IMPLEMENTED";
-  var expectedkeyboardShortcut = "Alt+f";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row5[3] = "PASS"; else row5[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestFieldsetWithLegendNode";
-res = "<b><u> Results for HTML Fieldset(with Legend) Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test HTML FieldSet(with Legend) -->
-  document.write('<br>');
-  document.write('<b>Testing HTML FieldSet(with Legend) for Accessibility..</b><br><br>');
-  document.write('<br>');
-  document.write('<form action="http://www.democompany.com/cgi-bin/postquery.pl" method="post" enctype="multipart/form-data">');
-
-  document.write('<fieldset accesskey="f">');
-  document.write('<legend>Customer Identification</legend>');
-  document.write('<br><br>');
-  document.write('<label>Customer Name:</label>');
-  document.write('<input type="text" name="CustomerName" size="25">');
-  document.write('<br><br>');
-  document.write('<label>Password:</label>');
-  document.write('<input type="password" name="CustomerID" size="8" maxlength="8">');
-  document.write('<br>');
-  document.write('</fieldset>');
-  document.write('</form>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/html/htmlfieldsetwithoutlegend.html b/embedding/qa/jstests/accessibility/html/htmlfieldsetwithoutlegend.html
deleted file mode 100644
index c248408a334..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlfieldsetwithoutlegend.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML FIELDSET WITHOUT LEGEND Node
-     Author: dsirnapalli@netscape.com
-     Created:03.01.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeFieldset()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("form").item(0);
-  arr = new Array(5);
-  arr = node.elements;
-  return arr[0];
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeFieldset();
-  accNode = getAccessibleNode(domNode);
-  setTimeout("constructResults();", 2000);
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName      = "";
-  var expectedRole      = "20";
-  var expectedState     = "0";
-  var expectedValue     = "NS_ERROR_NOT_IMPLEMENTED";
-  var expectedkeyboardShortcut = "Alt+f";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row5[3] = "PASS"; else row5[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestFieldsetWithoutLegendNode";
-res = "<b><u> Results for HTML Fieldset(without Legend) Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test HTML FieldSet(without Legend) -->
-  document.write('<br>');
-  document.write('<b>Testing HTML FieldSet(without Legend) for Accessibility..</b><br><br>');
-  document.write('<br>');
-  document.write('<form action="http://www.democompany.com/cgi-bin/postquery.pl" method="post" enctype="multipart/form-data">');
-
-  document.write('<fieldset accesskey="f">');
-  document.write('<br><br>');
-  document.write('<label>Customer Name:</label>');
-  document.write('<input type="text" name="CustomerName" size="25">');
-  document.write('<br><br>');
-  document.write('<label>Password:</label>');
-  document.write('<input type="password" name="CustomerID" size="8" maxlength="8">');
-  document.write('<br>');
-  document.write('</fieldset>');
-  document.write('</form>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/html/htmlradiobuttonchecked.html b/embedding/qa/jstests/accessibility/html/htmlradiobuttonchecked.html
deleted file mode 100644
index d5d6f57074e..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlradiobuttonchecked.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML RADIOBUTTON CHECKED Node
-     Author: dsirnapalli@netscape.com
-     Created:01.18.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeRadioButtonChecked()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("form").item(0);
-  arr = new Array(5);
-  arr = node.elements;
-  return arr[3];
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeRadioButtonChecked();
-  domNode.addEventListener('focus',nodeFocused,true);
-  domNode.addEventListener('click', nodeClicked,true);
-
-  accNode = getAccessibleNode(domNode);
-  tempaccNode = accNode;
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    accNode.accTakeFocus();
-  }
-  catch(e){
-    alert("Exception**: " + e);
-  }
-  setTimeout("constructResults();", 2000);
-}
-
-function nodeClicked()
-{
-  nodeClick = "Radio Button Unchecked";
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-  {
-    varaccFocused = "Focused";
-  }
-  else
-  {
-    varaccFocused = "Not Focused";
-  }
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var numActions = getNumActions();
-  if(numActions > 1)
-    alert("When i last modified the test case numActions was 1. Now numActions is more than 1. Add tests for other numActions");
-  var actionName = getActionName();
-  var action = doAction();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName      = null;
-  var expectedRole      = "45";
-  var expectedState     = "1048596";
-  var expectedValue     = "NS_ERROR_NOT_IMPLEMENTED";
-  var expectednodeFocus     = "Focused";
-  var expectedaccFocused    = "Focused";
-  var expectednumActions    = "1";
-  var expectedactionName    = "Select";
-  var expectednodeClick     = "Radio Button Unchecked";
-  var expectedkeyboardShortcut = "Alt+r";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-  var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-  var row7 = new Array("accNumActions->", expectednumActions, numActions);
-  var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-  var row9 = new Array("accDoAction()->", expectednodeClick, nodeClick);
-  var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-  if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-  if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-  if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-  if (nodeClick == expectednodeClick)       row9[3] = "PASS"; else row9[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row10[3] = "PASS"; else row10[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
-  }
-  catch(e){
-   alert("Exception**: " + e);
-  }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-nodeFocus = "Not Focused";
-nodeClick = "Radio Button Checked";
-cookieName = "nsIAccessibleTestRadioButtonCheckedNode";
-var res = "<b><u> Results for HTML Radio Button Checked Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Form -->
-  document.write('<br><br><b> Testing Radio Button Checked </b><br><br>');
-  document.write('<form>');
-  document.write('  Which is your favorite food');
-  document.write('  <input type="radio" name="favorite" value="mexican"> Mexican');
-  document.write('  <input type="radio" name="favorite" value="italian"> Italian');
-  document.write('  <input type="radio" name="favorite" value="japanese"> Japanese');
-  document.write('  <input type="radio" checked accesskey="r" name="favorite" value="other"> Other');
-  document.write('</form>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
-
-
-
diff --git a/embedding/qa/jstests/accessibility/html/htmlradiobuttonunchecked.html b/embedding/qa/jstests/accessibility/html/htmlradiobuttonunchecked.html
deleted file mode 100644
index 6127a69afaa..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlradiobuttonunchecked.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML RADIOBUTTON UNCHECKED Node
-     Author: dsirnapalli@netscape.com
-     Created:01.18.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeRadioButtonUnchecked()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("form").item(0);
-  arr = new Array(5);
-  arr = node.elements;
-  return arr[0];
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeRadioButtonUnchecked();
-  domNode.addEventListener('focus',nodeFocused,true);
-  domNode.addEventListener('click', nodeClicked,true);
-
-  accNode = getAccessibleNode(domNode);
-  tempaccNode = accNode;
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    accNode.accTakeFocus();
-  }
-  catch(e){
-    alert("Exception**: " + e);
-  }
-  setTimeout("constructResults();", 2000);
-}
-
-function nodeClicked()
-{
-  nodeClick = "Radio Button Checked";
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-  {
-    varaccFocused = "Focused";
-  }
-  else
-  {
-    varaccFocused = "Not Focused";
-  }
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var numActions = getNumActions();
-  if(numActions > 1)
-    alert("When i last modified the test case numActions was 1. Now numActions is more than 1. Add tests for other numActions");
-  var actionName = getActionName();
-  var action = doAction();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName      = null;
-  var expectedRole      = "45";
-  var expectedState     = "1048580";
-  var expectedValue     = "NS_ERROR_NOT_IMPLEMENTED";
-  var expectednodeFocus     = "Focused";
-  var expectedaccFocused    = "Focused";
-  var expectednumActions    = "1";
-  var expectedactionName    = "Select";
-  var expectednodeClick     = "Radio Button Checked";
-  var expectedkeyboardShortcut = "Alt+r";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-  var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-  var row7 = new Array("accNumActions->", expectednumActions, numActions);
-  var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-  var row9 = new Array("accDoAction()->", expectednodeClick, nodeClick);
-  var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-  if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-  if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-  if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-  if (nodeClick == expectednodeClick)       row9[3] = "PASS"; else row9[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row10[3] = "PASS"; else row10[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-nodeFocus = "Not Focused";
-nodeClick = "Radio Button Unchecked";
-cookieName = "nsIAccessibleTestRadioButtonNode";
-var res = "<b><u> Results for HTML Radio Button Unchecked Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Form -->
-  document.write('<br><br><b> Testing Radio Button Unchecked </b><br><br>');
-  document.write('<form>');
-  document.write('  Which is your favorite food');
-  document.write('  <input type="radio" name="favorite" value="mexican" accesskey="r"> Mexican');
-  document.write('  <input type="radio" name="favorite" value="italian"> Italian');
-  document.write('  <input type="radio" name="favorite" value="japanese"> Japanese');
-  document.write('  <input type="radio" checked name="favorite" value="other"> Other');
-  document.write('</form>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/html/htmlselect.html b/embedding/qa/jstests/accessibility/html/htmlselect.html
deleted file mode 100644
index 51bfc4cb763..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlselect.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML SELECT Node
-     Author: dsirnapalli@netscape.com
-     Created:03.27.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeSelect()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("select").item(0);
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeSelect();
-  domNode.addEventListener('focus',nodeFocused,true);
-
-  accNode = getAccessibleNode(domNode);
-  tempaccNode = accNode;
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    accNode.accTakeFocus();
-  }
-  catch(e){
-    alert("Exception**: " + e);
-  }
-  setTimeout("constructResults();", 2000);
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-  {
-    varaccFocused = "Focused";
-  }
-  else
-  {
-    varaccFocused = "Not Focused";
-  }
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName          = null;
-  var expectedRole          = "46";
-  var expectedState         = "1074791492";
-  var expectedValue         = "Red";
-  var expectednodeFocus     = "Focused";
-  var expectedaccFocused    = "Focused";
-  var expectedkeyboardShortcut = "Alt+s";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-  var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-  var row7 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5, row6, row7);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-  if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row7[3] = "PASS"; else row7[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestSelectNode";
-nodeFocus = "Not Focused";
-
-res = "<b><u> Results for HTML Select Combobox's Select Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Select List -->
-  document.write('<b>Testing Select Combobox Select Node..</b>');
-  document.write('<br><br>');
-  document.write('Choose your favorite color ');
-  document.write('<select accesskey="s">');
-  document.write('  <option> Red    </option>');
-  document.write('  <option> Blue   </option>');
-  document.write('  <option> Green  </option>');
-  document.write('  <option> Yellow </option>');
-  document.write('</select>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/html/htmlselectoption.html b/embedding/qa/jstests/accessibility/html/htmlselectoption.html
deleted file mode 100644
index c7047e48fb6..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmlselectoption.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML SELECT COMBOBOX OPTION Node
-     Author: dsirnapalli@netscape.com
-     Created:03.27.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeSelectComboboxOption()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("select").item(0);
-  node = node.firstChild;
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeSelectComboboxOption();
-  domNode.addEventListener('focus',nodeFocused,true);
-
-  accNode = getAccessibleNode(domNode);
-  tempaccNode = accNode;
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    accNode.accTakeFocus();
-  }
-  catch(e){
-    alert("Exception**: " + e);
-  }
-  setTimeout("constructResults();", 2000);
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-  {
-    varaccFocused = "Focused";
-  }
-  else
-  {
-    varaccFocused = "Not Focused";
-  }
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var numActions = getNumActions();
-  var actionName = getActionName();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName          = "Red";
-  var expectedRole          = "34";
-  var expectedState         = "3145734";
-  var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-  var expectednodeFocus     = "Focused";
-  var expectedaccFocused    = "Focused";
-  var expectednumActions    = 1;
-  var expectedactionName    = "Select";
-  var expectedkeyboardShortcut = "Alt+o";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-  var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-  var row7 = new Array("accNumActions->", expectednumActions, numActions);
-  var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-  var row9 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-  if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-  if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-  if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row9[3] = "PASS"; else row9[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestSelectComboboxOptionNode";
-nodeFocus = "Not Focused";
-
-res = "<b><u> Results for HTML Select Combobox Option Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Select List -->
-  document.write('<b>Testing Select Combobox Option Node..</b>');
-  document.write('<br><br>');
-  document.write('Choose your favorite color ');
-  document.write('<select>');
-  document.write('  <option accesskey="o"> Red    </option>');
-  document.write('  <option> Blue   </option>');
-  document.write('  <option> Green  </option>');
-  document.write('  <option> Yellow </option>');
-  document.write('</select>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/html/htmltable.html b/embedding/qa/jstests/accessibility/html/htmltable.html
deleted file mode 100644
index 719dde6bc9d..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmltable.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML TABLE Node
-     Author: dsirnapalli@netscape.com
-     Created:11.20.01
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeTable()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("table").item(0);
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeTable();
-  accNode = getAccessibleNode(domNode);
-  setTimeout("constructResults();", 2000);
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var name = getName(accNode);
-  var role = getRole(accNode);
-  var state = getState(accNode);
-  var value = getValue(accNode);
-  var newvalue = value.toString();
-
-  var expectedName      = "Test Table";
-  var expectedRole      = "24";
-  var expectedState     = "0";
-  var expectedValue     = "NS_ERROR_NOT_IMPLEMENTED";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-
-  row = new Array(row0, row1, row2, row3, row4);
-
-  if (name == expectedName)          row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)          row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)        row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue)) row4[3] = "PASS"; else row4[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestTableNode";
-res = "<b><u> Results for HTML Table Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Table -->
-  document.write('<center>');
-  document.write('<table border cols=2 width="50%">');
-  document.write('<caption>Test Table</caption>');
-  document.write('<tr>');
-  document.write(' <td> Row1,Col1</td>');
-  document.write(' <td> Row1,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row2,Col1</td>');
-  document.write(' <td> Row2,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row3,Col1</td>');
-  document.write(' <td> Row3,Col2</td>');
-  document.write('</tr>');
-  document.write('</table>');
-  document.write('</center>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
diff --git a/embedding/qa/jstests/accessibility/html/htmltablecaption.html b/embedding/qa/jstests/accessibility/html/htmltablecaption.html
deleted file mode 100644
index 13ecc208dd5..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmltablecaption.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML TABLE CAPTION Node
-     Author: dsirnapalli@netscape.com
-     Created:01.20.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeTableCaption()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("table").item(0);
-  node = node.firstChild;
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeTableCaption();
-  accNode = getAccessibleNode(domNode);
-  if(accNode == "Exception")
-  {
-    temp = "<table border cols=2 width='70%'>";
-    temp += "<tr>";
-    temp += "<td> The Node you selected is not an Accessible Node </td>";
-    temp += "<td> PASS </td>";
-    temp += "</tr>";
-    temp += "</table>";
-    res = res + temp;
-  }
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestTableCaptionNode";
-var res = "<b><u> Results for HTML Table Caption Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Table -->
-  document.write('<center>');
-  document.write('<table border cols=2 width="50%">');
-  document.write('<caption>Test Table</caption>');
-  document.write('<tr>');
-  document.write(' <td> Row1,Col1</td>');
-  document.write(' <td> Row1,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row2,Col1</td>');
-  document.write(' <td> Row2,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row3,Col1</td>');
-  document.write(' <td> Row3,Col2</td>');
-  document.write('</tr>');
-  document.write('</table>');
-  document.write('</center>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/html/htmltablecaptiontext.html b/embedding/qa/jstests/accessibility/html/htmltablecaptiontext.html
deleted file mode 100644
index 418fdd7f748..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmltablecaptiontext.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML TABLE CAPTION TEXT Node
-     Author: dsirnapalli@netscape.com
-     Created:01.20.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeTableCaptionText()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("table").item(0);
-  node = node.firstChild.firstChild;
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeTableCaptionText();
-  accNode = getAccessibleNode(domNode);
-  setTimeout("constructResults();", 2000);
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var name = getName(accNode);
-  var role = getRole(accNode);
-  var state = getState(accNode);
-  var value = getValue(accNode);
-  var newvalue = value.toString();
-
-  var expectedName      = "Test Table";
-  var expectedRole      = "42";
-  var expectedState     = "2097216";
-  var expectedValue     = "NS_ERROR_NOT_IMPLEMENTED";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-
-  row = new Array(row0, row1, row2, row3, row4);
-
-  if (name == expectedName)          row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)          row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)        row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue)) row4[3] = "PASS"; else row4[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestTableCaptionTextNode";
-var res = "<b><u> Results for HTML Table Caption Text Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Table -->
-  document.write('<center>');
-  document.write('<table border cols=2 width="50%">');
-  document.write('<caption>Test Table</caption>');
-  document.write('<tr>');
-  document.write(' <td> Row1,Col1</td>');
-  document.write(' <td> Row1,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row2,Col1</td>');
-  document.write(' <td> Row2,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row3,Col1</td>');
-  document.write(' <td> Row3,Col2</td>');
-  document.write('</tr>');
-  document.write('</table>');
-  document.write('</center>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
-
diff --git a/embedding/qa/jstests/accessibility/html/htmltablecell.html b/embedding/qa/jstests/accessibility/html/htmltablecell.html
deleted file mode 100644
index 4cc62edc758..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmltablecell.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML TABLE CELL Node
-     Author: dsirnapalli@netscape.com
-     Created:01.20.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeTableCell()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("td").item(0);
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeTableCell();
-  accNode = getAccessibleNode(domNode);
-  setTimeout("constructResults();", 2000);
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var name = getName(accNode);
-  var role = getRole(accNode);
-  var state = getState(accNode);
-  var value = getValue(accNode);
-  var newvalue = value.toString();
-
-  var expectedName      = null;
-  var expectedRole      = "29";
-  var expectedState     = "0";
-  var expectedValue     = "NS_ERROR_NOT_IMPLEMENTED";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-
-  row = new Array(row0, row1, row2, row3, row4);
-
-  if (name == expectedName)          row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)          row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)        row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue)) row4[3] = "PASS"; else row4[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestButtonNode";
-var res = "<b><u> Results for HTML Table Cell Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Table -->
-  document.write('<center>');
-  document.write('<table border cols=2 width="50%">');
-  document.write('<caption>Test Table</caption>');
-  document.write('<tr>');
-  document.write(' <td> Row1,Col1</td>');
-  document.write(' <td> Row1,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row2,Col1</td>');
-  document.write(' <td> Row2,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row3,Col1</td>');
-  document.write(' <td> Row3,Col2</td>');
-  document.write('</tr>');
-  document.write('</table>');
-  document.write('</center>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
diff --git a/embedding/qa/jstests/accessibility/html/htmltablecelltext.html b/embedding/qa/jstests/accessibility/html/htmltablecelltext.html
deleted file mode 100644
index 8a1534e1d00..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmltablecelltext.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML TABLE CELL TEXT Node
-     Author: dsirnapalli@netscape.com
-     Created:01.20.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeTableCellText()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("td").item(0);
-  node = node.firstChild;
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeTableCellText();
-  accNode = getAccessibleNode(domNode);
-  setTimeout("constructResults();", 2000);
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var name = getName(accNode);
-  var role = getRole(accNode);
-  var state = getState(accNode);
-  var value = getValue(accNode);
-  var newvalue = value.toString();
-
-  var expectedName      = "Row1,Col1";
-  var expectedRole      = "42";
-  var expectedState     = "2097216";
-  var expectedValue     = "NS_ERROR_NOT_IMPLEMENTED";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-
-  row = new Array(row0, row1, row2, row3, row4);
-
-  if (name == expectedName)          row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)          row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)        row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue)) row4[3] = "PASS"; else row4[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestTableCellTextNode";
-var res = "<b><u> Results for HTML Table Cell Text Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Table -->
-  document.write('<center>');
-  document.write('<table border cols=2 width="50%">');
-  document.write('<caption>Test Table</caption>');
-  document.write('<tr>');
-  document.write(' <td> Row1,Col1</td>');
-  document.write(' <td> Row1,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row2,Col1</td>');
-  document.write(' <td> Row2,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row3,Col1</td>');
-  document.write(' <td> Row3,Col2</td>');
-  document.write('</tr>');
-  document.write('</table>');
-  document.write('</center>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
diff --git a/embedding/qa/jstests/accessibility/html/htmltablerow.html b/embedding/qa/jstests/accessibility/html/htmltablerow.html
deleted file mode 100644
index 0e9bc436495..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmltablerow.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML TABLE ROW Node
-     Author: dsirnapalli@netscape.com
-     Created:01.20.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeTableRow()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("tr").item(0);
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeTableRow();
-  var accNode = getAccessibleNode(domNode);
-  if(accNode == "Exception")
-  {
-    temp = "<table border cols=2 width='70%'>";
-    temp += "<tr>";
-    temp += "<td> The Node you selected is not an Accessible Node </td>";
-    temp += "<td> PASS </td>";
-    temp += "</tr>";
-    temp += "</table>";
-    res = res + temp;
-  }
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-cookieName = "nsIAccessibleTestTableRowNode";
-var res = "<b><u> Results for HTML Table Row Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Table -->
-  document.write('<center>');
-  document.write('<table border cols=2 width="50%">');
-  document.write('<caption>Test Table</caption>');
-  document.write('<tr>');
-  document.write(' <td> Row1,Col1</td>');
-  document.write(' <td> Row1,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row2,Col1</td>');
-  document.write(' <td> Row2,Col2</td>');
-  document.write('</tr>');
-  document.write('<tr>');
-  document.write(' <td> Row3,Col1</td>');
-  document.write(' <td> Row3,Col2</td>');
-  document.write('</tr>');
-  document.write('</table>');
-  document.write('</center>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
diff --git a/embedding/qa/jstests/accessibility/html/htmltextarea.html b/embedding/qa/jstests/accessibility/html/htmltextarea.html
deleted file mode 100644
index 4e34e0a7f7f..00000000000
--- a/embedding/qa/jstests/accessibility/html/htmltextarea.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML TEXTAREA Node
-     Author: dsirnapalli@netscape.com
-     Created:01.26.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </script>
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-function getDomNodeTextArea()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var node = document.getElementsByTagName("textarea").item(0);
-  return node;
- }
- catch(e){
-  alert("Exception: " + e);
- }
-}
-
-function executeTestCase()
-{
-  var domNode = getDomNodeTextArea();
-  domNode.addEventListener('focus',nodeFocused,true);
-
-  accNode = getAccessibleNode(domNode);
-  tempaccNode = accNode;
-  try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    accNode.accTakeFocus();
-  }
-  catch(e){
-    alert("Exception**: " + e);
-  }
-  setTimeout("constructResults();", 2000);
-}
-
-function constructResults()
-{
- try{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-  {
-    varaccFocused = "Focused";
-  }
-  else
-  {
-    varaccFocused = "Not Focused";
-  }
-
-  var name = getName();
-  var role = getRole();
-  var state = getState();
-  var value = getValue();
-  var newvalue = value.toString();
-  var numActions = getNumActions();
-  var newnumActions = numActions.toString();
-  var keyboardShortcut = getAccKeyboardShortcut();
-
-  var expectedName        = null;
-  var expectedRole        = "42";
-  var expectedState       = "1048580";
-  var expectedValue       = "Default text..";
-  var expectednodeFocus   = "Focused";
-  var expectedaccFocused  = "Focused";
-  var expectednumActions  = "NS_ERROR_NOT_IMPLEMENTED";
-  var expectedkeyboardShortcut = "Alt+t";
-
-  var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-  var row1 = new Array("Name->", expectedName, name);
-  var row2 = new Array("Role->", expectedRole, role);
-  var row3 = new Array("State->", expectedState, state);
-  var row4 = new Array("Value->", expectedValue, value);
-  var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-  var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-  var row7 = new Array("accNumActions->", expectednumActions, numActions);
-  var row8 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-  row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8);
-
-  if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-  if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-  if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-  if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-  if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-  if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-  if (newnumActions.match(expectednumActions)) row7[3] = "PASS"; else row7[3] = "FAIL";
-  if (keyboardShortcut == expectedkeyboardShortcut)
-                                            row8[3] = "PASS"; else row8[3] = "FAIL";
-
-  appendTableRes();
-  if(!isRunningStandalone())
-    WriteResults(res);
-  else
-    submitToCookie();
- }
- catch(e){
-  alert("Exception**: " + e);
- }
-}
-
-</script>
-</head>
-<body>
-
-<script type="text/javascript">
-nodeFocus = "Not Focused";
-cookieName = "nsIAccessibleTestTextAreaNode";
-var res = "<b><u> Results for HTML Text Area Node:</u></b><br><br>";
-
-if(readCookie(cookieName) == null)
-{
-  <!-- Test Text Area -->
-  document.write('<b> Testing Text Area </b><br><br>');
-  document.write('<textarea name="Comment Box" accesskey="t" cols="40" rows="8" onFocus="nodeFocused();">');
-  document.write('Default text..');
-  document.write('</textarea>');
-
-  setTimeout("executeTestCase();", 2000);
-}
-else
-{
-  var cookieValue = readCookie(cookieName);
-  eraseCookie(cookieName);
-  document.write(cookieValue);
-}
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xularrowscrollbox.xul b/embedding/qa/jstests/accessibility/xul/xularrowscrollbox.xul
deleted file mode 100644
index 02d1867cf37..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xularrowscrollbox.xul
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL ARROWSCROLLBOX Node
-     Author: dsirnapalli@netscape.com
-     Created:06.12.02
-     Last Updated On:06.12.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="arrowscrollbox-window"
-  title="XUL Arrowscrollbox"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-  
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeArrowscrollbox()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("arrowscrollbox").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  } 
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeArrowscrollbox();
-    accNode = getAccessibleNode(domNode);
-    if(accNode == "Exception")
-    {            
-      temp = "<table border cols=2 width='70%'>";
-      temp += "<tr>";
-      temp += "<td> The Node you selected is not an Accessible Node </td>";
-      temp += "<td> PASS </td>";
-      temp += "</tr>";
-      temp += "</table>";
-      res = res + temp;
-    }    
-    WriteResults(res);    
-  }
-
-  ]]>
-  </html:script>
-  
-  <description>
-    <html:b> Testing XUL Arrowscrollbox for Accessibility.. </html:b>
-  </description>
-  <box orient="horizontal" flex="1">
-    //A box which provides scroll arrows along its edges for scolling through the
-    //contents of the box. The user only needs to hover the mouse over the arrows
-    //to scroll the box. This element is typically used for large popup menus.
-    <arrowscrollbox orient="vertical">
-      <button label="Red"/>
-      <button label="Blue"/>
-      <button label="Green"/>
-      <button label="Yellow"/>
-      <button label="Orange"/>
-      <button label="Silver"/>
-      <button label="Lavender"/>
-      <button label="Gold"/>
-      <button label="Turquoise"/>
-      <button label="Peach"/>
-      <button label="Maroon"/>
-      <button label="Black"/>
-    </arrowscrollbox>    
-    <spacer flex="1"/>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Arrowscrollbox Node:</u></b><br><br>";
- 
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>    
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulbox.xul b/embedding/qa/jstests/accessibility/xul/xulbox.xul
deleted file mode 100644
index 9647cdcbe48..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulbox.xul
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL BOX Node
-     Author: dsirnapalli@netscape.com
-     Created: 05.28.02 - Created
-     Last Updated:06.12.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="box-window"
-  title="XUL Box"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeBox()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("box").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeBox();
-    accNode = getAccessibleNode(domNode);
-    if(accNode == "Exception")
-    {            
-      temp = "<table border cols=2 width='70%'>";
-      temp += "<tr>";
-      temp += "<td> The Node you selected is not an Accessible Node </td>";
-      temp += "<td> PASS </td>";
-      temp += "</tr>";
-      temp += "</table>";
-      res = res + temp;
-    }    
-    WriteResults(res);    
-  }
-  
-  ]]>
-  </html:script>
-    
-  <description>
-    <html:b> Testing XUL Box for Accessibility.. </html:b>
-  </description>
-  <box orient="horizontal" flex="1"/>
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Box Node:</u></b><br><br>";
- 
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script> 
-</window>    
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulbutton.xul b/embedding/qa/jstests/accessibility/xul/xulbutton.xul
deleted file mode 100644
index 3cad27bd562..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulbutton.xul
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL BUTTON Node
-     Author: dsirnapalli@netscape.com
-     Created:05.22.02
-     Last Updated:06.11.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="button-window"
-  title="XUL Button"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeButton()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("button").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function nodeClicked()
-  {
-    nodeClick = "Button Pressed";
-  }
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeButton();
-    domNode.addEventListener('focus',nodeFocused,true);
-    domNode.addEventListener('click', nodeClicked,true);
-
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  }  
-
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var numActions = getNumActions();
-    var actionName = getActionName();
-    var action = doAction();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Normal";
-    var expectedRole          = "43";
-    var expectedState         = "1048580";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectednumActions    = "1";
-    var expectedactionName    = "Press";
-    var expectednodeClick     = "Button Pressed";
-    var expectedkeyboardShortcut = "Alt+n";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accNumActions->", expectednumActions, numActions);
-    var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-    var row9 = new Array("accDoAction()->", expectednodeClick, nodeClick);
-    var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-    if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-    if (nodeClick == expectednodeClick)       row9[3] = "PASS"; else row9[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row10[3] = "PASS"; else row10[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Button for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <!-- Simple Button with Label only -->
-      <button label="Normal" accesskey="n"/>
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Button Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-    nodeClick = "Button Not Pressed";    
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulcheckboxchecked.xul b/embedding/qa/jstests/accessibility/xul/xulcheckboxchecked.xul
deleted file mode 100644
index 79de86b562f..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulcheckboxchecked.xul
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL CHECKBOX Checked Node
-     Author: dsirnapalli@netscape.com
-     Created: 05.23.02 - Created
-     Last Updated:06.12.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="checkboxchecked-window"
-  title="XUL Checkbox Checked"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeCheckBoxChecked()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-    var node = document.getElementsByTagName("checkbox").item(0);
-    return node;
-   }
-   catch(e){
-    alert("Exception: " + e);
-   }
-  }
-
-  function nodeUnChecked()
-  {
-    nodeCheck = "Check Box Not Checked";
-  }
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeCheckBoxChecked();
-    domNode.addEventListener('focus',nodeFocused,true);
-    domNode.addEventListener('click', nodeUnChecked,true);
-
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  }
-  
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-    
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var numActions = getNumActions();
-    var actionName = getActionName();
-    var action = doAction();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Checkbox Label";
-    var expectedRole          = "44";
-    var expectedState         = "1048596";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectednumActions    = "1";
-    var expectedactionName    = "uncheck";
-    var expectednodeCheck     = "Check Box Not Checked";
-    var expectedkeyboardShortcut = "Alt+c";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accNumActions->", expectednumActions, numActions);
-    var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-    var row9 = new Array("accDoAction()->", expectednodeCheck, nodeCheck);
-    var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-    if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-    if (nodeCheck == expectednodeCheck)       row9[3] = "PASS"; else row9[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row10[3] = "PASS"; else row10[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-  }
-  
-  ]]>
-  </html:script>
-  
-  <box orient="vertical">
-    <description>
-      <html:b> Testing XUL Checkbox Checked for Accessibility.. </html:b>            
-    </description>
-    <box orient="horizontal">
-      <!-- Checkbox Checked -->
-      <checkbox id="case-sensitive" checked="true" label="Checkbox Label" accesskey="c"/>
-      <spacer flex="1"/>
-    </box>
-  </box>
-  
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Checkbox Checked Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-    nodeCheck = "Check Box Checked";
-    
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>
-  
-</window>   
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulcheckboxunchecked.xul b/embedding/qa/jstests/accessibility/xul/xulcheckboxunchecked.xul
deleted file mode 100644
index 16defe0bf8d..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulcheckboxunchecked.xul
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL CHECKBOX Unchecked Node
-     Author: dsirnapalli@netscape.com
-     Created: 05.23.02 - Created
-     Last Updated:06.12.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="checkboxunchecked-window"
-  title="XUL Checkbox Unchecked"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeCheckBoxUnchecked()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-    var node = document.getElementsByTagName("checkbox").item(0);
-    return node;
-   }
-   catch(e){
-    alert("Exception: " + e);
-   }
-  }
-
-  function nodeChecked()
-  {
-    nodeCheck = "Check Box Checked";
-  }
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeCheckBoxUnchecked();
-    domNode.addEventListener('focus',nodeFocused,true);
-    domNode.addEventListener('click', nodeChecked,true);
-
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  }
-  
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-    
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var numActions = getNumActions();
-    var actionName = getActionName();
-    var action = doAction();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Checkbox Label";
-    var expectedRole          = "44";
-    var expectedState         = "1048580";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectednumActions    = "1";
-    var expectedactionName    = "check";
-    var expectednodeCheck     = "Check Box Checked";
-    var expectedkeyboardShortcut = "Alt+b";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accNumActions->", expectednumActions, numActions);
-    var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-    var row9 = new Array("accDoAction()->", expectednodeCheck, nodeCheck);
-    var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-    if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-    if (nodeCheck == expectednodeCheck)       row9[3] = "PASS"; else row9[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row10[3] = "PASS"; else row10[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-  
-  <box orient="vertical">
-    <description>
-      <html:b> Testing XUL Checkbox Unchecked for Accessibility.. </html:b>            
-    </description>
-    <box orient="horizontal">
-      <!-- Checkbox Unchecked -->
-      <checkbox id="case-sensitive" label="Checkbox Label" accesskey="b"/>
-      <spacer flex="1"/>
-    </box>
-  </box>
-  
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Checkbox Unchecked Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-    nodeCheck = "Check Box Not Checked";
-    
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>
-  
-</window>   
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xuldeck.xul b/embedding/qa/jstests/accessibility/xul/xuldeck.xul
deleted file mode 100644
index a5423ac6aa9..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xuldeck.xul
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL DECK Node
-     Author: dsirnapalli@netscape.com
-     Created:05.28.02
-     Last Updated:06.12.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="deck-window"
-  title="XUL Deck"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeDeck()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("deck").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeDeck();
-    accNode = getAccessibleNode(domNode);
-    if(accNode == "Exception")
-    {            
-      temp = "<table border cols=2 width='70%'>";
-      temp += "<tr>";
-      temp += "<td> The Node you selected is not an Accessible Node </td>";
-      temp += "<td> PASS </td>";
-      temp += "</tr>";
-      temp += "</table>";
-      res = res + temp;
-    }    
-    WriteResults(res);    
-  }
-
-  ]]>
-  </html:script>
-  
-  <description>
-    <html:b> Testing XUL Deck for Accessibility.. </html:b>
-  </description>
-  <!-- A deck element also lays out its children on top of each other much like
-  the stack element, however decks only display one of thier children at a time.
-  Like stacks, the direct children of the deck element form the pages of the deck.
-  If there are three children of the deck element, the deck will have three children.
-  The displayed page of the deck can be changed by setting an index attribute on
-  the deck element. The index is a number that identifies which page to display.
-  Pages are numbered starting from zero. So the first clild of the deck is page 0,
-  the second is page 1 and so on.   -->
-  <deck selectedIndex ="2">
-    <description value="This is the first page"/>
-    <button label="This is the second page"/>
-    <box>
-      <description value="This is the third page"/>
-      <button label="This is also the third page"/>
-    </box>
-  </deck>  
-  
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Deck Node:</u></b><br><br>";
- 
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>  
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xuldescription.xul b/embedding/qa/jstests/accessibility/xul/xuldescription.xul
deleted file mode 100644
index cf802fef956..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xuldescription.xul
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL DESCRIPTION Node
-     Author: dsirnapalli@netscape.com
-     Created:05.30.02
-     Last Updated On:05.30.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="description-window"
-  title="XUL Description"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeDescription()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("description").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeDescription();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }
-
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Testing XUL Description for Accessibility..";
-    var expectedRole          = "42";
-    var expectedState         = "64";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectedkeyboardShortcut = "Alt+d";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row5[3] = "PASS"; else row5[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);   
-   }
-   catch(e){
-     alert("Exception**: " + e);
-   }
-  }
-
-  ]]>
-  </html:script>
-
-  <!-- The most basic way to include text in a window is to use the description element --> 
-  <description accesskey="d">
-    <html:b> Testing XUL Description for Accessibility.. </html:b>
-  </description>
-    
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Description Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulgrid.xul b/embedding/qa/jstests/accessibility/xul/xulgrid.xul
deleted file mode 100644
index 947edfcbcab..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulgrid.xul
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL GRID Node
-     Author: dsirnapalli@netscape.com
-     Created:05.30.02
-     Last Updated:05.30.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="grid-window"
-  title="XUL Grid"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeGrid()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("grid").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeGrid();
-    accNode = getAccessibleNode(domNode);
-    if(accNode == "Exception")
-    {            
-      temp = "<table border cols=2 width='70%'>";
-      temp += "<tr>";
-      temp += "<td> The Node you selected is not an Accessible Node </td>";
-      temp += "<td> PASS </td>";
-      temp += "</tr>";
-      temp += "</table>";
-      res = res + temp;
-    }    
-    WriteResults(res);    
-  }
-  
-  ]]>
-  </html:script>
-
-  <description>
-    <html:b> Testing XUL Grid for Accessibility.. </html:b>
-  </description>
-  <!-- HTML pages typically use tables for layout or for displaying a grid of data.
-  XUL has a set of elements for doing this type of thing. The grid element is used
-  to declare a grid of data. A grid contains elements that are aligned in rows just
-  like tables. Inside a grid, you declare two things, the columns that are used and
-  the rows that are used. Just like html tables, you put content such as labels and
-  buttons inside the rows. You donot put content inside the columns but you can use
-  them to specify the size and appearance of the columns in a grid. Alternatively 
-  you can put the content inside the cols, and use the rows to specify the appearance. -->
-  <box orient="horizontal">
-    <grid flex="1">
-      <columns>
-        <column flex="2"/>
-        <column flex="1"/>
-      </columns>
-      <rows>
-        <row>
-          <button label="Rabbit"/>
-          <button label="Elephant"/>
-        </row>
-        <row>
-          <button label="Koala"/>
-          <button label="Gorilla"/>
-        </row>
-      </rows>
-    </grid>  
-    <spacer flex="2"/>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Grid Node:</u></b><br><br>";
-    
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulgroupbox.xul b/embedding/qa/jstests/accessibility/xul/xulgroupbox.xul
deleted file mode 100644
index ab776e6d4c1..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulgroupbox.xul
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL GROUPBOX Node
-     Author: dsirnapalli@netscape.com
-     Created:05.28.02
-     Last Updated:06.13.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="groupbox-window"
-  title="XUL Groupbox"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeGroupbox()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("groupbox").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeGroupbox();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }
-
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Answer";
-    var expectedRole          = "20";
-    var expectedState         = "0";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectedkeyboardShortcut = "Alt+g";
- 
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
- 
-    row = new Array(row0, row1, row2, row3, row4, row5);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row5[3] = "PASS"; else row5[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }  
-
-  ]]>
-  </html:script>
-
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Groupbox for Accessibility.. </html:b>
-    </description>
-    <groupbox accesskey="g">
-      <caption label="Answer"/>
-      <description value="Banana"/>
-      <description value="Tangerine"/>
-      <description value="Phone Booth"/>
-      <description value="Kiwi"/>
-    </groupbox>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Groupbox Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulimage.xul b/embedding/qa/jstests/accessibility/xul/xulimage.xul
deleted file mode 100644
index c0dfb7030d5..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulimage.xul
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL IMAGE Node
-     Author: dsirnapalli@netscape.com
-     Created:06.13.02
-     Last Updated:06.13.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="image-window"
-  title="XUL Image"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeImage()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("image").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeImage();
-    accNode = getAccessibleNode(domNode);
-    if(accNode == "Exception")
-    {            
-      temp = "<table border cols=2 width='70%'>";
-      temp += "<tr>";
-      temp += "<td> The Node you selected is not an Accessible Node </td>";
-      temp += "<td> PASS </td>";
-      temp += "</tr>";
-      temp += "</table>";
-      res = res + temp;
-    }    
-    WriteResults(res);    
-  }
- 
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Image for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <!-- image element is used to display images within a window -->
-      <image src="mozilla-banner.gif"/>
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Image Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>    
-</window>
-  
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xullabel.xul b/embedding/qa/jstests/accessibility/xul/xullabel.xul
deleted file mode 100644
index c42b2033efc..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xullabel.xul
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL Label Node
-     Author: dsirnapalli@netscape.com
-     Created:05.31.02
-     Last Updated:05.31.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="label-window"
-  title="XUL Label"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeLabel()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("label").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeLabel();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }
-
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Click here";
-    var expectedRole          = "42";
-    var expectedState         = "64";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectedkeyboardShortcut = "Alt+h";
-  
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-  
-    row = new Array(row0, row1, row2, row3, row4, row5);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row5[3] = "PASS"; else row5[3] = "FAIL";
-    
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-
-  <description>
-    <html:b> Testing XUL Label for Accessibility.. </html:b>
-  </description>
-  <!-- Label element is intended for labels of controls such as buttons and textboxes -->
-  <label value="Click here" control="open-button" accesskey="h"/>
-  <box orient="horizontal">
-    <button id="open-button" label="Open"/>    
-    <spacer flex="1"/>
-  </box>
-  
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Label Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xullistbox.xul b/embedding/qa/jstests/accessibility/xul/xullistbox.xul
deleted file mode 100644
index 72aa30edade..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xullistbox.xul
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL LISTBOX Node
-     Author: dsirnapalli@netscape.com
-     Create: 05.28.02
-     Last Updated:06.13.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="listbox-window"
-  title="XUL Listbox"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeListbox()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("listbox").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeListbox();
-    domNode.addEventListener('focus',nodeFocused,true);
-
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
-      accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  }
-
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "";
-    var expectedRole          = "33";
-    var expectedState         = "1048644";
-    var expectedValue         = "NS_ERROR_FAILURE";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectedkeyboardShortcut = "Alt+l";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row7[3] = "PASS"; else row7[3] = "FAIL";
- 
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-
-  ]]>
-  </html:script>
-
-  <box orient="vertical">
-    <description>
-      <html:b> Testing XUL Listbox for Accessibility.. </html:b>
-    </description>
-    <label value="Select a List Item:" control="get-item"/>
-    <box orient="horizontal">
-      <!-- listbox element is used to create multi-row list boxes -->
-      <listbox id="get-item" accesskey="l">
-        <listitem label="First Item" value="firstitem"/>
-        <listitem label="Second Item" value="seconditem"/>
-        <listitem label="Third Item" value="thirditem"/>
-        <listitem label="Fourth Item" value="fourthitem"/>
-      </listbox>  
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Listbox Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>  
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xullistitem.xul b/embedding/qa/jstests/accessibility/xul/xullistitem.xul
deleted file mode 100644
index a4e90b203c4..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xullistitem.xul
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL Listbox's LISTITEM Node
-     Author: dsirnapalli@netscape.com
-     Created:05.28.02
-     Last Updated:06.14.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="listitem-window"
-  title="XUL Listitem"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeListItem()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("listitem").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeListItem();
-    domNode.addEventListener('focus',nodeFocused,true);
-
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      accNode.accTakeFocus();
-      var action = doAction();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  }
-
-  function nodeSelected()
-  {
-    nodeClick = "List Item Selected";
-  }
- 
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var numActions = getNumActions();
-    var actionName = getActionName();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "First Item";
-    var expectedRole          = "34";
-    var expectedState         = "3145734";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectednumActions    = "1";
-    var expectedactionName    = "Select";
-    var expectednodeClick     = "List Item Selected";
-    var expectedkeyboardShortcut = "I";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accNumActions->", expectednumActions, numActions);
-    var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-    var row9 = new Array("accDoAction()->", expectednodeClick, nodeClick);
-    var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-    if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-    if (nodeClick == expectednodeClick)       row9[3] = "PASS"; else row9[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row10[3] = "PASS"; else row10[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-
-  <box orient="vertical">
-    <description>
-      <html:b> Testing XUL Listbox's ListItem for Accessibility.. </html:b>
-    </description>
-    <label value="Select a List Item:" control="get-item"/>
-    <box orient="horizontal">
-      <!-- listbox element is used to create multi-row list boxes -->
-      <listbox id="get-item">
-        <listitem label="First Item" value="firstitem" oncommand="nodeSelected();" accesskey="I"/>
-        <listitem label="Second Item" value="seconditem" selected ="true"/>
-        <listitem label="Third Item" value="thirditem"/>
-        <listitem label="Fourth Item" value="fourthitem"/>
-      </listbox>  
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Listbox's Listitem Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-    nodeClick = "List Item Not Selected";    
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulmenubar.xul b/embedding/qa/jstests/accessibility/xul/xulmenubar.xul
deleted file mode 100644
index 8ddeea76da7..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulmenubar.xul
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL MENUBAR Node
-     Author: dsirnapalli@netscape.com
-     Created:06.14.02
-     Last Updated:06.14.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="menubar-window"
-  title="XUL Menubar"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeMenubar()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("menubar").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeMenubar();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }  
-
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Application";
-    var expectedRole          = "2";
-    var expectedState         = "0";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectedkeyboardShortcut = "Alt+b";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row5[3] = "PASS"; else row5[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Menubar for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <!-- There are five elements associated with creating a menu bar and its menus.
-      menubar - The container for the row of menus.
-      menu - Despite the name, this is actually only the title of the menu on the menubar.
-      This element can be placed on a menubar or can be placed separately.
-      menupopup - The popup box that appears when you click on the menu title. This box 
-      contains the list of menu commands.
-      menuitem - An individual command on the menu. This would be placed on a menupopup.
-      menuseparator - A separator bar on a menu. This would be placed on a menupopup.
-      IMP: You can customize the menus to have whatever you want on them on all platforms
-      except the Macintosh. This is because the Macintosh has its own special menu along
-      the top of the screen controlled by the system. -->
-      <toolbox flex="1">
-        <menubar id="sample-menubar" accesskey="b">
-          <menu id="file-menu" label="File">
-            <menupopup id="file-popup">
-              <menuitem label="New"/>
-              <menuitem label="Open"/>
-              <menuitem label="Save"/>
-              <menuseparator/>
-              <menuitem label="Exit"/>
-            </menupopup>
-          </menu>  
-          <menu id="edit-menu" label="Edit">
-            <menupopup id="edit-popup">
-              <menuitem label="Undo"/>
-              <menuitem label="Redo"/>
-            </menupopup>
-          </menu>   
-        </menubar>
-      </toolbox>    
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Menubar Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script> 
-</window>  
diff --git a/embedding/qa/jstests/accessibility/xul/xulmenuitem.xul b/embedding/qa/jstests/accessibility/xul/xulmenuitem.xul
deleted file mode 100644
index a4c049c7aee..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulmenuitem.xul
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL MENU MENUITEM Node
-     Author: dsirnapalli@netscape.com
-     Created:06.18.02
-     Last Updated:06.18.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="menuitem-window"
-  title="XUL Menuitem"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeMenuItem()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("menuitem").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function nodeClicked()
-  {
-    nodeClick = "Menu Item Selected";    
-  }
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeMenuItem();
-    domNode.addEventListener('focus',nodeFocused,true);
-//    domNode.addEventListener('click', nodeClicked,true);
-
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  }  
-
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var numActions = getNumActions();
-    var actionName = getActionName();
-    var action = doAction();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Open";
-    var expectedRole          = "12";
-    var expectedState         = "1146884";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectednumActions    = "1";
-    var expectedactionName    = "Select";
-    var expectednodeClick     = "Menu Item Selected";
-    var expectedkeyboardShortcut = "t";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accNumActions->", expectednumActions, numActions);
-    var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-    var row9 = new Array("accDoAction()->", expectednodeClick, nodeClick);
-    var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-    if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-    if (nodeClick == expectednodeClick)       row9[3] = "PASS"; else row9[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row10[3] = "PASS"; else row10[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-    
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Menu's Menuitem for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <menu label="File"> 
-        <menupopup> 
-          <menuitem label="Open" oncommand="nodeClicked();" accesskey="t"/> 
-          <menuitem label="Close"/> 
-          <menuseparator/> 
-          <menuitem label="Save" /> 
-          <menuitem label="Exit"/> 
-        </menupopup> 
-      </menu>
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Menu's Menuitem Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-    nodeClick = "Menu Item Not Selected";    
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulmenulist.xul b/embedding/qa/jstests/accessibility/xul/xulmenulist.xul
deleted file mode 100644
index 80ecdce11fa..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulmenulist.xul
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL MENULIST Node
-     Author: dsirnapalli@netscape.com
-     Created:06.17.02
-     Last Updated:06.17.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="menulist-window"
-  title="XUL Menulist"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeMenulist()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("menulist").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeMenulist();
-    domNode.addEventListener('focus',nodeFocused,true);
-
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  } 
-
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Second Menu Item";
-    var expectedRole          = "46";
-    var expectedState         = "1074791492";
-    var expectedValue         = "Second Menu Item";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectedkeyboardShortcut = "Alt+m";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue == expectedValue)            row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row7[3] = "PASS"; else row7[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL MenuList for Accessibility.. </html:b>
-    </description>
-    <label value="Select a Menu Item:" control="get-item"/>
-    <!-- menulist element is used to create drop-down list boxes -->
-    <!-- Three elements are needed to describe a drop-down box. 
-    The first is the menulist element, which create the textbox with the button beside it.
-    The second is the menupopup element,which creates the popup window which appears when
-    the button is clicked.
-    The third is the menuitem element, which creates the individual choices.  -->
-    <menulist accesskey="m">
-      <menupopup>
-        <menuitem label="First Menu Item"/>
-        <menuitem label="Second Menu Item" selected="true"/>
-        <menuitem label="Third Menu Item" src="images/findpic.gif"/>
-        <menuitem label="Fourth Menu Item"/>
-      </menupopup>
-    </menulist>  
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Menulist Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>  
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulprogressmeter.xul b/embedding/qa/jstests/accessibility/xul/xulprogressmeter.xul
deleted file mode 100644
index 2853982ac04..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulprogressmeter.xul
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL PROGRESSMETER Node
-     Author: dsirnapalli@netscape.com
-     Created:05.30.02
-     Last Updated:05.30.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="progressmeter-window"
-  title="XUL Progressmeter"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeProgressmeter()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("progressmeter").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeProgressmeter();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }
-
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Determinate Progress Meter:";
-    var expectedRole          = "48";
-    var expectedState         = "0";
-    var expectedValue         = "50%";
-    var expectedkeyboardShortcut = "Alt+p";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue ==expectedValue)             row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row5[3] = "PASS"; else row5[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-
-  ]]>
-  </html:script>
-
-  <description>
-    <html:b> Testing XUL Progressmeter for Accessibility.. </html:b>
-  </description>
-  <!-- A progress meter is a bar that indicates how much of the task has been completed.
-  There are two types of progress meters. determinate and undeterminate.
-  Determinate progress meters are used when you know the length of time that an 
-  operation will take.
-  Undeterminate progress meters are used when you donot know the length of time of
-  an operation. -->
-  <!-- Determined Progress Meter -->
-  <label control="det_progress" value="Determinate Progress Meter:"/>
-  <progressmeter id="det_progress" mode="determined" value="50%" accesskey="p"/>
-    
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Progressmeter Node:</u></b><br><br>";
-    
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulradiobuttonchecked.xul b/embedding/qa/jstests/accessibility/xul/xulradiobuttonchecked.xul
deleted file mode 100644
index fcea4ce1762..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulradiobuttonchecked.xul
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL Radio Button Checked Node
-     Author: dsirnapalli@netscape.com
-     Created:05.30.02
-     Last Updated:06.11.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="radiobuttonchecked-window"
-  title="XUL Radio Button Checked"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeRadioButtonChecked()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-    var node = document.getElementsByTagName("radio").item(0);
-    return node;
-   }
-   catch(e){
-    alert("Exception: " + e);
-   }
-  }
-
-  function nodeClicked()
-  {
-    nodeClick = "Radio Button Not checked";
-  }
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeRadioButtonChecked();
-    domNode.addEventListener('focus',nodeFocused,true);
-    domNode.addEventListener('click', nodeClicked,true);
-
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  }
-
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var numActions = getNumActions();
-    var actionName = getActionName();
-    var action = doAction();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "First Radio Button";
-    var expectedRole          = "45";
-    var expectedState         = "1048596";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectednumActions    = "1";
-    var expectedactionName    = "Select";
-    var expectednodeClick     = "Radio Button Not checked";
-    var expectedkeyboardShortcut = "Alt+r";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accNumActions->", expectednumActions, numActions);
-    var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-    var row9 = new Array("accDoAction()->", expectednodeClick, nodeClick);
-    var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-    if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-    if (nodeClick == expectednodeClick)       row9[3] = "PASS"; else row9[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row10[3] = "PASS"; else row10[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-
-  ]]>
-  </html:script>
- 
-  <box orient="vertical">
-    <description>
-      <html:b> Testing XUL Radio Button Checked for Accessibility.. </html:b>
-    </description>
-    <radiogroup id="test-radiogrp">
-      <radio group="test-radiogrp" label="First Radio Button" selected="true" accesskey="r"/>
-      <radio group="test-radiogrp" label="Second Radio Button"/>
-      <radio group="test-radiogrp" label="Third Radio Button"/>
-    </radiogroup>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Radio Button Checked Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-    nodeClick = "Radio Button Checked";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulradiobuttonunchecked.xul b/embedding/qa/jstests/accessibility/xul/xulradiobuttonunchecked.xul
deleted file mode 100644
index 9b89c5ecf41..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulradiobuttonunchecked.xul
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL Radio Button UnChecked Node
-     Author: dsirnapalli@netscape.com
-     Created:06.11.02
-     Last Updated:06.11.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="radiobuttonunchecked-window"
-  title="XUL Radio Button Unchecked"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-  
-  function getDomNodeRadioButtonUnChecked()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-    var node = document.getElementsByTagName("radio").item(0);
-    return node;
-   }
-   catch(e){
-    alert("Exception: " + e);
-   }
-  }
-
-  function nodeClicked()
-  {
-    nodeClick = "Radio Button Checked";
-  }
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeRadioButtonUnChecked();
-    domNode.addEventListener('focus',nodeFocused,true);
-    domNode.addEventListener('click', nodeClicked,true);
-
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  }
-  
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var numActions = getNumActions();
-    var actionName = getActionName();
-    var action = doAction();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "First Radio Button";
-    var expectedRole          = "45";
-    var expectedState         = "1048580";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectednumActions    = "1";
-    var expectedactionName    = "Select";
-    var expectednodeClick     = "Radio Button Checked";
-    var expectedkeyboardShortcut = "Alt+r";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accNumActions->", expectednumActions, numActions);
-    var row8 = new Array("getAccActionName()->", expectedactionName, actionName);
-    var row9 = new Array("accDoAction()->", expectednodeClick, nodeClick);
-    var row10 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (numActions == expectednumActions)     row7[3] = "PASS"; else row7[3] = "FAIL";
-    if (actionName == expectedactionName)     row8[3] = "PASS"; else row8[3] = "FAIL";
-    if (nodeClick == expectednodeClick)       row9[3] = "PASS"; else row9[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row10[3] = "PASS"; else row10[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-
-  ]]>
-  </html:script>  
-
-  <box orient="vertical">
-    <description>
-      <html:b> Testing XUL Radio Button Unchecked for Accessibility.. </html:b>
-    </description>
-    <radiogroup id="test-radiogrp">
-      <radio group="test-radiogrp" label="First Radio Button" accesskey="r"/>
-      <radio group="test-radiogrp" label="Second Radio Button" selected="true"/>
-      <radio group="test-radiogrp" label="Third Radio Button"/>
-    </radiogroup>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Radio Button Unchecked Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-    nodeClick = "Radio Button Not Checked";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulradiogroup.xul b/embedding/qa/jstests/accessibility/xul/xulradiogroup.xul
deleted file mode 100644
index 490768d73d0..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulradiogroup.xul
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL RADIOGROUP Node
-     Author: dsirnapalli@netscape.com
-     Created:06.21.02
-     Last Updated:06.21.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="radiogroup-window"
-  title="XUL Radiogroup"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeRadioGroup()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("radiogroup").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeRadioGroup();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }  
-
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "";
-    var expectedRole          = "20";
-    var expectedState         = "0";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectedkeyboardShortcut = "Alt+a";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row5[3] = "PASS"; else row5[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Radiogroup for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <radiogroup id="test-radiogrp" accesskey="a">
-        <radio group="test-radiogrp" label="First Radio Button" selected="true"/>
-        <radio group="test-radiogrp" label="Second Radio Button"/>
-        <radio group="test-radiogrp" label="Third Radio Button"/>
-      </radiogroup>
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Radiogroup Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>  
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulscrollbar.xul b/embedding/qa/jstests/accessibility/xul/xulscrollbar.xul
deleted file mode 100644
index fcf5a6776c0..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulscrollbar.xul
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL SCROLLBAR Node
-     Author: dsirnapalli@netscape.com
-     Created:05.30.02
-     Last Updated:05.30.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="scrollbar-window"
-  title="XUL Scrollbar"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeScrollbar()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("scrollbar").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeScrollbar();
-    accNode = getAccessibleNode(domNode);
-    if(accNode == "Exception")
-    {            
-      temp = "<table border cols=2 width='70%'>";
-      temp += "<tr>";
-      temp += "<td> The Node you selected is not an Accessible Node </td>";
-      temp += "<td> PASS </td>";
-      temp += "</tr>";
-      temp += "</table>";
-      res = res + temp;
-    }    
-    WriteResults(res);    
-  }
-
-  ]]>
-  </html:script>
-
-  <description>
-    <html:b> Testing XUL Scrollbar for Accessibility.. </html:b>
-  </description>
-  <!-- A scroll bar is actually made up of three elements, a slider bar
-  and two arrow elements. -->
-  <scrollbar id="scbar-id" align="horizontal" curpos="20"
-             maxpos="100" increment="1" pageincrement="10">
-    <scrollbarbutton type="decrement"/>
-    <slider flex="1"/>
-    <scrollbarbutton type="increment"/>
-  </scrollbar>
-    
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Scrollbar Node:</u></b><br><br>";
-    
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xulstack.xul b/embedding/qa/jstests/accessibility/xul/xulstack.xul
deleted file mode 100644
index 022ffedacc7..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xulstack.xul
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL STACK Node
-     Author: dsirnapalli@netscape.com
-     Created:05.30.02
-     Last Updated:05.30.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="stack-window"
-  title="XUL Stack"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeStack()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("stack").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeStack();
-    accNode = getAccessibleNode(domNode);
-    if(accNode == "Exception")
-    {            
-      temp = "<table border cols=2 width='70%'>";
-      temp += "<tr>";
-      temp += "<td> The Node you selected is not an Accessible Node </td>";
-      temp += "<td> PASS </td>";
-      temp += "</tr>";
-      temp += "</table>";
-      res = res + temp;
-    }    
-    WriteResults(res);    
-  }
-  
-  ]]>
-  </html:script>
-
-  <description>
-    <html:b> Testing XUL Stack for Accessibility.. </html:b>
-  </description>
-  <!-- The stack element is a simple box. It works like any other box but has the
-  special property that its children are laid out all on top of each other.
-  The first child of the stack is drawn at the bottom, the second child is drawn
-  next and so on. Any number of elements may be stacked up in a stack.
-  The size of the stack is determined by its largest child, but you can use the
-  CSS properties width, height, min-width and other related properties on both the
-  stack and its children. Note that events such as mouse clicks and keypresses are
-  passed to the element on the top of the stack, that is,the last element in the stack -->
-  <stack>
-    <button label="Goblins" left="5" top="5"/>
-    <button label="Trolls" left="60" top="20"/>
-    <button label="Vampires" left="10" top="60"/>    
-  </stack>  
-    
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Stack Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xultab.xul b/embedding/qa/jstests/accessibility/xul/xultab.xul
deleted file mode 100644
index f5d27f753f4..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultab.xul
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TABBOX TAB Node
-     Author: dsirnapalli@netscape.com
-     Created:06.17.02
-     Last Updated:06.17.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="tab-window"
-  title="XUL Tabbox Tab"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeTabboxTab()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("tab").item(0);
-      var node1 = document.getElementsByTagName("tab").item(1);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function nodeSwitched()
-  {
-    alert("here");
-    nodeClick = "Tab Switched";
-  }
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeTabboxTab();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }  
- 
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var numActions = getNumActions();
-    var actionName = getActionName();
-    var action = doAction();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "Mail";
-    var expectedRole          = "37";
-    var expectedState         = "0";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectednumActions    = "1";
-    var expectedactionName    = "Switch";
-    var expectednodeClick     = "Tab Switched";
-    var expectedkeyboardShortcut = "Alt+t";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accNumActions->", expectednumActions, numActions);
-    var row6 = new Array("getAccActionName()->", expectedactionName, actionName);
-    var row7 = new Array("accDoAction()->", expectednodeClick, nodeClick);
-    var row8 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (numActions == expectednumActions)     row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (actionName == expectedactionName)     row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (nodeClick == expectednodeClick)       row7[3] = "PASS"; else row7[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row8[3] = "PASS"; else row8[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
- 
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">
-    <description>
-      <html:b> Testing XUL Tabbox's Tab for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <tabbox>
-        <tabs>
-          <tab label="Mail" accesskey="t"/>
-          <tab label="News" onclick="alert('hi');"/>    
-        </tabs>
-        <tabpanels>
-          <tabpanel id="mailtab">
-            <checkbox label="Automatically check for mail"/>
-          </tabpanel>
-          <tabpanel id="newstab">
-            <button label="Clear News Buffer"/>
-          </tabpanel>  
-        </tabpanels>
-      </tabbox>  
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Tabbox's Tab Node:</u></b><br><br>";
-    nodeClick = "Tab Not Switched";    
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xultabbox.xul b/embedding/qa/jstests/accessibility/xul/xultabbox.xul
deleted file mode 100644
index b0870b75793..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultabbox.xul
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TABBOX Node
-     Author: dsirnapalli@netscape.com
-     Created:06.17.02
-     Last Updated:06.17.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="tabbox-window"
-  title="XUL Tabbox"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeTabbox()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("tabbox").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeTabbox();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }  
- 
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = ""
-    var expectedRole          = "9";
-    var expectedState         = "0";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectedkeyboardShortcut = "Alt+b";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row5[3] = "PASS"; else row5[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
- 
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Tabbox for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <!-- Tabboxes are typically used in an application in the preferences window.
-      A series of tabs appears across the top of a window. The user can click each
-      tab to see a different set of options. XUL provides a method to create such dialogs.
-      It involves five new elements.
-      tabbox    - the outer box that contains the tabs along the top and the tab
-      pages themselves 
-      tabs      - the inner box that contains the individual tabs.
-      tab       - a specific tab
-      tabpanels - the container for the pages
-      tabpanel  - the body of a single page. you would place the content for a page
-      within this element -->
-      <tabbox accesskey="b">
-        <tabs>
-          <tab label="Mail"/>
-          <tab label="News"/>    
-        </tabs>
-        <tabpanels>
-          <tabpanel id="mailtab">
-            <checkbox label="Automatically check for mail"/>
-          </tabpanel>
-          <tabpanel id="newstab">
-            <button label="Clear News Buffer"/>
-          </tabpanel>  
-        </tabpanels>
-      </tabbox>  
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Tabbox Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xultabpanel.xul b/embedding/qa/jstests/accessibility/xul/xultabpanel.xul
deleted file mode 100644
index 5d226dd659e..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultabpanel.xul
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TABBOX Tabpanel Node
-     Author: dsirnapalli@netscape.com
-     Created:06.17.02
-     Last Updated:06.17.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="tabpanel-window"
-  title="XUL Tabbox Tabpanel"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeTabboxTabpanel()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("tabpanel").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeTabboxTabpanel();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-    if(accNode == "Exception")
-    {            
-      temp = "<table border cols=2 width='70%'>";
-      temp += "<tr>";
-      temp += "<td> The Node you selected is not an Accessible Node </td>";
-      temp += "<td> PASS </td>";
-      temp += "</tr>";
-      temp += "</table>";
-      res = res + temp;
-    }    
-    WriteResults(res);    
-  }
-  
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Tabbox's Tabpanel for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <tabbox>
-        <tabs>
-          <tab label="Mail"/>
-          <tab label="News"/>    
-        </tabs>
-        <tabpanels>
-          <tabpanel id="mailtab">
-            <checkbox label="Automatically check for mail"/>
-          </tabpanel>
-          <tabpanel id="newstab">
-            <button label="Clear News Buffer"/>
-          </tabpanel>  
-        </tabpanels>
-      </tabbox>  
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Tabbox's Tabpanel Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xultabpanels.xul b/embedding/qa/jstests/accessibility/xul/xultabpanels.xul
deleted file mode 100644
index eef6f6bf398..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultabpanels.xul
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TABBOX TABPANELS Node
-     Author: dsirnapalli@netscape.com
-     Created:06.17.02
-     Last Updated:06.17.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="tabpanels-window"
-  title="XUL Tabbox Tabpanels"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeTabboxTabpanels()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("tabpanels").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeTabboxTabpanels();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }  
-
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var name = getName();
-    var newname = name.toString();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectedRole          = "38";
-    var expectedState         = "0";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectedkeyboardShortcut = "Alt+p";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, newname);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5);
-
-    if (newname.match(expectedName))          row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row5[3] = "PASS"; else row5[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Tabbox's Tabpanels for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <tabbox>
-        <tabs>
-          <tab label="Mail"/>
-          <tab label="News"/>    
-        </tabs>
-        <tabpanels accesskey="p">
-          <tabpanel id="mailtab">
-            <checkbox label="Automatically check for mail"/>
-          </tabpanel>
-          <tabpanel id="newstab">
-            <button label="Clear News Buffer"/>
-          </tabpanel>  
-        </tabpanels>
-      </tabbox>  
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Tabbox's Tabpanels Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xultabs.xul b/embedding/qa/jstests/accessibility/xul/xultabs.xul
deleted file mode 100644
index 8792224a397..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultabs.xul
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TABBOX TABS Node
-     Author: dsirnapalli@netscape.com
-     Created:06.17.02
-     Last Updated:06.17.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="tabs-window"
-  title="XUL Tabbox Tabs"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeTabboxTabs()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("tabs").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeTabboxTabs();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }  
- 
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "";
-    var expectedRole          = "60";
-    var expectedState         = "0";
-    var expectedValue         = "";
-    var expectedkeyboardShortcut = "Alt+t";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue == expectedValue)            row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row5[3] = "PASS"; else row5[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
- 
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">
-    <description>
-      <html:b> Testing XUL Tabbox's Tabs for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <tabbox>
-        <tabs accesskey="t">
-          <tab label="Mail"/>
-          <tab label="News"/>    
-        </tabs>
-        <tabpanels>
-          <tabpanel id="mailtab">
-            <checkbox label="Automatically check for mail"/>
-          </tabpanel>
-          <tabpanel id="newstab">
-            <button label="Clear News Buffer"/>
-          </tabpanel>  
-        </tabpanels>
-      </tabbox>  
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Tabbox's Tabs Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xultextbox.xul b/embedding/qa/jstests/accessibility/xul/xultextbox.xul
deleted file mode 100644
index c830323b9f1..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultextbox.xul
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TEXT BOX Node
-     Author: dsirnapalli@netscape.com
-     Revs: 05.23.02
-     Last Run On:06.13.02
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="textbox-window"
-  title="XUL Textbox"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-  
-  function getDomNodeTextbox()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      var node = document.getElementsByTagName("textbox").item(0);
-      return node.inputField; // see bug#147649      
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeTextbox();
-    domNode.addEventListener('focus',nodeFocused,true);
-    
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  } 
-
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var numActions = getNumActions();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = null;
-    var expectedRole          = "42";
-    var expectedState         = "1048580";
-    var expectedValue         = "Default text...";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectedkeyboardShortcut = "Alt+D";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (value == expectedValue)               row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row7[3] = "PASS"; else row7[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-    
-  <description>
-    <html:b> Testing XUL Textbox for Accessibility.. </html:b>
-  </description>
-  <box orient="vertical" flex="1">
-    <!-- TextBox with default text -->
-    <textbox value="Default text..." accesskey="D"/>
-    <spacer flex="1"/>
-  </box>
-  
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Textbox Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>  
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xultoolbar.xul b/embedding/qa/jstests/accessibility/xul/xultoolbar.xul
deleted file mode 100644
index fc0b27ec279..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultoolbar.xul
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TOOLBAR Node
-     Author: dsirnapalli@netscape.com
-     Created:06.14.02
-     Last Updated:06.14.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="toolbar-window"
-  title="XUL Toolbar"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeToolbar()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("toolbar").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeToolbar();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }
-
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-
-    var expectedName          = "";
-    var expectedRole          = "22";
-    var expectedState         = "0";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-
-    row = new Array(row0, row1, row2, row3, row4);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Toolbar for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <!-- When more than one toolbar is placed next to each other, they are typically
-      grouped together in something called a toolbox.
-      Along the left side of the toolbar is a little notch which, if clicked, will
-      collapse the toolbar so that only the notch is visible. The notch is called
-      a grippy. When multiple toolbars are placed in the same toolbox, the grippies
-      will collapse into a single row.
-      The toolbar should have an id attribute or the grippy won't be able to collapse
-      or expand it properly -->
-      <toolbox>
-        <toolbar id="nav-toolbar">
-          <toolbarbutton label="Back"/>
-          <toolbarbutton label="Forward"/>
-        </toolbar>
-        <toolbar id="bookmark-toolbar">
-          <toolbarbutton label="Bookmarks"/>
-          </toolbar>
-        <toolbar id="home-search-toolbar">
-          <toolbarbutton label="Home"/>
-          <toolbarbutton label="Search"/>
-        </toolbar>  
-      </toolbox>  
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Toolbar Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>    
-</window>
-
diff --git a/embedding/qa/jstests/accessibility/xul/xultoolbox.xul b/embedding/qa/jstests/accessibility/xul/xultoolbox.xul
deleted file mode 100644
index e747d65ba37..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultoolbox.xul
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TOOLBOX Node
-     Author: dsirnapalli@netscape.com
-     Created:06.14.02
-     Last Updated:06.14.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="toolbox-window"
-  title="XUL Toolbox"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeToolbox()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("toolbox").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeToolbox();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }
-
-  function constructResults()
-  {
-    try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-
-    var expectedName          = "";
-    var expectedRole          = "22";
-    var expectedState         = "0";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-
-    row = new Array(row0, row1, row2, row3, row4);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-  
-  <box orient="vertical" flex="1">  
-    <description>
-      <html:b> Testing XUL Toolbox for Accessibility.. </html:b>
-    </description>
-    <box orient="horizontal">
-      <!-- When more than one toolbar is placed next to each other, they are typically
-      grouped together in something called a toolbox.
-      Along the left side of the toolbar is a little notch which, if clicked, will
-      collapse the toolbar so that only the notch is visible. The notch is called
-      a grippy. When multiple toolbars are placed in the same toolbox, the grippies
-      will collapse into a single row.
-      The toolbar should have an id attribute or the grippy won't be able to collapse
-      or expand it properly -->
-      <toolbox>
-        <toolbar id="nav-toolbar">
-          <toolbarbutton label="Back"/>
-          <toolbarbutton label="Forward"/>
-        </toolbar>
-        <toolbar id="bookmark-toolbar">
-          <toolbarbutton label="Bookmarks"/>
-          </toolbar>
-        <toolbar id="home-search-toolbar">
-          <toolbarbutton label="Home"/>
-          <toolbarbutton label="Search"/>
-        </toolbar>  
-      </toolbox>  
-      <spacer flex="1"/>
-    </box>
-  </box>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Toolbox Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>    
-</window>
-
diff --git a/embedding/qa/jstests/accessibility/xul/xultree.xul b/embedding/qa/jstests/accessibility/xul/xultree.xul
deleted file mode 100644
index 38fb373f96c..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultree.xul
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TREE Node
-     Author: dsirnapalli@netscape.com
-     Created:06.17.02
-     Last Updated:06.17.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="tree-window"
-  title="XUL Tree"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeTree()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("tree").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeTree();
-    domNode.addEventListener('focus',nodeFocused,true);
-
-    accNode = getAccessibleNode(domNode);
-    tempaccNode = accNode;
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  }  
- 
-   function constructResults()
-   {
-    try{
-     netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-     if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-     {
-       varaccFocused = "Focused";
-     }
-     else
-     {
-       varaccFocused = "Not Focused";
-     }
- 
-     var name = getName();
-     var role = getRole();
-     var state = getState();
-     var value = getValue();
-     var newvalue = value.toString();
-     var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "";
-    var expectedRole          = "35";
-    var expectedState         = "1048644";
-    var expectedValue         = "";
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectedkeyboardShortcut = "Alt+t";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue == expectedValue)            row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row7[3] = "PASS"; else row7[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
- 
-  ]]>
-  </html:script>
-  
-  <!-- XUL provides a way to create tabular or hierarchical lists using a tree.
-  A tree is used for creating lists of items. The tree element is used for creating
-  hierarchical lists and tables. -->
-
-  <description>
-    <html:b> Testing XUL Tree for Accessibility.. </html:b>
-  </description>
-  
-  <tree seltype="single" flex="1" accesskey="t">
-    <treecols>
-      <treecol id="sender" label="Sender" flex="1"/>
-      <treecol id="subject" label="Subject" flex="2"/>
-    </treecols>
-    
-    <treechildren>
-      <treeitem>
-        <treerow>
-          <treecell label="joe@somewhere.com"/>
-          <treecell label="Top secret plans"/>
-        </treerow>  
-      </treeitem>
-      <treeitem>
-        <treerow>
-          <treecell label="mel@whereever.com"/>
-          <treecell label="Lets do lunch"/>
-        </treerow>  
-      </treeitem>      
-    </treechildren>
-  </tree>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Tree Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>    
-</window>  
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xultreecol.xul b/embedding/qa/jstests/accessibility/xul/xultreecol.xul
deleted file mode 100644
index fb79290671e..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultreecol.xul
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TREE TREECOL Node
-     Author: dsirnapalli@netscape.com
-     Created:06.17.02
-     Last Updated:06.17.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="treecol-window"
-  title="XUL Treecol"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeTreeCol()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("treecol").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function nodeClicked()
-  {
-    nodeClick = "Header Clicked";
-  }
-  
-  function executeTestCase()
-  {
-    var domNode = getDomNodeTreeCol();
-
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }  
- 
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var numActions = getNumActions();
-    var actionName = getActionName();
-    var action = doAction();
-    var keyboardShortcut = getAccKeyboardShortcut();
- 
-    var expectedName          = "Sender";
-    var expectedRole          = "25";
-    var expectedState         = "64";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectednumActions    = "1";
-    var expectedactionName    = "Click";
-    var expectednodeClick     = "Header Clicked";
-    var expectedkeyboardShortcut = "Alt+c";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accNumActions->", expectednumActions, numActions);
-    var row6 = new Array("getAccActionName()->", expectedactionName, actionName);
-    var row7 = new Array("accDoAction()->", expectednodeClick, nodeClick);
-    var row8 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8);
-    
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (numActions == expectednumActions)     row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (actionName == expectedactionName)     row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (nodeClick == expectednodeClick)       row7[3] = "PASS"; else row7[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row8[3] = "PASS"; else row8[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }  
- 
-  ]]>
-  </html:script>
-  
-  <description>
-    <html:b> Testing XUL Tree's Treecol for Accessibility.. </html:b>
-  </description>
-  
-  <tree seltype="single" flex="1">
-    <treecols>
-      <treecol id="sender" label="Sender" flex="1" onclick="nodeClicked();" accesskey="c"/>
-      <treecol id="subject" label="Subject" flex="2"/>
-    </treecols>
-    
-    <treechildren>
-      <treeitem>
-        <treerow>
-          <treecell label="joe@somewhere.com"/>
-          <treecell label="Top secret plans"/>
-        </treerow>  
-      </treeitem>
-      <treeitem>
-        <treerow>
-          <treecell label="mel@whereever.com"/>
-          <treecell label="Lets do lunch"/>
-        </treerow>  
-      </treeitem>      
-    </treechildren>
-  </tree>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Tree's Treecol Node:</u></b><br><br>";
-    nodeClick = "Header Not Clicked";    
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>    
-</window>  
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xultreecols.xul b/embedding/qa/jstests/accessibility/xul/xultreecols.xul
deleted file mode 100644
index d0e0c357ff5..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultreecols.xul
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TREE TREECOLS Node
-     Author: dsirnapalli@netscape.com
-     Created:06.18.02
-     Last Updated:06.18.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="treecols-window"
-  title="XUL Treecols"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeTreeCols()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("treecols").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    var domNode = getDomNodeTreeCols();
-    accNode = getAccessibleNode(domNode);
-    setTimeout("constructResults();", 2000);
-  }  
-
-  function constructResults()
-  {
-    try{
-     netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
-     var name = getName();
-     var role = getRole();
-     var state = getState();
-     var value = getValue();
-     var newvalue = value.toString();
-     var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "";
-    var expectedRole          = "33";
-    var expectedState         = "64";
-    var expectedValue         = "NS_ERROR_NOT_IMPLEMENTED";
-    var expectedkeyboardShortcut = "Alt+t";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue.match(expectedValue))        row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row5[3] = "PASS"; else row5[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-  
-  <description>
-    <html:b> Testing XUL Tree's Treecols for Accessibility.. </html:b>
-  </description>
-  
-  <tree seltype="single" flex="1">
-    <treecols accesskey="t">
-      <treecol id="sender" label="Sender" flex="1"/>
-      <treecol id="subject" label="Subject" flex="2"/>
-    </treecols>
-    
-    <treechildren>
-      <treeitem>
-        <treerow>
-          <treecell label="joe@somewhere.com"/>
-          <treecell label="Top secret plans"/>
-        </treerow>  
-      </treeitem>
-      <treeitem>
-        <treerow>
-          <treecell label="mel@whereever.com"/>
-          <treecell label="Lets do lunch"/>
-        </treerow>  
-      </treeitem>      
-    </treechildren>
-  </tree>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Tree's Treecols Node:</u></b><br><br>";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>    
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/accessibility/xul/xultreeitem.xul b/embedding/qa/jstests/accessibility/xul/xultreeitem.xul
deleted file mode 100644
index 2a9198d3df3..00000000000
--- a/embedding/qa/jstests/accessibility/xul/xultreeitem.xul
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0"?>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for XUL TREE TREECELL, TREEITEM, TREEROW Node
-     Author: dsirnapalli@netscape.com
-     Created:06.25.02
-     Last Updated:06.25.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window
-  id="treeitem-window"
-  title="XUL Treeitem"
-  orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/accesslib.js"> </html:script>
-  <html:script src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </html:script>
-
-  <html:script>
-  <![CDATA[
-
-  function getDomNodeTreeItem()
-  {
-    try{
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-      var node = document.getElementsByTagName("tree").item(0);
-      return node;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-  }  
-
-  function executeTestCase()
-  {
-    try{
-     netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-     var domNode = getDomNodeTreeItem();
-     domNode.addEventListener('focus',nodeFocused,true);
-
-     accTreeNode = getAccessibleNode(domNode);
-     accTreeColsNode = accTreeNode.accFirstChild;
-     accTreeColNode1 = accTreeColsNode.accFirstChild;
-     accTreeColNode2 = accTreeColNode1.accNextSibling;
-     accTreeItemNode1 = accTreeColsNode.accNextSibling;
-     accNode = accTreeItemNode1;
-    }
-    catch(e){
-      alert("Exception: " + e);
-    }
-
-    tempaccNode = accNode;
-    try{
-     netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-     accNode.accTakeFocus();
-    }
-    catch(e){
-      alert("Exception**: " + e);
-    }
-    setTimeout("constructResults();", 2000);
-  }
- 
-  function constructResults()
-  {
-   try{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    if(tempaccNode.accGetDOMNode() == accNode.accFocused.accGetDOMNode())
-    {
-      varaccFocused = "Focused";
-    }
-    else
-    {
-      varaccFocused = "Not Focused";
-    }
-     
-    var name = getName();
-    var role = getRole();
-    var state = getState();
-    var value = getValue();
-    var newvalue = value.toString();
-    var keyboardShortcut = getAccKeyboardShortcut();
-
-    var expectedName          = "joe@somewhere.com";
-    var expectedRole          = "36";
-    var expectedState         = "3145732";
-    var expectedValue         = 0;
-    var expectednodeFocus     = "Focused";
-    var expectedaccFocused    = "Focused";
-    var expectedkeyboardShortcut = "Alt+i";
-
-    var row0 = new Array("Property/Method", "Expected Values", "Actual Values", "Result");
-    var row1 = new Array("Name->", expectedName, name);
-    var row2 = new Array("Role->", expectedRole, role);
-    var row3 = new Array("State->", expectedState, state);
-    var row4 = new Array("Value->", expectedValue, value);
-    var row5 = new Array("accTakeFocus()->", expectednodeFocus, nodeFocus);
-    var row6 = new Array("accFocused->", expectedaccFocused, varaccFocused);
-    var row7 = new Array("accKeyboardShortcut->", expectedkeyboardShortcut, keyboardShortcut);
-
-    row = new Array(row0, row1, row2, row3, row4, row5, row6, row7);
-
-    if (name == expectedName)                 row1[3] = "PASS"; else row1[3] = "FAIL";
-    if (role == expectedRole)                 row2[3] = "PASS"; else row2[3] = "FAIL";
-    if (state == expectedState)               row3[3] = "PASS"; else row3[3] = "FAIL";
-    if (newvalue == expectedValue)            row4[3] = "PASS"; else row4[3] = "FAIL";
-    if (nodeFocus == expectednodeFocus)       row5[3] = "PASS"; else row5[3] = "FAIL";
-    if (varaccFocused == expectedaccFocused)  row6[3] = "PASS"; else row6[3] = "FAIL";
-    if (keyboardShortcut == expectedkeyboardShortcut)
-                                              row7[3] = "PASS"; else row7[3] = "FAIL";
-
-    appendTableRes();
-    WriteResults(res);    
-   }
-   catch(e){
-    alert("Exception**: " + e);
-   }
-  }
-  
-  ]]>
-  </html:script>
-  
-  <description>
-    <html:b> Testing XUL Tree's Treecell,Treeitem,Treerow Nodes for Accessibility.. </html:b>
-  </description>
-  
-  <tree seltype="single" flex="1">
-    <treecols>
-      <treecol id="sender" label="Sender" flex="1"/>
-      <treecol id="subject" label="Subject" flex="2"/>
-    </treecols>
-    
-    <treechildren>
-      <treeitem accesskey="i">
-        <treerow>
-          <treecell label="joe@somewhere.com"/>
-          <treecell label="Top secret plans"/>
-        </treerow>  
-      </treeitem>
-      <treeitem>
-        <treerow>
-          <treecell label="mel@whereever.com"/>
-          <treecell label="Lets do lunch"/>
-        </treerow>  
-      </treeitem>      
-    </treechildren>
-  </tree>
-
-  <html:script>
-  <![CDATA[
-    res = "<b><u> Results for XUL Tree's Treecell,Treeitem,Treerow Node:</u></b><br><br>";
-    nodeFocus = "Not Focused";
-
-    setTimeout("executeTestCase();", 2000);
-  ]]>
-  </html:script>    
-</window>
\ No newline at end of file
diff --git a/embedding/qa/jstests/bridge.js b/embedding/qa/jstests/bridge.js
deleted file mode 100644
index 5222838d8b3..00000000000
--- a/embedding/qa/jstests/bridge.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/*******************************************************
-WriteResults()
-********************************************************/
-function WriteResults(buffer)
-{
-
-    var obj = getAppObj();
-    if (!obj)
-    {
-       alert("Cannot use this function, You are not runnig this test case in automation framework");
-       return ;
-    }
-    obj.WriteResults(buffer) ;
-}
-
-/*******************************************************
-isRunningStandalone()
-********************************************************/
-function isRunningStandalone()
-{
-   var obj = getAppObj();
-   if(obj)
-     return false ;
-   else
-     return true ;
-}
-
-
-/*******************************************************
-getAppObj()
-********************************************************/
-function getAppObj()
-{
-   var obj ;
-
-   const WIN_MEDIATOR_CTRID =
-   	  "@mozilla.org/appshell/window-mediator;1";
-   const nsIWindowMediator    = Components.interfaces.nsIWindowMediator;
-
-   netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var windowManager =
-           Components.classes[WIN_MEDIATOR_CTRID].getService(nsIWindowMediator);
-    var parentwindow = windowManager.getMostRecentWindow("Automation:framewrk");
-
-    if (parentwindow)
-    {
-	   obj =  parentwindow.document.getElementById("ContentBody");
-	   return obj.appobj
-    }
-
-   if (window.opener)
-   {
-		obj = window.opener.document.getElementById("ContentBody");
-		if (obj)
-		   return obj.appobj;
-   }
-   obj =  document.getElementById("ContentBody");
-
-   if (obj)
-	  return obj.appobj;
-
-    var win = window.top;
-    while(win)
-    {
-       obj = win.document.getElementById("ContentBody");
-       if (obj)
-		  return obj.appobj ;
-
-       if (win == win.top)
-         return null ;
-
-       win = win.parent ;
-    }
-   return null ;
-}
diff --git a/embedding/qa/jstests/content/nsISelection.html b/embedding/qa/jstests/content/nsISelection.html
deleted file mode 100644
index f8f235a57e8..00000000000
--- a/embedding/qa/jstests/content/nsISelection.html
+++ /dev/null
@@ -1,340 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ashish Bhatt <ashishbhatt@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-
-<title>nsISelection Tets case</title>
-
-<script type="text/javascript" src="../jslib/bridge.js"></script>
-
-
-</head>
-
-<body >
-<script type="text/javascript">
-
-var gObject ;
-var buffer ;
-var funcarray;
-
-var row0 = new Array("anchorNode", "GetAnchorNode();", "Returns the node representing one end of the selection.");
-var row1 = new Array("anchorOffset", "GetAnchorOffset();", "Returns the offset within the (text) node where the selection begins.");
-var row2 = new Array("focusNode", "GetFocusNode();", "Returns the node with keyboard focus.");
-var row3 = new Array("focusOffset", "GetFocusOffset();", "Returns the offset within the (text) node where focus starts.");
-var row4 = new Array("isCollapsed", "GetIsCollapsed();", "Indicates if the selection is collapsed or not.");
-var row5 = new Array("rangeCount", "GetRangeCount();", "Returns the number of ranges in the selection.");
-var row6 = new Array("getRangeAt()", "GetRangeAt();", "Returns the range at the specified index");
-var row7 = new Array("collapse()", "Collapse();", "Collapses the selection to a single point, at the specified offset");
-var row8 = new Array("extend()", "Extend();", "Extends the selection by moving the focus to the specified node and offset,preserving the anchor postion. The new selection end result will always be from the anchor to the new focus, regardless of direction");
-var row9 = new Array("collapseToStart()", "CollapseToStart();", "Collapses the whole selection to a single point at the start");
-var row10 = new Array("collapseToEnd()", "CollapseToEnd();", "Collapses the whole selection to a single point at the end");
-var row11 = new Array("containsNode()", "ContainsNode();", "Returns if the selection contains the node.");
-var row12 = new Array("selectAllChildren()", "SelectAllChildren();", "Adds all children of the specified node to the selection.");
-var row13 = new Array("addRange()", "AddRange();", "Adds a range to the current selection.");
-var row14 = new Array("removeRange()", "RemoveRange();", "Removes a range from the current selection.");
-var row15 = new Array("removeAllRanges()", "RemoveAllRanges();", "Removes all ranges from the current selection.");
-var row16 = new Array("deleteFromDocument()", "DeleteFromDocument();", "Deletes this selection from document the nodes belong to");
-var row17 = new Array("selectionLanguageChange()", "SelectionLanguageChange();", "Modifies the cursor Bidi level after a change in keyboard direction");
-var row18 = new Array("toString()", "ToString();", "Returns the whole selection into a plain text string");
-
-funcarray = new Array(row0, row1, row2, row3, row4, row5, row6, row7, row8, row9, row10, row11, row12, row13, row14, row15, row16, row17);
-
-
-WriteHTMLOnPage();
-
-function getSelectionObject(thewindow)
-{
-
-	 //if(gObject)
-	 //	return gObject;
-	 try
-	 {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		var ifaceReq = thewindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
-		if (!ifaceReq)
-		{
-			if (isRunningStandalone())
-				alert("Exception: " + e);
-			else
-				WriteResults("Unable to get the interface requester");
-		}
-
-		 gObject = ifaceReq.getInterface(Components.interfaces.nsIDOMWindow);
-		 return gObject.getSelection();
-	 }
-	 catch(e){
-		if (isRunningStandalone())
-			alert("Exception: " + e);
-		else
-			WriteResults(buffer + "Exception: " + e);
-	  }
-}
-
-function WritePassFail(aValue,e)
-{
-
-  if( aValue ==  "Pass")
-  {
-	  buffer += "<td>"+" " +"</td>" ;
-	  buffer += "<td>Pass</td>"
-  }
-  else
-  {
-	  buffer += "<td>" +"Exception: " + e + "</td>" ;
-	  buffer += "<td bgcolor='#FF0000'>Fail</td>"
-  }
-
-  buffer += "</tr>"
-
-}
-
-function ShowResults()
-{
-	var checkbox ;
-  	var arr ;
-
-	buffer = "<b>Results for <a href='http://lxr.mozilla.org/seamonkey/source/content/base/public/nsISelection.idl'>nsISelection :</a></b><br><br>"
-	buffer += "<table border cols=4 width='70%'>"
-	buffer += "<tr>"
-	buffer += "<td><b>Property/Method</b></td>"
-	buffer += "<td><b>Params</b></td>"
-	buffer += "<td><b>Output/Bug/Error</b></td>"
-	buffer += "<td><b>Result</b></td>"
-	buffer += "</tr>"
-
-   for(var i=0; i<funcarray.length; i++)
-   {
-	  arr = funcarray[i];
-      checkbox = document.getElementById("pass" + i);
-	  buffer += "<tr>"
-	  buffer += "<td>" + arr[0] + "</td>"
-	  buffer += "<td></td>"
-
-	  if (checkbox.checked)
-	  	WritePassFail("Pass","");
-      else
-      	WritePassFail("Fail","");
-   }
-
-	buffer += "</table>"
-	if (isRunningStandalone())
-	{
-	   document.clear()
-	   document.write(buffer);
-	}
-	else
-		WriteResults(buffer);
-
-
-}
-function WriteHTMLOnPage()
-{
-
-  var arr ;
-  var count=0;
-  document.clear();
-  document.writeln("<h2> Test cases for <a href='http://lxr.mozilla.org/seamonkey/source/content/base/public/nsISelection.idl'>nsISelection</a></h2>");
-  document.writeln("<table width='70%'><tr><td>");
-  document.writeln("<b>Note:</b> Some or all the methods and attributes will only work is some text is selected on the page.");
-  document.writeln("After testing all the methods click on showresults to see the results");
-  document.writeln("</td><td>");
-
-  if (isRunningStandalone())
-	  document.writeln('<button value="results" onclick="ShowResults();"> Show Results </button>');
-  else
-	  document.writeln('<button value="results" onclick="ShowResults();"> Go To Next </button>');
-
-  document.writeln("</td></tr><tr><td>");
-  document.writeln("<input type=text> ");
-  document.writeln("</td></tr></table>");
-  document.writeln("<br>");
-
-  document.writeln("<table border=1 width='70%'>");
-  for(var i=0; i<funcarray.length; i++)
-  {
-
-  	arr = funcarray[i];
-
-	if(count==0)
-		document.writeln("<tr>");
-
-	if(count==4)
-	{
-		document.writeln("</tr>");
-		document.writeln("<tr>");
-		count = 0;
-	}
-
-    document.writeln("<td  width='25%'>");
-	document.writeln(arr[2]);
-	document.writeln("<br>");
-	document.writeln("<b> <font color='#800000'>" + arr[0] + "</font></b>");
-	document.writeln("<br>");
-	document.writeln("<button value='Test' onclick=" + arr[1] + ";> Test "+ arr[0] + "</button>");
-	document.writeln("<form>");
-	document.writeln("<input id=" + "'"+ "pass"+i + "'"+" type=radio> Pass </input>");
-	document.writeln("<input id=" + "'"+ "fail"+i + "'"+" type=radio> Fail </input>");
-	document.writeln("</form>");
-    document.writeln("</td>");
-
-	count +=1;
-   }
-
-	document.writeln("</tr>");
-	document.writeln("</table>");
-
-   for(var i=0; i<funcarray.length; i++)
-   {
-	  checkbox = document.getElementById("fail" + i);
-	  checkbox.checked = true;
-
-   }
-
-}
-function GetAnchorNode()
-{
-   sel = getSelectionObject(window);
-   alert(sel.anchorNode);
-}
-function GetAnchorOffset()
-{
-   sel = getSelectionObject(window);
-   alert(sel.anchorOffset);
-}
-function GetFocusNode()
-{
-   sel = getSelectionObject(window);
-   alert(sel.focusNode);
-}
-function GetFocusOffset()
-{
-   sel = getSelectionObject(window);
-   alert(sel.focusOffset);
-}
-function GetIsCollapsed()
-{
-   sel = getSelectionObject(window);
-   alert(sel.isCollapsed);
-}
-function GetRangeCount()
-{
-   sel = getSelectionObject(window);
-   alert(sel.rangeCount);
-}
-function GetRangeAt()
-{
-   sel = getSelectionObject(window);
-   alert(sel.getRangeAt(0));
-
-}
-function Collapse()
-{
-   sel = getSelectionObject(window);
-   sel.collapse(sel.anchorNode,80);
-
-}
-function Extend()
-{
-   sel = getSelectionObject(window);
-   sel.extend(sel.anchorNode,100);
-
-}
-function CollapseToStart()
-{
-   sel = getSelectionObject(window);
-   sel.collapseToStart();
-}
-function CollapseToEnd()
-{
-   sel = getSelectionObject(window);
-   sel.collapseToEnd();
-}
-function ContainsNode()
-{
-   sel = getSelectionObject(window);
-   alert(sel.containsNode(sel.focusNode, true));
-}
-function SelectAllChildren()
-{
-   sel = getSelectionObject(window);
-   sel.selectAllChildren(sel.focusNode);
-}
-function AddRange()
-{
-   sel = getSelectionObject(window);
-   range = sel.getRangeAt(0);
-   sel.addRange(range);
-
-}
-function RemoveRange()
-{
-   sel = getSelectionObject(window);
-   range = sel.getRangeAt(0);
-   sel.removeRange(range);
-
-}
-function RemoveAllRanges()
-{
-   sel = getSelectionObject(window);
-   sel.removeAllRanges();
-}
-function DeleteFromDocument()
-{
-   sel = getSelectionObject(window);
-   okcancel= confirm("This will delete the selected content from the page, Proceed ?")
-   if(okcancel == true)
-     sel.deleteFromDocument();
-
-}
-function SelectionLanguageChange()
-{
-   sel = getSelectionObject(window);
-   sel.selectionLanguageChange(false);
-}
-function ToString()
-{
-   sel = getSelectionObject(window);
-   alert(sel.toString());
-}
-
-</script>
-</body>
-
-</html>
-
-
diff --git a/embedding/qa/jstests/dom/nsIDOMWindow.html b/embedding/qa/jstests/dom/nsIDOMWindow.html
deleted file mode 100644
index 15a4b2e9371..00000000000
--- a/embedding/qa/jstests/dom/nsIDOMWindow.html
+++ /dev/null
@@ -1,291 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ashish Bhatt <ashishbhatt@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<head>
-
-<title>nsIDOMWindow Tets case</title>
-
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/bridge.js"></script>
-<script type="text/javascript">
-
-var gObject ;
-var buffer ;
-var newwindow ;
-newwindow = window.open("http://www.google.com","_blank");
-self.focus();
-
-function getDomWindowObject(thewindow)
-{
-
-	 //if(gObject)
-	//	return gObject;
-	 try
-	 {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		var ifaceReq = thewindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
-
-		if (!ifaceReq)
-		{
-			if (isRunningStandalone())
-				alert("Exception: " + e);
-			else
-				WriteResults("Unable to get the interface requester");
-		}
-
-		 gObject = ifaceReq.getInterface(Components.interfaces.nsIDOMWindow);
-		 return gObject;
-	 }
-	 catch(e){
-		if (isRunningStandalone())
-			alert("Exception: " + e);
-		else
-			WriteResults(buffer + "Exception: " + e);
-	  }
-}
-
-function WritePassFail(aValue,e)
-{
-
-  if( aValue ==  "Pass")
-  {
-	  buffer += "<td>"+" " +"</td>" ;
-	  buffer += "<td>Pass</td>"
-  }
-  else
-  {
-	  buffer += "<td>" +"Exception: " + e + "</td>" ;
-	  buffer += "<td bgcolor='#FF0000'>Fail</td>"
-  }
-
-  buffer += "</tr>"
-
-}
-
-function RunAllTests()
-{
-	// "<td bgcolor='#FF0000'>
-	buffer = "<b>Results for <a href='http://lxr.mozilla.org/seamonkey/source/dom/public/idl/base/nsIDOMWindow.idl'>nsIDOMWindow:</a></b><br><br>"
-	buffer += "<table border cols=4 width='70%'>"
-	buffer += "<tr>"
-	buffer += "<td><b>Property/Method</b></td>"
-	buffer += "<td><b>Params</b></td>"
-	buffer += "<td><b>Bug/Error</b></td>"
-	buffer += "<td><b>Result</b></td>"
-	buffer += "</tr>"
-
-	GetDocument();
-
-	buffer += "</table>"
-	if (isRunningStandalone())
-	{
-	   document.clear();
-	   document.write(buffer);
-	}
-	else
-		WriteResults(buffer);
-}
-
-function GetDocument()
-{
-	var dom = getDomWindowObject(window);
-
-	buffer += "<tr>"
-	buffer += "<td>document(get)</td>"
-	buffer += "<td>none</td>"
-
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		rv =  dom.document;
-		if (rv)
-			WritePassFail("Pass",1);
-
-
-		buffer += "<tr>"
-		buffer += "<td>parent(get)</td>"
-		buffer += "<td>none</td>"
-
-		rv =  dom.parent;
-		if (rv)
-			WritePassFail("Pass",1);
-
-		buffer += "<tr>"
-		buffer += "<td>top(get)</td>"
-		buffer += "<td>none</td>"
-
-		rv =  dom.top;
-		if (rv)
-			WritePassFail("Pass",1);
-		else
-			WritePassFail("Fail",rv);
-
-		buffer += "<tr>"
-		buffer += "<td>scrollbars(get)</td>"
-		buffer += "<td>none</td>"
-
-		rv =  dom.scrollbars;
-		if (rv)
-			WritePassFail("Pass",1);
-		else
-			WritePassFail("Fail",rv);
-
-		buffer += "<tr>"
-		buffer += "<td>frames(get)</td>"
-		buffer += "<td>none</td>"
-
-		rv =  dom.frames;
-		if (rv)
-			WritePassFail("Pass",1);
-		else
-			WritePassFail("Fail",rv);
-
-		buffer += "<tr>"
-		buffer += "<td>name(set)</td>"
-		buffer += "<td>DOMString name</td>"
-
-		dom.name= "myname" ;
- 		WritePassFail("Pass",1);
-
-		buffer += "<tr>"
-		buffer += "<td>name(get)</td>"
-		buffer += "<td>none</td>"
-
-		rv =  dom.name;
-		if (rv)
-			WritePassFail("Pass",1);
-		else
-			WritePassFail("Fail",rv);
-
-		buffer += "<tr>"
-		buffer += "<td>textZoom(get)</td>"
-		buffer += "<td>none</td>"
-
-		//rv =  dom.textzoom;
-		WritePassFail("Pass","noscript Attribute");
-
-		buffer += "<tr>"
-		buffer += "<td>textZoom(set)</td>"
-		buffer += "<td>float textZoom</td>"
-
-		//dom.textzoom= 12 ;
-		WritePassFail("Pass","noscript Attribute");
-
-		buffer += "<tr>"
-		buffer += "<td>scrollX(get)</td>"
-		buffer += "<td>none</td>"
-
-		rv = window.scrollX ;
-		WritePassFail("Pass",1);
-
-		buffer += "<tr>"
-		buffer += "<td>scrollY(get)</td>"
-		buffer += "<td>none</td>"
-
-		rv = window.scrollY;
-		WritePassFail("Pass",1);
-
-		buffer += "<tr>"
-		buffer += "<td>scrollTo()</td>"
-		buffer += "<td>long xScroll,long yScroll</td>"
-
-		rv = window.scrollTo(5,5);
-		WritePassFail("Pass",1);
-
-
-		buffer += "<tr>"
-		buffer += "<td>getSelection()</td>"
-		buffer += "<td>none</td>"
-
-		rv = dom.getSelection();
-		if (rv)
-			WritePassFail("Pass",1);
-		else
-			WritePassFail("Fail",1);
-
-		buffer += "<tr>"
-		buffer += "<td>scrollByLines()</td>"
-		buffer += "<td>long numLines</td>"
-
-		dom.scrollByLines(5);
-		WritePassFail("Pass",1);
-
-
-		buffer += "<tr>"
-		buffer += "<td>scrollByPages()</td>"
-		buffer += "<td>long numPages</td>"
-
-		dom.scrollByPages(1);
-		WritePassFail("Pass",1);
-
-		buffer += "<tr>"
-		buffer += "<td>sizeToContent()</td>"
-		buffer += "<td>none</td>"
-
-		//alert("sdfadf");
-
-
-	    dom = getDomWindowObject(newwindow);
-
-
-		dom.sizeToContent();
-		WritePassFail("Pass",1);
-
-		newwindow.close();
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-
-</script>
-
-<base target="main">
-
-</head>
-
-<body onload="setTimeout('RunAllTests();', 1000);">
-</body>
-
-</html>
-
-
diff --git a/embedding/qa/jstests/networking/nsIFileProtocolHandler.html b/embedding/qa/jstests/networking/nsIFileProtocolHandler.html
deleted file mode 100644
index a520098201c..00000000000
--- a/embedding/qa/jstests/networking/nsIFileProtocolHandler.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ashish Bhatt <ashishbhatt@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<html>
-
-<title>nsIFileProtocolHandler Tets case</title>
-
-<head>
-
-<script type="text/javascript" src="http://mozilla.org/quality/embed/jstests/bridge.js"></script>
-<script type="text/javascript" src="nsIFileProtocolHandler.js"></script>
-
-<script type="text/javascript">
-
-const LOCAL_FILE_CTRID =
-	"@mozilla.org/file/local;1" ;
-const nsILocalFile =
-	Components.interfaces.nsILocalFile
-
-var protocolhandler ;
-
-var buffer ;
-
-function WritePassFail()
-{
-
-  if (protocolhandler.success)
-  {
-	  buffer += "<td>"+ protocolhandler.returnvalue +"</td>" ;
-	  buffer += "<td>Pass</td>"
-  }
-  else
-  {
-	  buffer += "<td>" +"Exception: " + protocolhandler.exception + "</td>" ;
-	  buffer += "<td bgcolor='#FF0000'>Fail</td>"
-  }
-
-  buffer += "</tr>"
-  protocolhandler.exception= null;
-
-}
-
-
-function WriteTableHeader(name,params)
-{
-	buffer += "<tr>" ;
-	buffer += "<td>" + name + "</td>" ;
-	buffer += "<td>" + params + "</td>" ;
-}
-
-
-function WriteHeader()
-{
-
-	buffer = "<b>Results for <a href='http://lxr.mozilla.org/seamonkey/source/netwerk/protocol/file/public/nsIFileProtocolHandler.idl'>nsIFileProtocolHandler :</a></b><br><br>"
-	buffer += "<table border cols=4 width='70%'>"
-	buffer += "<tr>"
-	buffer += "<td><b>Property/Method</b></td>"
-	buffer += "<td><b>Params</b></td>"
-	buffer += "<td><b>Output/Bug/Error</b></td>"
-	buffer += "<td><b>Result</b></td>"
-	buffer += "</tr>"
-
-}
-
-
-function WriteFooter()
-{
-	buffer += "</table>"
-}
-
-
-function Writebuffer(buffer)
-{
-
-	if (isRunningStandalone())
-	{
-	   document.clear();
-	   document.write(buffer);
-	}
-	else
-		WriteResults(buffer);
-
-}
-
-
-function RunAllTests()
-{
-
-	protocolhandler =  new FileProtocolHandler() ;
-	if (protocolhandler.exception)
-	{
-	  Writebuffer(protocolhandler.exception);
-	  return ;
-	}
-
-	WriteHeader();
-
-    newFileURI();
-    getFileFromURLSpec();
-    getURLSpecFromFile();
-
-	WriteFooter();
-
-
-	Writebuffer(buffer) ;
-}
-
-function newFileURI()
-{
-	  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	   var file = Components.classes[LOCAL_FILE_CTRID].
-	                createInstance(nsILocalFile)
-	    file.initWithPath("d:\\try.txt");
-
-
-	protocolhandler.newFileURI(file);
-	WriteTableHeader("newFileURI","nsIFile");
-	WritePassFail();
-}
-
-function getFileFromURLSpec()
-{
-	var url =  "file:///c:/";
-	protocolhandler.getFileFromURLSpec(url);
-	WriteTableHeader("getFileFromURLSpec","URL");
-	WritePassFail();
-}
-
-function getURLSpecFromFile()
-{
-   netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-   var file = Components.classes[LOCAL_FILE_CTRID].
-                createInstance(nsILocalFile)
-    file.initWithPath("d:\\try.txt");
-
-    protocolhandler.getURLSpecFromFile(file);
-	WriteTableHeader("getURLSpecFromFile","nsIFile");
-	WritePassFail();
-
-}
-
-</script>
-
-</head>
-
-<body>
-
-<script type="text/javascript">
-   RunAllTests();
-</script>
-</body>
-
-</html>
diff --git a/embedding/qa/jstests/networking/nsIFileProtocolHandler.js b/embedding/qa/jstests/networking/nsIFileProtocolHandler.js
deleted file mode 100644
index 16c8c9b5066..00000000000
--- a/embedding/qa/jstests/networking/nsIFileProtocolHandler.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-const IO_SERVICE_CTRID = 
-	"@mozilla.org/network/io-service;1" ;
-const nsIFileProtocolHandler = 
- 	Components.interfaces.nsIFileProtocolHandler ;
-const nsIIOService = 
-	Components.interfaces.nsIIOService ;
-
-function FileProtocolHandler()
-{
-    try {
-	    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	    ioservice = Components.classes[IO_SERVICE_CTRID].getService(nsIIOService);
-
-	    
-	    if(!ioservice)
-	       this.exception = "Unable to get nsIIOService" ;
-	          
-	    this.protocolhandler = ioservice.getProtocolHandler("file").QueryInterface(nsIFileProtocolHandler) ;
-
-	    if (!this.protocolhandler)
-	       this.exception = "Unable to get nsIFileProtocolHandler" ;
-	      
-	   return this ;
-     }
-     catch(e){
-	this.exception = e ;
-     }
-     
-	 
-   
-}
-
-FileProtocolHandler.prototype.returnvalue = null;
-FileProtocolHandler.prototype.success = null;
-FileProtocolHandler.prototype.exception = null;
-FileProtocolHandler.prototype.protocolhandler = null ;
-
-
-FileProtocolHandler.prototype.newFileURI = function (aFile)
-{
-  /**
-  * This method constructs a new file URI 
-  *
-  * @param aFile nsIFile
-  * @return reference to a new nsIURI object
-  *
-  *  nsIURI newFileURI(in nsIFile aFile);
-  */
-  
-  try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.protocolhandler.newFileURI(aFile)
-	  if (this.returnvalue)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-
-FileProtocolHandler.prototype.getURLSpecFromFile = function (aFile)
-{
- /**
-  * Converts the nsIFile to the corresponding URL string.  NOTE: under
-  * some platforms this is a lossy conversion (e.g., Mac Carbon build).
-  * If the nsIFile is a local file, then the result will be a file://
-  * URL string.
-  *
-  * The resulting string may contain URL-escaped characters.
-  *
-  * AUTF8String getURLSpecFromFile(in nsIFile file);
-  */
-  try {
-	 
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	
-	 this.returnvalue = this.protocolhandler.getURLSpecFromFile(aFile)
-	  if (this.returnvalue)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
- 
- }
-
-FileProtocolHandler.prototype.getFileFromURLSpec = function (aUrl)
-{
- /**
-  * Converts the URL string into the corresponding nsIFile if possible.
-  * A local file will be created if the URL string begins with file://.
-  *
-  * nsIFile getFileFromURLSpec(in AUTF8String url);
-  */
-  
-  try {
-	  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	  this.returnvalue = this.protocolhandler.getFileFromURLSpec(aUrl)
-	  if (this.returnvalue)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
- 
-}
-
diff --git a/embedding/qa/jstests/networking/nsIIOService.html b/embedding/qa/jstests/networking/nsIIOService.html
deleted file mode 100644
index 41fb718c3ca..00000000000
--- a/embedding/qa/jstests/networking/nsIIOService.html
+++ /dev/null
@@ -1,280 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ashish Bhatt <ashishbhatt@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<html>
-
-<title>nsIIOService Tets case</title>
-
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/bridge.js"></script>
-<script type="text/javascript" src="nsIIOService.js"></script>
-<script type="text/javascript">
-
-var buffer ;
-var scheme = new Array("http","https", "ftp","file","javascript","data","about","gopher","chrome", "jar");
-
-var ioservice = new IOService();
-
-
-function WritePassFail()
-{
-
-  if (ioservice.success)
-  {
-	  buffer += "<td>"+ ioservice.returnvalue +"</td>" ;
-	  buffer += "<td>Pass</td>"
-  }
-  else
-  {
-	  buffer += "<td>" +"Exception: " + ioservice.exception + "</td>" ;
-	  buffer += "<td bgcolor='#FF0000'>Fail</td>"
-  }
-
-  buffer += "</tr>"
-  ioservice.exception= null;
-
-}
-
-
-function WriteTableHeader(name,params)
-{
-	buffer += "<tr>" ;
-	buffer += "<td>" + name + "</td>" ;
-	buffer += "<td>" + params + "</td>" ;
-}
-
-
-function WriteHeader()
-{
-
-	buffer = "<b>Results for <a href='http://lxr.mozilla.org/seamonkey/source/netwerk/base/public/nsIIOService.idl'>nsIIOService :</a></b><br><br>"
-	buffer += "<table border cols=4 width='70%'>"
-	buffer += "<tr>"
-	buffer += "<td><b>Property/Method</b></td>"
-	buffer += "<td><b>Params</b></td>"
-	buffer += "<td><b>Output/Bug/Error</b></td>"
-	buffer += "<td><b>Result</b></td>"
-	buffer += "</tr>"
-
-}
-
-function WriteFooter()
-{
-	buffer += "</table>"
-}
-
-function RunAllTests()
-{
-	WriteHeader();
-
-	getProtocolHandler();
-
-	getProtocolFlags();
-	newURI();
-	newFileURI();
-	newChannelFromURI();
-	newChannel();
-	Getoffline();
-	Setoffline();
-	allowPort();
-	extractScheme();
-
-
-
-	WriteFooter();
-
-
-	if (isRunningStandalone())
-	{
-	   document.clear();
-	   document.write(buffer);
-	}
-	else
-		WriteResults(buffer);
-
-
-}
-
-function getProtocolHandler()
-{
-	for (i=0;i<scheme.length;i++)
-	{
-		ioservice.getProtocolHandler(scheme[i]);
-		if (i==0)
-			WriteTableHeader("getProtocolHandler",scheme[i]);
-		else
-	 		WriteTableHeader("",scheme[i]);
-		WritePassFail();
-	}
-}
-
-function getProtocolFlags()
-{
-
-	for (i=0;i<scheme.length;i++)
-	{
-		ioservice.getProtocolFlags(scheme[i]);
-		if (i==0)
-			WriteTableHeader("getProtocolFlags",scheme[i]);
-		else
-	 		WriteTableHeader("",scheme[i]);
-
-		WritePassFail();
-	}
-}
-
-function newURI()
-{
-
-	var url = "http://slip.mcom.com" ;
-	ioservice.newURI(url,null,null);
-	WriteTableHeader("newURI","Spec,OriginCharset,BaseURI");
-	WritePassFail();
-}
-
-function newFileURI()
-{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var phandler = ioservice.service.getProtocolHandler("file").QueryInterface(Components.interfaces.nsIFileProtocolHandler);
-    var file =  phandler.getFileFromURLSpec("file:///c:/");
-
-    ioservice.newFileURI(file);
-
-	WriteTableHeader("newFileURI","nsIFile");
-	WritePassFail();
-}
-
-
-function newChannelFromURI()
-{
-
-	var url = "http://slip.mcom.com" ;
-	ioservice.newURI(url,null,null);
-
-    ioservice.newChannelFromURI(ioservice.returnvalue);
-
-	WriteTableHeader("newChannelFromURI","URI");
-	WritePassFail();
-}
-
-
-function newChannel()
-{
-
-	var url = "http://slip.mcom.com" ;
-	ioservice.newChannel(url,null,null);
-
-	WriteTableHeader("newChannel","Spec,OriginCharset,BaseURI");
-	WritePassFail();
-
-}
-
-function Getoffline()
-{
-	ioservice.Getoffline();
-
-	WriteTableHeader("offline(get)","");
-	WritePassFail();
-}
-
-
-function Setoffline()
-{
-	ioservice.Setoffline(true);
-
-	WriteTableHeader("offline(set)","true");
-	WritePassFail();
-}
-
-function allowPort()
-{
-
-	var port ;
-	var scheme ;
-
-	ioservice.allowPort(90, "http");
-
-	WriteTableHeader("allowPort","Port, Scheme");
-	WritePassFail();
-}
-
-function extractScheme()
-{
-    var url = new Array("http://mozilla.org",
-						"https://ec.aoltw.net",
-						"ftp://ftp.mozilla.org",
-						"file://c:/",
-						"javascript:alert('e');",
-						"data:",
-						"about:",
-						"ghoper://",
-						"chrome://communicator/skin/communicator.css",
-						"jar://resource");
-
-	for (i=0;i<url.length;i++)
-	{
-
-	   ioservice.extractScheme(url[i]);
-
-		if (i==0)
-			WriteTableHeader("extractScheme",url[i]);
-		else
-	 		WriteTableHeader("",url[i]);
-
-	   WritePassFail();
-	}
-}
-
-
-</script>
-
-</head>
-
-<body>
-<script type="text/javascript">
-   RunAllTests();
-</script>
-</body>
-
-</html>
-
-
-
-
-
diff --git a/embedding/qa/jstests/networking/nsIIOService.js b/embedding/qa/jstests/networking/nsIIOService.js
deleted file mode 100644
index cdff90a2b64..00000000000
--- a/embedding/qa/jstests/networking/nsIIOService.js
+++ /dev/null
@@ -1,385 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is mozilla.org code.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-   Ashish Bhatt <ashishbhatt@netscape.com> Original Author
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** */
-
-
-const nsIIOService =
-     Components.interfaces.nsIIOService
-const IO_SERVICE_CTRID =
-      "@mozilla.org/network/io-service;1" ;
-
-
-function IOService()
-{
-   
-   try{
-   	netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-   	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-   
-       
-       this.service  = Components.classes[IO_SERVICE_CTRID].getService(nsIIOService);
-       if (!this.service)
-       	   return null ;
-       return this ;
-   }
-   catch(e)
-   {
-     this.exception = e ;
-     return null;
-   }
-}
-
-
-IOService.prototype.service =  null ;
-IOService.prototype.success =  null ;
-IOService.prototype.exception =  null ;
-IOService.prototype.returnvalue =  null ;
-
-
-IOService.prototype.getProtocolHandler = function(aScheme)
-{
-
-	 /**
-	  * Returns a protocol handler for a given URI scheme.
-	  *
-	  * @param aScheme the URI scheme
-	  * @return reference to corresponding nsIProtocolHandler
-	  *
-	  * nsIProtocolHandler getProtocolHandler(in string aScheme)
-	  */
-
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.service.getProtocolHandler(aScheme) ;
-		
-		if (this.returnvalue)
-		  this.success = true
-		else
-		  this.success = false;
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-}
-
-IOService.prototype.getProtocolFlags= function(aScheme)
-{
-	 /**
-	  * Returns the protocol flags for a given scheme.
-	  *
-	  * @param aScheme the URI scheme
-	  * @return value of corresponding nsIProtocolHandler::protocolFlags
-	  *
-	  * unsigned long getProtocolFlags(in string aScheme);
-	  */
-
-
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.service.getProtocolFlags(aScheme) ;
-		if (this.returnvalue>=0)
-		  this.success = true
-		else
-		  this.success = false;
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-}
-
-IOService.prototype.newURI =  function(aSpec,aOriginCharset,aBaseURI)
-{
-	 /**
-	  * This method constructs a new URI by determining the scheme of the
-	  * URI spec, and then delegating the construction of the URI to the
-	  * protocol handler for that scheme. QueryInterface can be used on
-	  * the resulting URI object to obtain a more specific type of URI.
-	  *
-	  * @see nsIProtocolHandler::newURI
-	  *
-	  * nsIURI newURI(in AUTF8String aSpec,
-	  *			   in string aOriginCharset,
-	  *			   in nsIURI aBaseURI);
-	  */
-
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.service.newURI(aSpec,aOriginCharset,aBaseURI) ;
-		
-		if (this.returnvalue)
-		  this.success = true
-		else
-		  this.success = false;
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-}
-
-
-IOService.prototype.newFileURI= function(file)
-{
-	 /**
-	  * This method constructs a new URI from a nsIFile.
-	  *
-	  * @param aFile specifies the file path
-	  * @return reference to a new nsIURI object
-	  *
-	  * nsIURI newFileURI(in nsIFile aFile);
-	  */
-
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.service.newFileURI(file) ;
-		
-		if (this.returnvalue)
-		  this.success = true
-		else
-		  this.success = false;
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-
-}
-
-
-IOService.prototype.newChannelFromURI = function(aURI)
-{
-	 /**
-	  * Creates a channel for a given URI.
-	  *
-	  * @param aURI nsIURI from which to make a channel
-	  * @return reference to the new nsIChannel object
-	  *
-	  * nsIChannel newChannelFromURI(in nsIURI aURI);
-	  */
-
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.service.newChannelFromURI(aURI) ;
-		
-		if (this.returnvalue)
-		  this.success = true
-		else
-		  this.success = false;
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-
-}
-
-
-IOService.prototype.newChannel = function(aSpec,aOriginCharset,aBaseURI)
-{
-	 /**
-	  * Equivalent to newChannelFromURI(newURI(...))
-	  *
-	  * nsIChannel newChannel(in AUTF8String aSpec,
-	  *					   in string aOriginCharset,
-	  *					   in nsIURI aBaseURI);
-	  */
-
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.service.newChannel(aSpec,aOriginCharset,aBaseURI) ;
-		
-		if (this.returnvalue)
-		  this.success = true
-		else
-		  this.success = false;
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-
-}
-
-IOService.prototype.Getoffline = function()
-{
-
-	 /**
-	  * Returns true if networking is in "offline" mode. When in offline mode,
-	  * attempts to access the network will fail (although this does not
-	  * necessarily correlate with whether there is actually a network
-	  * available -- that's hard to detect without causing the dialer to
-	  * come up).
-	  *
-	  *	attribute boolean offline;
-	  */
-
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.service.offline ;
-		this.success = true;
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-
-}
-
-IOService.prototype. Setoffline = function(aOffline)
-{
-	 /**
-	  * Returns true if networking is in "offline" mode. When in offline mode,
-	  * attempts to access the network will fail (although this does not
-	  * necessarily correlate with whether there is actually a network
-	  * available -- that's hard to detect without causing the dialer to
-	  * come up).
-	  *
-	  *	attribute boolean offline;
-	  */
-	  
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		
-		this.service.offline  = aOffline ;
-		this.returnvalue  = this.service.offline 
-		this.success = true;
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-
-}
-
-IOService.prototype.allowPort= function(aPort, aScheme)
-{
-	 /**
-	  * Checks if a port number is banned. This involves consulting a list of
-	  * unsafe ports, corresponding to network services that may be easily
-	  * exploitable. If the given port is considered unsafe, then the protocol
-	  * handler (corresponding to aScheme) will be asked whether it wishes to
-	  * override the IO service's decision to block the port. This gives the
-	  * protocol handler ultimate control over its own security policy while
-	  * ensuring reasonable, default protection.
-	  *
-	  * @see nsIProtocolHandler::allowPort
-	  *
-	  * boolean allowPort(in long aPort, in string aScheme);
-	  */
-
-
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.service.allowPort(aPort, aScheme) ;
-		
-		if (this.returnvalue)
-		  this.success = true
-		else
-		  this.success = false;
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-
-}
-
-IOService.prototype.extractScheme = function(urlString)
-{
-	 /**
-	  * Utility to extract the scheme from a URL string, consistently and
-	  * according to spec (see RFC 2396).
-	  *
-	  * NOTE: Most URL parsing is done via nsIURI, and in fact the scheme
-	  * can also be extracted from a URL string via nsIURI.  This method
-	  * is provided purely as an optimization.
-	  *
-	  * @param aSpec the URL string to parse
-	  * @return URL scheme
-	  *
-	  * @throws NS_ERROR_MALFORMED_URI if URL string is not of the right form.
-	  *
-	  * ACString extractScheme(in AUTF8String urlString);
-	  */
-
-	  try
-	  {
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.service.extractScheme(urlString) ;
-		
-		if (this.returnvalue)
-		  this.success = true
-		else
-		  this.success = false;
-	 }
-	 catch(e)
-	 {   
-		this.success = false;
-		this.exception = e ;
-	 }
-
-}
diff --git a/embedding/qa/jstests/networking/nsIProtocolHandler.html b/embedding/qa/jstests/networking/nsIProtocolHandler.html
deleted file mode 100644
index 2ddd0112a0d..00000000000
--- a/embedding/qa/jstests/networking/nsIProtocolHandler.html
+++ /dev/null
@@ -1,229 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -          Ashish Bhatt <ashishbhatt@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<title>nsIProtocolHandler Tets case</title>
-
-<head>
-
-<script type="text/javascript" src="http://mozilla.org/quality/embed/jstests/bridge.js"></script>
-<script type="text/javascript" src="nsIProtocolHandler.js"></script>
-
-<script type="text/javascript">
-
-var scheme = new Array("http","https", "ftp","file","javascript","data","about","gopher","chrome", "jar");
-
-var url = new Array("http://mozilla.org",
-						"https://ec.aoltw.net",
-						"ftp://ftp.mozilla.org",
-						"file://c:/",
-						"javascript:alert('e');",
-						"data:text/html,<html><body ><p>Testing data Protocol</p></body></html>",
-						"about:",
-						"ghoper://",
-						"chrome://communicator/skin/communicator.css",
-						"jar:resource:/chrome/comm.jar!/content/necko/");
-
-var protocolhandler ;
-var buffer ;
-var i;
-
-function WritePassFail()
-{
-
-  if (protocolhandler.success)
-  {
-	  buffer += "<td>"+ protocolhandler.returnvalue +"</td>" ;
-	  buffer += "<td>Pass</td>"
-  }
-  else
-  {
-	  buffer += "<td>" +"Exception: " + protocolhandler.exception + "</td>" ;
-	  buffer += "<td bgcolor='#FF0000'>Fail</td>"
-  }
-
-  buffer += "</tr>"
-  protocolhandler.exception= null;
-
-}
-
-
-function WriteTableRow(name,params)
-{
-	buffer += "<tr>" ;
-	buffer += "<td>" + name + "</td>" ;
-	buffer += "<td>" + params + "</td>" ;
-}
-
-
-function WriteHeader()
-{
-
-	buffer = "<b>Results for <a href='http://lxr.mozilla.org/seamonkey/source/netwerk/base/public/nsIProtocolHandler.idl'>nsIProtocolHandler :</a></b><br><br>"
-	buffer += "<table border cols=4 width='70%'>"
-	buffer += "<tr>"
-	buffer += "<td><b>Property/Method</b></td>"
-	buffer += "<td><b>Params</b></td>"
-	buffer += "<td><b>Output/Bug/Error</b></td>"
-	buffer += "<td><b>Result</b></td>"
-	buffer += "</tr>"
-
-}
-
-
-function WriteFooter()
-{
-	buffer += "</table>"
-}
-
-
-function Writebuffer(buffer)
-{
-
-	if (isRunningStandalone())
-	{
-	   document.clear();
-	   document.write(buffer);
-	}
-	else
-		WriteResults(buffer);
-
-}
-
-
-function RunAllTests()
-{
-
-	WriteHeader();
-
-	for (i=0;i<scheme.length;i++)
-	{
-
-		protocolhandler =  new FileProtocolHandler(scheme[i]) ;
-		if (protocolhandler.exception)
-		{
-		  Writebuffer(protocolhandler.exception);
-		  return ;
-		}
-
-   	    WriteTableRow("<b>Test for <b>" + scheme[i]+  "</b> Protocol Handler</b>","");
-
-		//alert(scheme[i]);
-
-		getscheme();
-		defaultPort();
-		protocolFlags();
-		newURI();
-		newChannel();
-		allowPort();
-
-	}
-
-	WriteFooter();
-
-	Writebuffer(buffer) ;
-}
-
-
-function getscheme()
-{
-	protocolhandler.scheme();
-
-	WriteTableRow("scheme(get)","none");
-	WritePassFail();
-}
-
-
-function defaultPort()
-{
-	protocolhandler.defaultPort();
-
-	WriteTableRow("defaultport(get)",protocolhandler.returnvalue);
-	WritePassFail();
-}
-
-function protocolFlags()
-{
-	protocolhandler.protocolFlags();
-
-	WriteTableRow("protocolFlags(get)",protocolhandler.returnvalue);
-	WritePassFail();
-}
-
-function newURI()
-{
-
-	protocolhandler.newURI(url[i],null,null);
-	WriteTableRow("newURI",url[i]);
-	WritePassFail();
-}
-
-function newChannel()
-{
-
-	protocolhandler.newURI(url[i],null,null);
-	//alert(url[i] + " " + protocolhandler.returnvalue);
-    protocolhandler.newChannel(protocolhandler.returnvalue);
-
-	WriteTableRow("newChannel","nsIURI");
-	WritePassFail();
-}
-
-
-function allowPort()
-{
-	var port = 90;
-
-	protocolhandler.allowPort(port, scheme[i]);
-
-	WriteTableRow("allowPort","Port, Scheme");
-	WritePassFail();
-}
-
-
-</script>
-
-</head>
-
-<body>
-
-<script type="text/javascript">
-   RunAllTests();
-</script>
-</body>
-
-</html>
diff --git a/embedding/qa/jstests/networking/nsIProtocolHandler.js b/embedding/qa/jstests/networking/nsIProtocolHandler.js
deleted file mode 100644
index 964d03786cb..00000000000
--- a/embedding/qa/jstests/networking/nsIProtocolHandler.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-const IO_SERVICE_CTRID = 
-	"@mozilla.org/network/io-service;1" ;
-const nsIIOService = 
-	Components.interfaces.nsIIOService ;
-
-function FileProtocolHandler(aScheme)
-{
-    try {
-	    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	    
-
-	    ioservice = Components.classes[IO_SERVICE_CTRID].getService(nsIIOService);
-
-	    
-	    if(!ioservice)
-	       this.exception = "Unable to get nsIIOService" ;
-	          
-	    this.protocolhandler = ioservice.getProtocolHandler(aScheme) ;
-
-	    if (!this.protocolhandler)
-	       this.exception = "Unable to get nsIProtocolHandler" ;
-	      
-	   return this ;
-     }
-     catch(e){
-	this.exception = e ;
-     }
-     
-	 
-   
-}
-
-FileProtocolHandler.prototype.returnvalue = null;
-FileProtocolHandler.prototype.success = null;
-FileProtocolHandler.prototype.exception = null;
-FileProtocolHandler.prototype.protocolhandler = null ;
-
-
-
-FileProtocolHandler.prototype.scheme = function ()
-{
-
-   /**
-   * The scheme of this protocol (e.g., "file").
-   */
-  
-  try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.protocolhandler.scheme ;
-	 
-	  if (this.returnvalue)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-FileProtocolHandler.prototype.defaultPort = function ()
-{
-
-   /** 
-    * The default port is the port that this protocol normally uses.
-    * If a port does not make sense for the protocol (e.g., "about:")
-    * then -1 will be returned.
-   */
-   
-   try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.protocolhandler.defaultPort ;
-	 
-	  if (this.returnvalue)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-FileProtocolHandler.prototype.protocolFlags = function ()
-{
-
-   /**
-    * Returns the protocol specific flags (see flag definitions below).
-    */
-   
-   try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.protocolhandler.protocolFlags ;
-	 
-	  if (this.returnvalue>=0)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-
-FileProtocolHandler.prototype.newURI =  function(aSpec,aOriginCharset,aBaseURI)
-{
-
-  /**
-   * Makes a URI object that is suitable for loading by this protocol,
-   * where the URI string is given as an UTF-8 string.  The caller may
-   * provide the charset from which the URI string originated, so that
-   * the URI string can be translated back to that charset (if necessary)
-   * before communicating with, for example, the origin server of the URI
-   * string.  (Many servers do not support UTF-8 IRIs at the present time,
-   * so we must be careful about tracking the native charset of the origin
-   * server.)
-   *
-   * @param aSpec          - the URI string in UTF-8 encoding. depending
-   *                         on the protocol implementation, unicode character
-   *                         sequences may or may not be %xx escaped.
-   * @param aOriginCharset - the charset of the document from which this URI
-   *                         string originated.  this corresponds to the
-   *                         charset that should be used when communicating
-   *                         this URI to an origin server, for example.  if
-   *                         null, then UTF-8 encoding is assumed (i.e.,
-   *                         no charset transformation from aSpec).
-   * @param aBaseURI       - if null, aSpec must specify an absolute URI.
-   *                         otherwise, aSpec may be resolved relative
-   *                         to aBaseURI, depending on the protocol. 
-   *                         If the protocol has no concept of relative 
-   *                         URI aBaseURI will simply be ignored.
-   */
-   
-   
-  try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.protocolhandler.newURI(aSpec,aOriginCharset,aBaseURI)
-	 
-	  if (this.returnvalue)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-FileProtocolHandler.prototype.newChannel = function(aURI)
-{
-	 /**
-	  * Creates a channel for a given URI.
-	  *
-	  * @param aURI nsIURI from which to make a channel
-	  * @return reference to the new nsIChannel object
-	  *
-	  * nsIChannel newChannelFromURI(in nsIURI aURI);
-	  */
-
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.protocolhandler.newChannel(aURI) ;
-		
-		if (this.returnvalue)
-		  this.success = true
-		else
-		  this.success = false;
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-
-}
-
-FileProtocolHandler.prototype.allowPort= function(aPort, aScheme)
-{
-	 /**
-	  * Checks if a port number is banned. This involves consulting a list of
-	  * unsafe ports, corresponding to network services that may be easily
-	  * exploitable. If the given port is considered unsafe, then the protocol
-	  * handler (corresponding to aScheme) will be asked whether it wishes to
-	  * override the IO service's decision to block the port. This gives the
-	  * protocol handler ultimate control over its own security policy while
-	  * ensuring reasonable, default protection.
-	  *
-	  * @see nsIProtocolHandler::allowPort
-	  *
-	  * boolean allowPort(in long aPort, in string aScheme);
-	  */
-
-
-	  try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.returnvalue  = this.protocolhandler.allowPort(aPort, aScheme) ;
-		this.success = true
-	 }
-	 catch(e){   
-		this.success = false;
-		this.exception = e ;
-	  }
-
-}
diff --git a/embedding/qa/jstests/networking/nsIURI.html b/embedding/qa/jstests/networking/nsIURI.html
deleted file mode 100644
index b64dfa4d309..00000000000
--- a/embedding/qa/jstests/networking/nsIURI.html
+++ /dev/null
@@ -1,374 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ashish Bhatt <ashishbhatt@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<html>
-
-<title>nsIURI Tets case</title>
-
-<head>
-
-<script type="text/javascript" src="http://mozilla.org/quality/embed/jstests/bridge.js"></script>
-<script type="text/javascript" src="nsIURI.js"></script>
-
-<script type="text/javascript">
-
-var scheme = new Array("http","https", "ftp","file","javascript","data","about","gopher","chrome", "jar");
-
-var url = new Array("http://mozilla.org",
-						"https://ec.aoltw.net",
-						"ftp://ftp.mozilla.org",
-						"file://c:/",
-						"javascript:alert('e');",
-						"data:",
-						"about:",
-						"ghoper://",
-						"chrome://communicator/skin/communicator.css",
-						"jar://resource");
-
-var uri ;
-var buffer ;
-var i;
-
-function WritePassFail()
-{
-
-  if (uri.success)
-  {
-	  buffer += "<td>"+ uri.returnvalue +"</td>" ;
-	  buffer += "<td>Pass</td>"
-  }
-  else
-  {
-	  buffer += "<td>" +"Exception: " + uri.exception + "</td>" ;
-	  buffer += "<td bgcolor='#FF0000'>Fail</td>"
-  }
-
-  buffer += "</tr>"
-  uri.exception= null;
-
-}
-
-
-function WriteTableRow(name,params)
-{
-	buffer += "<tr>" ;
-	buffer += "<td>" + name + "</td>" ;
-	buffer += "<td>" + params + "</td>" ;
-}
-
-
-function WriteHeader()
-{
-
-	buffer = "<b>Results for <a href='http://lxr.mozilla.org/seamonkey/source/netwerk/base/public/nsIURI.idl'>nsIURI :</a></b><br><br>"
-	buffer += "<table border cols=4 width='70%'>"
-	buffer += "<tr>"
-	buffer += "<td><b>Property/Method</b></td>"
-	buffer += "<td><b>Params</b></td>"
-	buffer += "<td><b>Output/Bug/Error</b></td>"
-	buffer += "<td><b>Result</b></td>"
-	buffer += "</tr>"
-
-}
-
-
-function WriteFooter()
-{
-	buffer += "</table>"
-}
-
-
-function Writebuffer(buffer)
-{
-
-	if (isRunningStandalone())
-	{
-	   document.clear();
-	   document.write(buffer);
-	}
-	else
-		WriteResults(buffer);
-
-}
-
-
-function RunAllTests()
-{
-
-	WriteHeader();
-
-	//for (i=0;i<scheme.length;i++)
-	//{
-
-		//uri =  new URI("http://lxr.mozilla.org/seamonkey/source/netwerk/base/public/nsIURI.idl") ;
-		uri =  new URI("http://slip.mcom.com") ;
-		if (uri.exception)
-		{
-		  Writebuffer(uri.exception);
-		  return ;
-		}
-
-   	    //WriteTableRow("<b>Test for <b>" + scheme[i]+  "</b> Protocol Handler</b>","");
-
-
-		getspec();
-		getprePath();
-		getscheme();
-		getuserPass();
-		getusername();
-		getpassword();
-		gethostPort();
-		gethost();
-		getport();
-		getpath();
-		//equals();
-		schemeIs();
-		clone();
-		resolve();
-		asciiSpec();
-		asciiHost();
-		originCharset();
-		setspec();
-		setscheme();
-		setuserPass();
-		setusername();
-		setpassword();
-		sethostPort();
-		sethost();
-		setport();
-		setpath();
-
-	//}
-
-	WriteFooter();
-
-	Writebuffer(buffer) ;
-}
-
-
-function getspec()
-{
-	uri.spec;
-
-	WriteTableRow("spec(get)","");
-	WritePassFail();
-}
-
-function setspec()
-{
-	uri.spec = "ftp://mozilla.org";
-
-	WriteTableRow("spec(set)","");
-	WritePassFail();
-}
-
-function getprePath()
-{
-	uri.prePath;
-
-	WriteTableRow("prePath(readonly)","");
-	WritePassFail();
-}
-
-function getscheme()
-{
-	uri.scheme ;
-
-	WriteTableRow("scheme(get)","");
-	WritePassFail();
-}
-function setscheme()
-{
-	uri.scheme = "ftp" ;
-
-	WriteTableRow("scheme(set)","");
-	WritePassFail();
-}
-
-
-function getuserPass()
-{
-
-	uri.userPass;
-	WriteTableRow("userPass(get)","");
-	WritePassFail();
-}
-function setuserPass()
-{
-
-	uri.userPass = "ashish:netscape" ;
-	WriteTableRow("userPass(get)","");
-	WritePassFail();
-}
-
-function getusername()
-{
-
-	uri.username;
-
-	WriteTableRow("username(get)","");
-	WritePassFail();
-}
-function setusername()
-{
-
-	uri.username = "ashish" ;
-
-	WriteTableRow("username(get)","");
-	WritePassFail();
-}
-
-function getpassword()
-{
-	uri.password;
-	WriteTableRow("password(get)","");
-	WritePassFail();
-}
-
-function setpassword()
-{
-	uri.password = "netscape" ;
-	WriteTableRow("password(get)","");
-	WritePassFail();
-}
-function gethostPort()
-{
-	uri.hostPort ;
-	WriteTableRow("hostPort(get)","");
-	WritePassFail();
-}
-function sethostPort()
-{
-	uri.hostPort = 200;
-	WriteTableRow("hostPort(get)","");
-	WritePassFail();
-}
-
-function gethost()
-{
-	uri.host ;
-	WriteTableRow("host(get)","");
-	WritePassFail();
-}
-function sethost()
-{
-	uri.host = "ftp.mozilla.org";
-	WriteTableRow("host(get)","");
-	WritePassFail();
-}
-
-function getport()
-{
-	uri.port ;
-	WriteTableRow("port(get)","");
-	WritePassFail();
-}
-
-function setport()
-{
-	uri.port = 200 ;
-	WriteTableRow("port(get)","");
-	WritePassFail();
-}
-
-function getpath()
-{
-	uri.path;
-	WriteTableRow("path(get)","");
-	WritePassFail();
-}
-function setpath()
-{
-	uri.path ="/" ;
-	WriteTableRow("path(get)","");
-	WritePassFail();
-}
-
-function schemeIs()
-{
-	uri.schemeIs("ftp");
-	WriteTableRow("schemeIs()","ftp");
-	WritePassFail();
-}
-
-function clone()
-{
-	uri.clone();
-	WriteTableRow("clone()","");
-	WritePassFail();
-}
-
-function resolve()
-{
-	var relativeurl= "embed/docs"
-	uri.resolve(relativeurl);
-	WriteTableRow("resolve()",relativeurl);
-	WritePassFail();
-}
-
-function asciiSpec()
-{
-	uri.asciiSpec();
-	WriteTableRow("asciiSpec(readonly)","");
-	WritePassFail();
-}
-function asciiHost()
-{
-	uri.asciiHost();
-	WriteTableRow("asciiHost(readonly)","");
-	WritePassFail();
-}
-function originCharset()
-{
-	uri.originCharset();
-	WriteTableRow("originCharset(readonly)","");
-	WritePassFail();
-}
-
-
-</script>
-
-</head>
-
-<body>
-
-<script type="text/javascript">
-   RunAllTests();
-</script>
-</body>
-
-</html>
diff --git a/embedding/qa/jstests/networking/nsIURI.js b/embedding/qa/jstests/networking/nsIURI.js
deleted file mode 100644
index 0b11a9b105c..00000000000
--- a/embedding/qa/jstests/networking/nsIURI.js
+++ /dev/null
@@ -1,813 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-const IO_SERVICE_CTRID = 
-	"@mozilla.org/network/io-service;1" ;
-const nsIIOService = 
-	Components.interfaces.nsIIOService ;
-
-function URI(aSpec,aOriginCharset,aBaseURI)
-{
-    try {
-	    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	    
-
-	    ioservice = Components.classes[IO_SERVICE_CTRID].getService(nsIIOService);
-
-	    
-	    if(!ioservice)
-	       this.exception = "Unable to get nsIIOService" ;
-	          
-	    this.uri = ioservice.newURI(aSpec,aOriginCharset,aBaseURI) ;
-
-	    if (!this.uri)
-	       this.exception = "Unable to get nsIURI" ;
-	      
-	   return this ;
-     }
-     catch(e){
-	this.exception = e ;
-     }
-     
-	 
-   
-}
-
-URI.prototype.returnvalue = null;
-URI.prototype.success = null;
-URI.prototype.exception = null;
-URI.prototype.uri = null ;
-
-
-
-URI.prototype.scheme getter = function ()
-{
-
- /**
-  * The Scheme is the protocol to which this URI refers.  The scheme is
-  * restricted to the US-ASCII charset per RFC2396.
-  */
-  
-  try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.uri.scheme ;
-	 
-	  if (this.returnvalue)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-URI.prototype.scheme setter = function (aScheme)
-{
-
- /**
-  * The Scheme is the protocol to which this URI refers.  The scheme is
-  * restricted to the US-ASCII charset per RFC2396.
-  */
-  
-  try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.uri.scheme  = aScheme ;
- 
-	  this.returnvalue =  this.uri.scheme
-	  this.success =  true ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-URI.prototype.spec getter = function ()
-{
-
- /**
-  * Returns a string representation of the URI. Setting the spec causes
-  * the new spec to be parsed, initializing the URI.
-  *
-  * Some characters may be escaped.
-  */
-   
-   try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.uri.spec ;
-	 
-	  if (this.returnvalue)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-URI.prototype.spec setter = function (aSpec)
-{
-
- /**
-  * Returns a string representation of the URI. Setting the spec causes
-  * the new spec to be parsed, initializing the URI.
-  *
-  * Some characters may be escaped.
-  */
-   
-   try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.uri.spec =  aSpec ; ;
-	 this.returnvalue = this.uri.spec ;
-	 
-	 this.success =  true ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-URI.prototype.prePath getter = function ()
-{
-
-  /**
-  * The prePath (eg. scheme://user:password@host:port) returns the string
-  * before the path.  This is useful for authentication or managing sessions.
-  *
-  * Some characters may be escaped.
-  */
-   
-   try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.uri.prePath ;
-	 
-	  if (this.returnvalue)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-
-URI.prototype.userPass getter= function ()
-{
-
- /**
-  * The username:password (or username only if value doesn't contain a ':')
-  *
-  * Some characters may be escaped.
-  */
-    try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.uri.userPass ;
-     this.success =  true ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
- 
-}
-
-URI.prototype.userPass setter= function (aUserPass)
-{
-
- /**
-  * The username:password (or username only if value doesn't contain a ':')
-  *
-  * Some characters may be escaped.
-  */
-    try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.uri.userPass = aUserPass ;
-	 this.returnvalue = this.uri.userPass ;
-     this.success =  true ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
- 
-}
-
-URI.prototype.username getter = function ()
-{
-
- /**
-  * The optional username and password, assuming the preHost consists of
-  * username:password.
-  *
-  * Some characters may be escaped.
-  *
-  *  attribute AUTF8String username;
-  */ 
-  
-   try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.uri.username ;
-	 
-	  if (this.returnvalue)
-      this.success =  true ;
- }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-URI.prototype.username setter = function (aUserName)
-{
-
- /**
-  * The optional username and password, assuming the preHost consists of
-  * username:password.
-  *
-  * Some characters may be escaped.
-  *
-  *  attribute AUTF8String username;
-  */ 
-  
-   try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.uri.username = aUserName ;
-	 this.returnvalue = this.uri.username ;
-	 
-	  if (this.returnvalue)
-      this.success =  true ;
- }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
-}
-
-URI.prototype.password getter = function ()
-{
- /**
-  * The optional username and password, assuming the preHost consists of
-  * username:password.
-  *
-  * Some characters may be escaped.
-  *
-  *  attribute AUTF8String password;
-  */ 
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.password ;
- 	 
- 	  if (this.returnvalue)
-      this.success =  true ;
-  }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-URI.prototype.password setter = function (aPassword)
-{
- /**
-  * The optional username and password, assuming the preHost consists of
-  * username:password.
-  *
-  * Some characters may be escaped.
-  *
-  *  attribute AUTF8String password;
-  */ 
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.uri.password = aPassword ;
- 	 this.returnvalue = this.uri.password ;
- 	 
- 	  if (this.returnvalue)
-      this.success =  true ;
-  }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-URI.prototype.hostPort getter= function ()
-{
-  /**
-  * The host:port (or simply the host, if port == -1).
-  *
-  * Characters are NOT escaped.
-  *
-  *	attribute AUTF8String hostPort;
-  */
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.hostPort ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-URI.prototype.hostPort setter= function (aHostPort)
-{
-  /**
-  * The host:port (or simply the host, if port == -1).
-  *
-  * Characters are NOT escaped.
-  *
-  *	attribute AUTF8String hostPort;
-  */
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.uri.hostPort = aHostPort ;
- 	 this.returnvalue = this.uri.hostPort ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-URI.prototype.host getter = function ()
-{
- /**
-  * The host is the internet domain name to which this URI refers.  It could
-  * be an IPv4 (or IPv6) address literal.  If supported, it could be a
-  * non-ASCII internationalized domain name.
-  *
-  * Characters are NOT escaped.
-  *
-  *	attribute AUTF8String host;
-  */
-    try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.host ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-URI.prototype.host setter = function (aHost)
-{
- /**
-  * The host is the internet domain name to which this URI refers.  It could
-  * be an IPv4 (or IPv6) address literal.  If supported, it could be a
-  * non-ASCII internationalized domain name.
-  *
-  * Characters are NOT escaped.
-  *
-  *	attribute AUTF8String host;
-  */
-    try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.uri.host = aHost;
- 	 this.returnvalue = this.uri.host ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-
-URI.prototype.port getter = function ()
-{
- /**
-  * A port value of -1 corresponds to the protocol's default port (eg. -1
-  * implies port 80 for http URIs).
-  *
-  *	attribute long port;
-  */
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.port ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-URI.prototype.port setter = function (aPort)
-{
- /**
-  * A port value of -1 corresponds to the protocol's default port (eg. -1
-  * implies port 80 for http URIs).
-  *
-  *	attribute long port;
-  */
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.uri.port = aPort ;
- 	 this.returnvalue = this.uri.port ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-
-URI.prototype.path getter = function ()
-{
- /**
-  * The path, typically including at least a leading '/' (but may also be
-  * empty, depending on the protocol).
-  *
-  * Some characters may be escaped.
-  *
-  *	attribute AUTF8String path;
-  */
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.path ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
- 
-}
-
-URI.prototype.path setter = function (aPath)
-{
- /**
-  * The path, typically including at least a leading '/' (but may also be
-  * empty, depending on the protocol).
-  *
-  * Some characters may be escaped.
-  *
-  *	attribute AUTF8String path;
-  */
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.uri.path  = aPath ;
- 	 this.returnvalue = this.uri.path ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
- 
-}
-
-
-
-URI.prototype.equals = function (aURI)
-{
- /**
-  * URI equivalence test (not a strict string comparison).
-  * eg. http://foo.com:80/ == http://foo.com/
-  *
-  *	boolean equals(in nsIURI other);
-  */
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.equals(aURI);
- 	 this.success =  true ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-
-
-URI.prototype.schemeIs = function (aScheme)
-{
- /**
-  * An optimization to do scheme checks without requiring the users of nsIURI
-  * to GetScheme, thereby saving extra allocating and freeing. Returns true if
-  * the schemes match (case ignored).
-  *
-  *	boolean schemeIs(in string scheme);
-  */
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.schemeIs(aScheme)	 ;
- 	 this.success =  true ;
- 	 
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-
-
-URI.prototype.clone = function ()
-
-{
- /**
-  * Clones the current URI.  For some protocols, this is more than just an
-  * optimization.  For example, under MacOS, the spec of a file URL does not
-  * necessarily uniquely identify a file since two volumes could share the
-  * same name.
-  *
-  * nsIURI clone();
-  */
-  
-    try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.clone() ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-
-
-URI.prototype.resolve = function (aRelativePath)
-{
- /**
-  * This method resolves a relative string into an absolute URI string,
-  * using this URI as the base. 
-  *
-  * NOTE: some implementations may have no concept of a relative URI.
-  *
-  * AUTF8String resolve(in AUTF8String relativePath);
-  */
-  
-    try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.resolve(aRelativePath) ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-
-
-URI.prototype.asciiSpec = function ()
-{
-
- /**
-  * The URI spec with an ASCII compatible encoding.  Host portion follows
-  * the IDNA draft spec.  Other parts are URL-escaped per the rules of
-  * RFC2396.  The result is strictly ASCII.
-  *
-  * readonly attribute ACString asciiSpec;   
-  */
-  
- try {
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-	 this.returnvalue = this.uri.asciiSpec ;
-	 
-	  if (this.returnvalue)
-	    this.success =  true ;
-	  else
-	    this.success =  false ;
-  }
-  catch(e){
-    this.success =  false ;
-    this.exception =  e ;
-  }
-
- }
- 
- 
- 
- 
-URI.prototype.asciiHost = function ()
-{
- /**
-  * The URI host with an ASCII compatible encoding.  Follows the IDNA
-  * draft spec for converting internationalized domain names (UTF-8) to
-  * ASCII for compatibility with existing internet infrasture.
-  *
-  *	readonly attribute ACString asciiHost;
-  */
-  
-  try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.asciiHost ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
-}
-
-
-
-
-URI.prototype.originCharset = function ()
-{
- /**
-  * The charset of the document from which this URI originated.  An empty
-  * value implies UTF-8.
-  *
-  * If this value is something other than UTF-8 then the URI components
-  * (e.g., spec, prePath, username, etc.) will all be fully URL-escaped.
-  * Otherwise, the URI components may contain unescaped multibyte UTF-8
-  * characters.
-  *
-  * readonly attribute ACString originCharset;
-  */
-    try {
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- 	 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- 
- 	 this.returnvalue = this.uri.originCharset ;
- 	 
- 	  if (this.returnvalue)
- 	    this.success =  true ;
- 	  else
- 	    this.success =  false ;
-   }
-   catch(e){
-     this.success =  false ;
-     this.exception =  e ;
-   }
-
- }
- 
\ No newline at end of file
diff --git a/embedding/qa/jstests/nsIDocCharsetTest.txt b/embedding/qa/jstests/nsIDocCharsetTest.txt
deleted file mode 100644
index fdbf31876e4..00000000000
--- a/embedding/qa/jstests/nsIDocCharsetTest.txt
+++ /dev/null
@@ -1,236 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is Netscape Communications
-   - Corp.  Portions created by Netscape Communications Corp. are
-   - Copyright (C) 1999 Netscape Communications Corp.  All
-   - Rights Reserved.
-   -
-   - Contributor(s):
-   -   dsirnapalli@netscape.com.
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIDocCharset Interface Test </title>
-<!-- Descrpt: nsIDocCharset Interface Test Case
-     Author: 
-     Revs: 09.10.01 - Created
-     Last Run On:10.23.01.
-  -->
-<head>
-
-<!-- script below is ngdriverspecific  -->
-<script type="text/javascript" src="http://bubblegum/ngdriver/suites/testlib.js">
-</script>
-
-<script type="text/javascript">
-
-function getnsIDOMWindow()
-{
-  try
-  {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var domobject = window.QueryInterface(Components.interfaces.nsIDOMWindow);
-  }
-  catch(e) {
-    dump ("\nError getting nsIDOMWindow\n");
-  }
-  return domobject;
-}
-
-function getdocCharset()
-{
-  try
-  {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    // You get nsIDocCharset by GI' ing off nsIDOMWindow.
-    // nsIDOMWindow doesnot implement getInterface directly. So you need to QI first.
-    var charsetObj = domWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                              .getInterface(Components.interfaces.nsIDocCharset);
-    return(charsetObj);
-  }
-  catch(e) {
-    dump ("\nError getting nsIDocCharset\n");
-  }
-}
-
-function constructResult(initialcharset, charset)
-{
-  var results = "";
-
-  initialcharsetvalue = "Fail";
-  charsetvalue = "Fail";
-
-  initialcharsetcolor = "white";
-  charsetcolor = "white";
-
-  if(initialcharset != null) initialcharsetvalue = "Pass" ;
-  if(charset == setCharsetValueTo) charsetvalue = "Pass" ;
-
-  if(initialcharset == null) initailcharsetcolor = "red" ;
-  if(charset != setCharsetValueTo) charsetcolor = "red" ;
-
-  results = results + "<html>";
-
-  results = results + "<font color='#CC6600'> NOTE: </font>" + "<br>";
-  results = results + "For the Test Case to run correctly include the following line into your prefs.js file." + "<br>";
-  results = results + 'user_pref("signed.applets.codebase_principal_support", true);' + "<br>";
-  results = results + 'prefs.js can be found at' + '<br>';
-  results = results + 'WINNT:C:\\WINNT\\Profiles\\profileyouareusing\\Application Data\\MfcEmbed\\Profiles\\default\\somefolder.slt\\prefs.js' + '<br>';
-  results = results + 'WIN98:C:\\WINDOWS\\Application Data\\MfcEmbed\\Profiles\\default\\somefolder.slt\\prefs.js' + '<br>';
-  results = results + '<br><hr ALIGN=LEFT SIZE=5 NOSHADE WIDTH="80%">' + '\n';
-
-  results = results + "  <table bgcolor='white' border='4'>";
-  results = results + "  <tbody>";
-  results = results + "  <caption> <center> <b> nsIDocCharset Results </b> </center> </caption><br>";
-  results = results + "    <tr>";
-  results = results + "      <td> <b> Case# </b> </td>";
-  results = results + "      <td> <b> Description </b> </td>";
-  results = results + "      <td> <b> Value </b> </td>";
-  results = results + "      <td> <b> Result </b> </td>";
-  results = results + "    </tr>";
-  results = results + "    <tr bgcolor = '" + initialcharsetcolor + "'>";
-  results = results + "      <td> 1 </td>";
-  results = results + "      <td> Initial charset value </td>";
-  results = results + "      <td>" + initialcharset + "</td>";
-  results = results + "      <td>" + initialcharsetvalue + "</td>";
-  results = results + "    </tr>";
-  results = results + "    <tr bgcolor = '" + charsetcolor + "'>";
-  results = results + "      <td> 2 </td>";
-  results = results + "      <td> charset value after setting </td>";
-  results = results + "      <td>" + charset + "</td>";
-  results = results + "      <td>" + charsetvalue + "</td>";
-  results = results + "    </tr>";
-  results = results + "  </tbody>";
-  results = results + "  </table>";
-
-  results = results + '<br><hr ALIGN=LEFT SIZE=5 NOSHADE WIDTH="80%">' + '\n';
-  results = results + "</html>";
-
-  document.results.textarea.value = results;
-  if (top.name == "testWindow")
-  {
-   	fixSubmit();
-  }
-  else
-  {
-  	document.write(document.results.textarea.value);
-  }
-}
-
-</script>
-
-<script language="JavaScript">
-
-function createCookie(name,value,days)
-{
-  if (days)
-  {
-    var date = new Date();
-    date.setTime(date.getTime()+(days*24*60*60*1000));
-    var expires = "; expires="+date.toGMTString();
-  }
-  else expires = "";
-  document.cookie = name+"="+value+expires+"; path=/";
-}
-
-function readCookie(name)
-{
-  var nameEQ = name + "=";
-  var ca = document.cookie.split(';');
-  for(var i=0;i < ca.length;i++)
-  {
-    var c = ca[i];
-    while (c.charAt(0)==' ')
-      c = c.substring(1,c.length);
-    if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
-  }
-  return null;
-}
-
-function eraseCookie(name)
-{
-  createCookie(name,"",-1);
-}
-
-</script>
-
-</head>
-<body>
-
-<!-- form below is ngdriverspecific  -->
-<form name="results" action="/ngdriver/cgi-bin/writeresults.cgi" method="post">
-<script type="text/javascript">
-document.write('<input name="resultsfile" type="hidden" value="' + window.opener.document.resultsform.resultsfile.value + '">');
-</script>
-<input type="hidden" name="textarea">
-</form>
-
-<script type="text/javascript">
-
-var domWindow = getnsIDOMWindow();
-var docCharset = getdocCharset();
-var setCharsetValueTo = "ISO-8859-1";
-
-if(readCookie("docCharset") == null)
-{
-  try
-  {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var charsetValue = docCharset.charset;
-    docCharset.charset = setCharsetValueTo;
-  }
-  catch(e) {
-    dump ("\nError getting nsIDocCharset\n");
-  }
-
-  createCookie("docCharset", charsetValue, 14);
-  window.location.reload();
-}
-else
-{
-  var cookieValue = readCookie("docCharset");
-  try
-  {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    constructResult(cookieValue, docCharset.charset);
-  }
-  catch(e) {
-    dump ("\nError getting nsIDocCharset\n");
-  }
-  eraseCookie("docCharset");
-}
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/nsIPrefBranchTest.txt b/embedding/qa/jstests/nsIPrefBranchTest.txt
deleted file mode 100644
index 5fd1f8c7f08..00000000000
--- a/embedding/qa/jstests/nsIPrefBranchTest.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-<html>
-<!--
-Written by Dharma.
-Test last run on 05/09/01.
--->
-<head>
- <title> Testing nsIPrefBranch Interface </title>
- <script type="text/javascript">
-
- function getnsIPrefServiceObj()
- {
-   try {
-     netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-     prefObj = Components.classes["@mozilla.org/preferences-service;1"].
-	                getService(Components.interfaces.nsIPrefService);
-   }
-   catch(e) {
-    alert("Exception: " + e);
-   }
-   return prefObj;
- }
- </script>
-</head>
-
-<body>
-<script type="text/javascript">
-  // First get the nsIPrefService object.
-  var nsIPrefServiceObj = getnsIPrefServiceObj();
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    // get the nsIPrefBranch object.
-    // if you use getBranch() then the preference file that gets affected is prefs.js.
-    var nsIPrefBranchObj = nsIPrefServiceObj.getBranch("app.update.");
-
-    // verifying the attribute root.
-    alert("root: " + nsIPrefBranchObj.root);
-
-    // checking getPrefType method.
-    alert("prefType: " + nsIPrefBranchObj.getPrefType("url"));
-
-    // checking getBoolPref method.
-
-    var boo = nsIPrefBranchObj.getBoolPref("enabled");
-    alert("boo: " + boo);
-
-    // checking setBoolPref method.
-
-    nsIPrefBranchObj.setBoolPref("enabled", !boo);
-    nsIPrefServiceObj.savePrefFile(null);
-
-    // checking getCharPref method.
-    var updateUrl = nsIPrefBranchObj.getCharPref("url");
-    alert("charPref: " + updateUrl);
-
-    // checking setCharPref method.
-
-    nsIPrefBranchObj.setCharPref("url", "http://mozilla.org")
-    nsIPrefServiceObj.savePrefFile(null);
-
-    // checking getIntPref method.
-    /*
-    var result = nsIPrefBranchObj.getIntPref("editor.table.delete_key");
-    alert(result);
-    */
-
-    // checking setIntPref method.
-	/*
-    nsIPrefBranchObj.setIntPref("editor.table.delete_key", 1)
-    nsIPrefServiceObj.savePrefFile(null);
-	*/
-
-    // checking clearUserPref method.
-    /*
-    nsIPrefBranchObj.clearUserPref("url");
-    nsIPrefServiceObj.savePrefFile(null);
-    */
-
-	// checking lockPref method.
-	boo = nsIPrefBranchObj.prefIsLocked("url");
-	alert ("prefIsLocked: " + boo);
-
-	nsIPrefBranchObj.lockPref("url");
-	nsIPrefServiceObj.savePrefFile(null);
-
-
-	// checking prefIsLocked method.
-
-	var boo = nsIPrefBranchObj.prefIsLocked("url");
-	alert ("prefIsLocked: " + boo);
-
-	/*
-    nsIPrefBranchObj.setBoolPref("homepage_override.1", 0);
-    nsIPrefServiceObj.savePrefFile(null);
-	*/
-
-	// checking unlockPref method.
-
-	nsIPrefBranchObj.unlockPref("url");
-	nsIPrefServiceObj.savePrefFile(null);
-    alert("parefIsLocked: " + nsIPrefBranchObj.prefIsLocked("url"));
-
-
-    // checking deleteBranch
-    // Filed a bug related to this method. for details see the bug #80108.
-    // after reading the bug tried by settting the root to "font" without a dot and
-    // it deletes the branch.
-    /*
-    nsIPrefBranchObj.deleteBranch(null);
-	nsIPrefServiceObj.savePrefFile(null);
-    */
-
-	// checking resetBranch
-	/*
-	nsIPrefBranchObj.resetBranch("size.fixed.x-western");
-	nsIPrefServiceObj.savePrefFile(null);
-	*/
-
-    // checking getChildList method.
-
-	var aCount = {value:0};
-	var childArray = nsIPrefBranchObj.getChildList("", aCount);
-	alert("aCount: " + aCount.value);
-	//alert("Array length: " + childArray.length);
-	alert("Array content: " + childArray.toString());
-
-	/*
-	var defaultName = nsIPrefBranchObj.getComplexValue("browser.search.defaultenginename" , Components.interfaces.nsIPrefLocalizedString).data;
-    alert(defaultName);
-	*/
-    alert("End");
-  }
-  catch(e) {
-      alert("Exception: " + e);
-  }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/nsIPromptTest.txt b/embedding/qa/jstests/nsIPromptTest.txt
deleted file mode 100644
index a9a4890da55..00000000000
--- a/embedding/qa/jstests/nsIPromptTest.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE> Testing nsIPrompt Interface </TITLE>
-<!--
-Written by Dharma.
-Tests last run on 04/30/01.
-Tests last run on 05/08/01.
--->
-<SCRIPT TYPE="text/javascript">
-
-function getnsIPromptObj()
-{
-  // get an implementation of nsIPrompt.
-  // (interface definition is embedding/browser/webBrowser)
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"].
-             getService(Components.interfaces.nsIWindowWatcher);
-    // window is javascript window which is always available.
-    var prompter = ww.getNewPrompter(window); // nsIPrompt
-  }
-  catch(e) {
-    alert("Exception: " + e);
-  }
-  return prompter;
-}
-
-</SCRIPT>
-
-</HEAD>
-<BODY>
-<SCRIPT TYPE="text/javascript">
-var promptObj = getnsIPromptObj();
-try {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  // checking the alert() method.
-  /*
-  promptObj.alert("alert dialog", "text here");
-  */
-
-  // checking the alertCheck method.
-  /*
-  var checkbox = {value:1};
-  promptObj.alertCheck("alertcheck dialog","text message",
-                       "check or uncheck",checkbox);
-  alert(checkbox.value);
-  */
-
-  // checking the confirm method
-  /*
-  var boo = promptObj.confirm("confirm dialog", " Do you want to continue");
-  //var boo = promptObj.confirm("confirm dialog","first", "second");
-  alert(boo);
-  */
-
-  // checking the confirmCheck method.
-  /*
-  var checkbox = {value:0};
-  var boo = promptObj.confirmCheck("confirmcheck dialog",
-  								   "Do you want to continue",
-                                   "check or uncheck", checkbox);
-  alert("Checkbox checked: " + checkbox.value);
-  alert("Confirmation accepted: " + boo);
-  */
-
-  // checking the confirmEx method.
-
-  var checkbox = {value:1};
-  // first variation.
-  /*
-  var std_buttons = (promptObj.BUTTON_TITLE_OK * promptObj.BUTTON_POS_0) +
-                    (promptObj.BUTTON_TITLE_CANCEL * promptObj.BUTTON_POS_1) +
-                    (promptObj.BUTTON_TITLE_SAVE * promptObj.BUTTON_POS_2);
-  */
-  // second variation.
-  /*
-  var std_buttons = (promptObj.BUTTON_TITLE_IS_STRING * promptObj.BUTTON_POS_0) +
-                      (promptObj.BUTTON_TITLE_IS_STRING * promptObj.BUTTON_POS_1) +
-                      (promptObj.BUTTON_TITLE_IS_STRING * promptObj.BUTTON_POS_2);
-  var buttonPressed = promptObj.confirmEx("confirmEx dialog", "text message", std_buttons,
-                      "Button0", "Button1", "Button2",
-                      "check or uncheck", checkbox);
-  alert("Checkbox checked: " + checkbox.value);
-  alert("Button pressed: " + buttonPressed);
-  */
-
-  // checking the prompt method.
-  /*
-  var val = {value:"default value"};
-  var checkbox = {value:1};
-  */
-  /** notes
-  Passing var checkbox = {value:null}; is not null.
-  If you don't want the checkbox, you need to pass null, not a value
-  which contains null.
-  Since checkbox is an inout param,it can never be null when called from js.
-  Q.Make check message as null.(in this case "check or uncheck").Default title
-  should be shown.Its not showing default title and its not showing the checkbox also.
-  A.The comment in the API will have to change, not the code. The idea was, if
-  checkMsg == null && checkValue != null, to use a default title for the checkbox.
-  Since checkValue is an inout param, it isn't possible to pass null from JS as it
-  is from C++. So, the prompt implementation requires both the message and the
-  value to be non-null in order to show the checkbox.
-  **/
-  /*
-  var boo = promptObj.prompt("prompt dialog", "text message",
-                             val, "check or uncheck", checkbox);
-  alert("Value: " + val.value);
-  alert("Checkbox checked: " + checkbox.value);
-  alert("Confirmation accepted: " + boo);
-  */
-
-  // checking the promptPassword method.
-  /*
-  var password = {value:"dharma"};
-  var checkbox = {value:1};
-  var boo = promptObj.promptPassword("promptPassword dialog", "Enter the password",
-                                     password, "check or uncheck", checkbox);
-  alert("pass: " + password.value);
-  alert("checkbox checked: " + checkbox.value);
-  alert("confirmation accepted: " + boo);
-  */
-
-  // checking the promptUsernameAndPassword method.
-  /*
-  var username = {value:"Dharma"};
-  var password = {value:"Gopal"};
-  var checkbox = {value:1};
-  var boo = promptObj.promptUsernameAndPassword("promptUsernameAndPassword dialog",
-                            "Enter Username and Password", username, password,
-                            "check or uncheck", checkbox);
-  alert("username: " + username.value);
-  alert("pass: " + password.value);
-  alert("checkbox checked: " + checkbox.value);
-  alert("confirmation accepted: " + boo);
-  */
-
-  // Checking the select method.
-
-  selectList = new Array("first","second","third","fourth");
-  var outSelection = {value:0};
-  var boo = promptObj.select("select dialog", "Select one:",
-                              4, selectList, outSelection);
-  alert("outSelection: " + outSelection.value);
-  alert("confirmation accepted: " + boo);
-
-  }
-catch(e) {
-  alert("Exception: " + e);
-}
-alert("END");
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/nsIURITest.txt b/embedding/qa/jstests/nsIURITest.txt
deleted file mode 100644
index 4bcc2d4deb4..00000000000
--- a/embedding/qa/jstests/nsIURITest.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE> Testing nsIURI Interface </TITLE>
-<!--
-Written by Dharma.
-Tests last run on 05/22/01.
-
--->
-<SCRIPT TYPE="text/javascript">
-
-function getnsIURIObj()
-{
-  // get an implementation of nsIURI.
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    // using standard url contractid. later on try with simple uri contractid.
-
-    var nsUriObj = Components.classes["@mozilla.org/network/standard-url;1"].
-             createInstance(Components.interfaces.nsIURI);
-
-    //var nsUriObj = Components.classes["@mozilla.org/network/standard-url;1"].
-    //         getService(Components.interfaces.nsIURI);
-  }
-  catch(e) {
-    alert("Exception: " + e);
-  }
-  return nsUriObj;
-}
-
-</SCRIPT>
-
-</HEAD>
-<BODY>
-<SCRIPT TYPE="text/javascript">
-var uriObj = getnsIURIObj();
-// newuriObj object is used for testing equals method.
-var newuriObj = getnsIURIObj();
-
-try {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  // checking attribute spec.
-  uriObj.spec = "http://username:password@www.mozilla.org:9090/quality/embed/index.html";
-  newuriObj.spec = "http://username:password@www.mozilla.org:9090/quality/embed/index.html";
-
-  /*
-  alert(uriObj.spec);
-  */
-
-  // checking attribute prepath.
-  /*
-  alert(uriObj.prePath);
-  // setting the prepath is not yet implemented.
-  uriObj.prePath="http://username:password@www.yahoo.com";
-  alert(uriObj.prePath);
-  */
-
-  // checking attribute scheme.
-  /*
-  alert(uriObj.scheme);
-  uriObj.scheme="ftp";
-  alert(uriObj.scheme);
-  */
-
-  // checking attribute preHost.
-  /*
-  alert(uriObj.preHost);
-  uriObj.preHost = "giveusername:givepassword";
-  alert(uriObj.preHost);
-  */
-
-  // checking attribute username.
-  /*
-  alert(uriObj.username);
-  uriObj.username = "giveusername";
-  alert(uriObj.username);
-  */
-
-  // checking attribute password.
-  /*
-  alert(uriObj.password);
-  uriObj.password = "givepassword";
-  alert(uriObj.password);
-  */
-
-  // checking attribute host.
-  /*
-  alert(uriObj.host);
-  uriObj.host = "www.yahoo.com";
-  alert(uriObj.host);
-  */
-
-  // checking attribute port.
-  /*
-  alert(uriObj.port);
-  uriObj.port = -1;
-  alert(uriObj.port);
-  */
-
-  // checking attribute path.
-
-  alert(uriObj.path);
-  uriObj.path = "projects/ui/";
-  alert(uriObj.path);
-
-
-  // checking the equals method.
-  /*
-  var boo = uriObj.equals(newuriObj);
-  alert(boo);
-  */
-
-  // checking the schemeIs method.
-  /*
-  var boo = uriObj.schemeIs("ftp");
-  alert(boo);
-  */
-
-  // checking the clone method.
-  /*
-  var cloneuriObj = uriObj.clone();
-  alert(cloneuriObj.port);
-  alert(cloneuriObj.path);
-  */
-
-  // checking the resolve method.
-  /*
-  var absuri = uriObj.resolve("projects/ui/accessibility/");
-  alert(absuri);
-  */
-}
-catch(e) {
-  alert("Exception: " + e);
-}
-alert("END");
-</SCRIPT>
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/embedding/qa/jstests/nsIURLTest.txt b/embedding/qa/jstests/nsIURLTest.txt
deleted file mode 100644
index 467792e84a5..00000000000
--- a/embedding/qa/jstests/nsIURLTest.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE> Testing nsIURL Interface </TITLE>
-<!--
-Written by Dharma.
-Tests last run on 05/25/01.
--->
-
-<SCRIPT TYPE="text/javascript">
-
-function getnsIURLObj()
-{
-  // get an implementation of nsIURL.
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    var nsUrlObj = Components.classes["@mozilla.org/network/standard-url;1"].
-                              createInstance(Components.interfaces.nsIURL);
-  }
-  catch(e) {
-    alert("Exception: " + e);
-  }
-  return nsUrlObj;
-}
-
-</SCRIPT>
-
-</HEAD>
-<BODY>
-<SCRIPT TYPE="text/javascript">
-var urlObj = getnsIURLObj();
-
-try {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  urlObj.spec = "http://directory/newdir/fileBaseName.fileExtension?query";
-
-  // checking the filePath attribute.
-  /*
-  alert(urlObj.filePath);
-  urlObj.filePath = "/modifieddir/modifiedfile.ext";
-  alert(urlObj.spec);
-  */
-
-  // checking param attribute.
-  /*
-  alert(urlObj.param);
-  urlObj.param = "newparam";
-  alert(urlObj.spec);
-  */
-
-  // checking query attribute.
-  /*
-  alert(urlObj.query);
-  urlObj.query = "newquery";
-  alert(urlObj.spec);
-  */
-
-  // checking ref attribute.
-  /*
-  alert(urlObj.ref);
-  urlObj.ref = "newref";
-  alert(urlObj.spec);
-  */
-
-  // checking directory attribute
-  /*
-  alert(urlObj.directory);
-  urlObj.directory = "modifieddir";
-  alert(urlObj.spec);
-  */
-
-  // checking fileName attribute.
-  /*
-  alert(urlObj.fileName);
-  urlObj.fileName = "newfilename";
-  alert(urlObj.spec);
-  */
-
-  // checking fileBaseName attribute.
-  /*
-  alert(urlObj.fileBaseName);
-  urlObj.fileBaseName = "newfileBaseName";
-  alert(urlObj.spec);
-  */
-
-  // checking fileExtension attribute.
-  /*
-  alert(urlObj.fileExtension);
-  urlObj.fileExtension = "newfileExtension";
-  alert(urlObj.spec);
-  */
-
-  // checking escapedQuery attribute.
-  alert(urlObj.escapedQuery);
-  urlObj.escapedQuery = "escapedQuery";
-  alert(urlObj.spec);
-
-}
-catch(e) {
-  alert("Exception: " + e);
-}
-alert("END");
-</SCRIPT>
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/embedding/qa/jstests/nsIWebBrowserPersistTest1.txt b/embedding/qa/jstests/nsIWebBrowserPersistTest1.txt
deleted file mode 100644
index 88d551ca7d0..00000000000
--- a/embedding/qa/jstests/nsIWebBrowserPersistTest1.txt
+++ /dev/null
@@ -1,221 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIWebBrowserPersist Interface Test</title>
-<!--
-Descrpt: This Test Case will serve two purposes.
-     1. It tests saveURI method and
-     2. It checks the attribute currentState against PERSIST_STATE_READY,
-        PERSIST_STATE_SAVING, PERSIST_STATE_FINISHED.
-     Author: dsirnapalli@netscape.com
-     Revs: 10.03.01 - Created
-     Last Run On: 10.24.01.
--->
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   dsirnapalli@netscape.com
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<head>
-
-<!-- script below is ngdriverspecific  -->
-<script TYPE="text/javascript" SRC="http://bubblegum/ngdriver/suites/testlib.js">
-</script>
-
-<script TYPE="text/javascript">
-
-url = "http://www.mozilla.org";
-file = "c:\\test1.htm";
-astatus = new Array();
-i = 0;
-persiststate = "";
-
-function saveURI()
-{
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    uri = Components.classes["@mozilla.org/network/standard-url;1"].
-          createInstance(Components.interfaces.nsIURI);
-    uri.spec = url;
-
-    localFile = Components.classes["@mozilla.org/file/local;1"].
-                createInstance(Components.interfaces.nsILocalFile)
-    localFile.initWithPath(file)
-
-    persistListener = new PersistProgressListener;
-    persist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"].
-              createInstance(Components.interfaces.nsIWebBrowserPersist);
-
-    persist.progressListener = persistListener;
-    persist.saveURI(uri, null, localFile);
-    //persist.cancelSave();
-  }
-  catch(e) {
-    alert("Exception: " + e);
-  }
-}
-
-function setStatus(text)
-{
-  astatus[i] = text;
-  i++;
-}
-
-function setProgress(current, max)
-{
-  progress = current + " out of " + max;
-}
-
-function PersistProgressListener()
-{
-  this.init();
-}
-
-PersistProgressListener.prototype =
-{
-  QueryInterface : function(aIID)
-  {
-    if(aIID.equals(Components.interfaces.nsIWebProgressListener))
-      return this;
-    throw Components.results.NS_NOINTERFACE;
-  },
-
-  init : function()
-  {
-  },
-
-  destroy : function()
-  {
-  },
-
-  // nsIWebProgressListener
-  onProgressChange : function (aWebProgress, aRequest,
-                               aCurSelfProgress, aMaxSelfProgress,
-                               aCurTotalProgress, aMaxTotalProgress)
-  {
-    setProgress(aCurTotalProgress, aMaxTotalProgress);
-  },
-
-  onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
-  {
-    try {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      if(persist.currentState == persist.PERSIST_STATE_READY)
-      {
-        persiststate = persiststate + "Persister is ready to save data." + "<br>";
-      }
-      else if(persist.currentState == persist.PERSIST_STATE_SAVING)
-	  {
-	    persiststate = persiststate + "Persister is saving data." + "<br>";
-	  }
-      else if(persist.currentState == persist.PERSIST_STATE_FINISHED)
-      {
-	    persiststate = persiststate + "Persister has finished saving data." + "<br>";
-	  }
-    }
-    catch(e) {
-      alert("Exception: " + e);
-    }
-  },
-
-  onLocationChange : function(aWebProgress, aRequest, aLocation)
-  {
-  },
-
-  onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage)
-  {
-    setStatus(aMessage);
-  },
-
-  onSecurityChange : function(aWebProgress, aRequest, aState)
-  {
-  }
-}
-
-function constructResults()
-{
-  var results = "";
-  results = results + "<html><br>";
-  results = results + "<b><u> Interface:nsIWebBrowserPersist</u></b><br>";
-  results = results + "<b><u>Method:saveURI()</u></b><br><br>";
-  results = results + "<b> Result: </b><br>";
-  results = results + "If " + "<b>" + file + "</b>" + " exist physically and if contains data then the Result is Pass" +  "<br><br>";
-  results = results + "<b> Status: </b><br>";
-  for(i=0;i<astatus.length;i++)
-    results = results + astatus[i] + "<br>";
-  results = results + "<br>";
-  results = results + "<b> Progress: </b><br>";
-  results = results + progress + "<br><br>";
-  results = results + "<b><u>Attribute:currentState</u></b><br><br>";
-  results = results + "<b> State of Persist Object: </b><br>";
-  results = results + persiststate + "<br><br>";
-
-  results = results + "</html>";
-
-  displayResults(results);
-}
-
-function displayResults(results)
-{
-  document.results.textarea.value = results;
-  if (top.name == "testWindow")
-  {
-    fixSubmit();
-  }
-  else
-  {
-    document.write(document.results.textarea.value);
-  }
-}
-
-</script>
-</head>
-<body>
-
-<!-- form below is ngdriverspecific  -->
-<form name="results" action="/ngdriver/cgi-bin/writeresults.cgi" method="post">
-<script TYPE="text/javascript">
-document.write('<input name="resultsfile" type="hidden" value="' + window.opener.document.resultsform.resultsfile.value + '">');
-</script>
-<input type="hidden" name="textarea">
-</form>
-
-<script TYPE="text/javascript">
-saveURI();
-setTimeout("constructResults();", 3000);
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/nsIWebBrowserPersistTest2.txt b/embedding/qa/jstests/nsIWebBrowserPersistTest2.txt
deleted file mode 100644
index 15de75aca7a..00000000000
--- a/embedding/qa/jstests/nsIWebBrowserPersistTest2.txt
+++ /dev/null
@@ -1,200 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIWebBrowserPersist Interface Test</title>
-<!--
-     Descrpt: This Test Case tests saveDocument method.
-     Author: dsirnapalli@netscape.com
-     Revs: 10.03.01 - Created
-     Last Run On: 10.24.01.
--->
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   dsirnapalli@netscape.com
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<head>
-
-<!-- script below is ngdriverspecific  -->
-<script TYPE="text/javascript" SRC="http://bubblegum/ngdriver/suites/testlib.js">
-</script>
-
-<script TYPE="text/javascript">
-file = "c:\\test2.htm";
-data = "c:\\test2_data";
-astatus = new Array();
-i = 0;
-
-function saveDocument()
-{
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    localFile = Components.classes["@mozilla.org/file/local;1"]
-               .createInstance(Components.interfaces.nsILocalFile);
-    localFile.initWithPath(file)
-
-    dataPath = Components.classes["@mozilla.org/file/local;1"]
-              .createInstance(Components.interfaces.nsILocalFile)
-    dataPath.initWithPath(data)
-
-    persistListener = new PersistProgressListener;
-    persist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
-             .createInstance(Components.interfaces.nsIWebBrowserPersist);
-
-    persist.progressListener = persistListener;
-    persist.saveDocument(document, localFile, dataPath);
-    //persist.cancelSave();
-  }
-  catch(e) {
-    alert("Exception: " + e);
-  }
-}
-
-function setStatus(text)
-{
-  astatus[i] = text;
-  i++;
-}
-
-function setProgress(current, max)
-{
-  progress = current + " out of " + max;
-}
-
-function PersistProgressListener()
-{
-  this.init();
-}
-
-PersistProgressListener.prototype =
-{
-  QueryInterface : function(aIID)
-  {
-    if(aIID.equals(Components.interfaces.nsIWebProgressListener))
-      return this;
-    throw Components.results.NS_NOINTERFACE;
-  },
-
-  init : function()
-  {
-  },
-
-  destroy : function()
-  {
-  },
-
-  // nsIWebProgressListener
-  onProgressChange : function (aWebProgress, aRequest,
-                               aCurSelfProgress, aMaxSelfProgress,
-                               aCurTotalProgress, aMaxTotalProgress)
-  {
-    setProgress(aCurTotalProgress, aMaxTotalProgress);
-  },
-
-  onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
-  {
-  },
-
-  onLocationChange : function(aWebProgress, aRequest, aLocation)
-  {
-  },
-
-  onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage)
-  {
-    setStatus(aMessage);
-  },
-
-  onSecurityChange : function(aWebProgress, aRequest, aState)
-  {
-  }
-}
-
-function constructResults()
-{
-  var results = "";
-  results = results + "<html><br>";
-  results = results + "<b><u> Interface:nsIWebBrowserPersist</u></b><br>";
-  results = results + "<b><u>Method:saveDocument()</u></b><br><br>";
-  results = results + "<b> Result: </b><br>";
-  results = results + "If " + "<b>" + file + "</b>" + " exist physically and " + "<b><br>";
-  results = results + "If " + data + "</b>" + " exist physically and if " + data +
-                      " contains file1_htm, testlib.js, file_1.data folder then the Result is Pass" +  "<br><br>";
-  results = results + "<b> Status: </b><br>";
-  for(i=0;i<astatus.length;i++)
-    results = results + astatus[i] + "<br>";
-  results = results + "<br>";
-  results = results + "<b> Progress: </b><br>";
-  results = results + progress + "<br>";
-  results = results + "</html>";
-
-  displayResults(results);
-}
-
-function displayResults(results)
-{
-  document.results.textarea.value = results;
-  if (top.name == "testWindow")
-  {
-    fixSubmit();
-  }
-  else
-  {
-    document.write(document.results.textarea.value);
-  }
-}
-
-</script>
-</head>
-<body>
-
-<!-- form below is ngdriverspecific  -->
-<form name="results" action="/ngdriver/cgi-bin/writeresults.cgi" method="post">
-<script TYPE="text/javascript">
-document.write('<input name="resultsfile" type="hidden" value="' + window.opener.document.resultsform.resultsfile.value + '">');
-</script>
-<input type="hidden" name="textarea">
-</form>
-
-<p>This is nsIWebBrowserPersist Interface test case</p>
-<p>This is the IFRAME used for testing</p>
-<iframe id="frame1" width="100%" height="480" src="http://www.mozilla.org/"/>
-
-<script TYPE="text/javascript">
-setTimeout("saveDocument();", 2000);
-setTimeout("constructResults();", 5000);
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/nsIWebBrowserPersistTest3.txt b/embedding/qa/jstests/nsIWebBrowserPersistTest3.txt
deleted file mode 100644
index 02db698634a..00000000000
--- a/embedding/qa/jstests/nsIWebBrowserPersistTest3.txt
+++ /dev/null
@@ -1,204 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is Netscape Communications
-   - Corp.  Portions created by Netscape Communications Corp. are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   -
-   - Contributor(s):
-   -   dsirnapalli@netscape.com.
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> nsIWebBrowserPersist Interface Test</title>
-<!-- Descrpt: This Test Case tests the attribute persistFlags.
-     Author: dsirnapalli@netscape.com
-     Revs: 10.03.01 - Created
-     Last Run On: 10.24.01.
-  -->
-
-<head>
-
-<!-- script below is ngdriverspecific  -->
-<script TYPE="text/javascript" SRC="http://bubblegum/ngdriver/suites/testlib.js">
-</script>
-
-<script TYPE="text/javascript">
-file = "c:\\test3.htm";
-data = "c:\\test3_data";
-astatus = new Array();
-i = 0;
-
-function saveDocument()
-{
-  try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    localFile = Components.classes["@mozilla.org/file/local;1"]
-               .createInstance(Components.interfaces.nsILocalFile);
-    localFile.initWithPath(file)
-
-    dataPath = Components.classes["@mozilla.org/file/local;1"]
-              .createInstance(Components.interfaces.nsILocalFile)
-    dataPath.initWithPath(data)
-
-    persistListener = new PersistProgressListener;
-    persist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
-             .createInstance(Components.interfaces.nsIWebBrowserPersist);
-
-    persist.progressListener = persistListener;
-    persist.persistFlags = persist.PERSIST_FLAGS_IGNORE_IFRAMES;
-    persist.saveDocument(document, localFile, dataPath);
-  }
-  catch(e) {
-    alert("Exception: " + e);
-  }
-}
-
-function setStatus(text)
-{
-  astatus[i] = text;
-  i++;
-}
-
-function setProgress(current, max)
-{
-  progress = current + " out of " + max;
-}
-
-function PersistProgressListener()
-{
-  this.init();
-}
-
-PersistProgressListener.prototype =
-{
-  QueryInterface : function(aIID)
-  {
-    if(aIID.equals(Components.interfaces.nsIWebProgressListener))
-      return this;
-    throw Components.results.NS_NOINTERFACE;
-  },
-
-  init : function()
-  {
-  },
-
-  destroy : function()
-  {
-  },
-
-  // nsIWebProgressListener
-  onProgressChange : function (aWebProgress, aRequest,
-                               aCurSelfProgress, aMaxSelfProgress,
-                               aCurTotalProgress, aMaxTotalProgress)
-  {
-    setProgress(aCurTotalProgress, aMaxTotalProgress);
-  },
-
-  onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
-  {
-  },
-
-  onLocationChange : function(aWebProgress, aRequest, aLocation)
-  {
-  },
-
-  onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage)
-  {
-    setStatus(aMessage);
-  },
-
-  onSecurityChange : function(aWebProgress, aRequest, aState)
-  {
-  }
-}
-
-function constructResults()
-{
-  var results = "";
-  results = results + "<html><br>";
-  results = results + "<b><u> Interface:nsIWebBrowserPersist</u></b><br>";
-  results = results + "<b><u>Method:saveDocument() & Attribute:persistFlags</u></b><br>";
-  results = results + "persistFlags is set to ignore IFRAME content,"
-                    + " so no information regarding IFRAME is saved physically." + "<br><br>";
-  results = results + "<b> Result: </b><br>";
-  results = results + "If " + "<b>" + file + "</b>" + " exist physically and " + "<b><br>";
-  results = results + "If " + data + "</b>" + " exist physically and if " + data +
-                      " contains only testlib.js then the Result is Pass" +  "<br><br>";
-
-
-  results = results + "<b> Status: </b><br>";
-  for(i=0;i<astatus.length;i++)
-    results = results + astatus[i] + "<br>";
-  results = results + "<br>";
-  results = results + "<b> Progress: </b><br>";
-  results = results + progress + "<br>";
-  results = results + "</html>";
-
-  displayResults(results);
-}
-
-function displayResults(results)
-{
-  document.results.textarea.value = results;
-  if (top.name == "testWindow")
-  {
-    fixSubmit();
-  }
-  else
-  {
-    document.write(document.results.textarea.value);
-  }
-}
-
-</script>
-</head>
-<body>
-
-<!-- form below is ngdriverspecific  -->
-<form name="results" action="/ngdriver/cgi-bin/writeresults.cgi" method="post">
-<script TYPE="text/javascript">
-document.write('<input name="resultsfile" type="hidden" value="' + window.opener.document.resultsform.resultsfile.value + '">');
-</script>
-<input type="hidden" name="textarea">
-</form>
-
-<p>This is nsIWebBrowserPersist Interface test case</p>
-<p>This is the IFRAME used for testing</p>
-<iframe id="frame1" width="100%" height="480" src="http://www.mozilla.org/"/>
-
-<script TYPE="text/javascript">
-setTimeout("saveDocument();", 2000);
-setTimeout("constructResults();", 5000);
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/plugins.txt b/embedding/qa/jstests/plugins.txt
deleted file mode 100644
index a32c697777d..00000000000
--- a/embedding/qa/jstests/plugins.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<title> Installed Plugins </title>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<!-- Descrpt: This test case is part of Component List Test
-     Author: dsirnapalli@netscape.com
-     Revs: 10.12.01 - Created -->
-
-<head>
-
-<!-- script below is ngdriverspecific  -->
-<script TYPE="text/javascript" SRC="testlib.js">
-</script>
-
-<script TYPE="text/javascript">
-function getPlugins()
-{
-  var res="";
-
-  //Enumerate all plug-ins
-  //First, refresh plugins in case anything has been changed recently in prefs:                        -->
-  //(The "false" argument tells refresh not to reload or activate any plugins that would       -->
-  //be active otherwise.In contrast,one would use "true" in the case of ASD instead of      -->
-  //restarting)                                                                                                                                                        -->
-  navigator.plugins.refresh(false);
-  numPlugins = navigator.plugins.length;
-
-  res = res + '<b><h3><font color="#CC6600"> Plugins </font></h3></b>' + '\n';
-  res = res + 'To Go Back to Components Page ';
-  res = res + '<a href="ComponentListTest.html">Click here</a>';
-  res = res + '<br>';
-
-  if(numPlugins > 0)
-    res = res + "<b><h3> Installed plug-ins </h3></b><br>";
-  else
-    res = res + "<b><font size=+2>No plug-ins are installed.</font></b><br>";
-
-  for (i = 0;i < numPlugins;i++)
-  {
-    plugin = navigator.plugins[i];
-    res = res + "<center><font size=+1><b>" + plugin.name + "</b></font></center><br>";
-    res = res + "<dl><dd>File name:" + plugin.filename;
-    res = res + "    <dd><br>" + plugin.description;
-    res = res + "</dl><p>";
-
-    res = res + "<table width=100% border=2 cellpadding=5>";
-    res = res + "<tr><th width=20%><font size=-1>Mime Type</font></th>";
-    res = res + "<th width=50%><font size=-1>Description</font></th>";
-    res = res + "<th width=20%><font size=-1>Suffixes</font></th>";
-    res = res + "<th><font size=-1>Enabled</th></tr>"
-
-    numTypes = plugin.length;
-
-    for (j = 0;j < numTypes;j++)
-    {
-      mimetype = plugin[j];
-      if (mimetype)
-      {
-        enabled = "No";
-        enabledPlugin = mimetype.enabledPlugin;
-        if (enabledPlugin && (enabledPlugin.name == plugin.name))
-          enabled = "Yes";
-
-        res = res + "<tr align=center>";
-        res = res + " <td>" + mimetype.type + "</td>";
-        res = res + " <td>" + mimetype.description + "</td>";
-        res = res + " <td>" + mimetype.suffixes + "</td>";
-        res = res + " <td>" + enabled + "</td>";
-        res = res + "</tr>";
-      }
-    }
-    res = res + "</table><p><hr><p>";
-  }
-  res = res + 'To Go Back to Components Page ';
-  res = res + '<a href="ComponentListTest.html">Click here</a>';
-  res = res + '<br>';
-  return res;
-}
-</script>
-
-<script TYPE="text/javascript">
-function displayResults(results)
-{
-  document.results.textarea.value = results;
-  if (top.name == "testWindow")
-  {
- 	fixSubmit();
-  }
-  else
-  {
-  	document.write(document.results.textarea.value);
-  }
-}
-</script>
-
-</head>
-<body>
-
-<!-- form below is ngdriverspecific  -->
-<form name="results" action="/ngdriver/cgi-bin/writeresults.cgi" method="post">
-<script TYPE="text/javascript">
-document.write('<input name="resultsfile" type="hidden" value="' + window.opener.document.resultsform.resultsfile.value + '">');
-</script>
-<input type="hidden" name="textarea">
-</form>
-
-<script TYPE="text/javascript">
-var result = "";
-pluginres = getPlugins();
-result = result + pluginres;
-displayResults(result);
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/profile/nsiprofile.html b/embedding/qa/jstests/profile/nsiprofile.html
deleted file mode 100644
index a3ab2bcf8dd..00000000000
--- a/embedding/qa/jstests/profile/nsiprofile.html
+++ /dev/null
@@ -1,343 +0,0 @@
-<html>
-
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -        Ashish Bhatt <ashishbhatt@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<title>nsIProfile Tets case</title>
-
-<head>
-
-<script type="text/javascript" src="../jslib/bridge.js"></script>
-<script type="text/javascript">
-
-var gPropObject ;
-var buffer ;
-const SHUTDOWN_PERSIST      = 0x00000001;
-const SHUTDOWN_CLEANSE      = 0x00000002;
-
-function getProfileObject()
-{
-
-	if (gPropObject)
-	   return gPropObject ;
-
-	try{
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		var profile = Components.classes["@mozilla.org/profile/manager;1"].getService();
-		gPropObject = profile.QueryInterface(Components.interfaces.nsIProfile);
-
-		return gPropObject ;
-	 }
-	 catch(e){
-		if (isRunningStandalone())
-			alert("Exception: " + e);
-		else
-			WriteResults("Exception: " + e);
-	  }
-
-}
-
-function WritePassFail(aValue,e)
-{
-
-  if( aValue ==  "Pass")
-  {
-	  buffer += "<td>"+ e +"</td>" ;
-	  buffer += "<td>Pass</td>"
-  }
-  else
-  {
-	  buffer += "<td>" +"Exception: " + e + "</td>" ;
-	  buffer += "<td bgcolor='#FF0000'>Fail</td>"
-  }
-
-  buffer += "</tr>"
-
-}
-
-function RunAllTests()
-{
-	// "<td bgcolor='#FF0000'>
-
-	buffer = "<b>Results for <a href='http://lxr.mozilla.org/seamonkey/source/profile/public/nsIProfile.idl'>nsIProfile :</a></b><br><br>"
-	buffer += "<table border cols=4 width='70%'>"
-	buffer += "<tr>"
-	buffer += "<td><b>Property/Method</b></td>"
-	buffer += "<td><b>Params</b></td>"
-	buffer += "<td><b>Output/Bug/Error</b></td>"
-	buffer += "<td><b>Result</b></td>"
-	buffer += "</tr>"
-
-	GetProfileCount();
-	GetCurrentProfile();
-	SetCurrentProfile();
-	GetProfileList();
-	GetProfileExists();
-	CreateNewProfile();
-	CloneProfile();
-	RenameProfile();
-	DeleteProfile();
-	ShutDownCurrentProfile();
-
-
-	buffer += "</table>"
-	if (isRunningStandalone())
-	{
-	   document.clear();
-	   document.write(buffer);
-	}
-	else
-		WriteResults(buffer);
-
-
-
-}
-
-function GetProfileCount()
-{
-
-	var prop = getProfileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>profileCount</td>"
-	buffer += "<td>none</td>"
-
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		var  count = prop.profileCount ;
-		WritePassFail("Pass","Profile Count: " + count);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function GetCurrentProfile()
-{
-   var prop = getProfileObject();
-	buffer += "<tr>"
-	buffer += "<td>currentProfile(get)</td>"
-	buffer += "<td>none</td>"
-   try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		var currentprofile = prop.currentProfile;
-		WritePassFail("Pass","Current Profile : " + currentprofile);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function SetCurrentProfile()
-{
-	var prop = getProfileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>currentProfile (set)</td>"
-	buffer += "<td>profileName</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		prop.currentProfile = prop.currentProfile;
-		WritePassFail("Pass","");
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function GetProfileList()
-{
-	var prop = getProfileObject();
-	buffer += "<tr>"
-	buffer += "<td>getProfileList()</td>"
-	buffer += "<td>Name</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-        var length = {value:0};
-
-		var profilelist = prop.getProfileList(length);
-		WritePassFail("Pass","Profile list:" +  profilelist);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-
-function GetProfileExists()
-{
-	var prop = getProfileObject();
-	buffer += "<tr>"
-	buffer += "<td>profileExists </td>"
-	buffer += "<td>profilename</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		var profileexists  = prop.profileExists("default");
-		WritePassFail("Pass","'default' exists : " + profileexists);
-	 }
-	 catch(e){
-			WritePassFail("Fail",e);
-	  }
-}
-
-
-function CreateNewProfile()
-{
-	var prop = getProfileObject();
-	buffer += "<tr>"
-	buffer += "<td>createNewProfile() </td>"
-	buffer += "<td>profilename</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		prop.createNewProfile("nsIProfileTesting",null,null, true);
-		WritePassFail("Pass","Created new Profile: nsIProfileTesting");
-	 }
-	 catch(e){
-			WritePassFail("Fail",e);
-	  }
-}
-
-function RenameProfile()
-{
-	var prop = getProfileObject();
-	buffer += "<tr>"
-	buffer += "<td>renameProfile()</td>"
-	buffer += "<td>profilename</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		prop.renameProfile("nsIProfileTesting","nsIProfileTestingNew");
-		WritePassFail("Pass","Renamed Profile to: nsIProfileTestingNew");
-	 }
-	 catch(e){
-			WritePassFail("Fail",e);
-	  }
-}
-
-function DeleteProfile()
-{
-	var prop = getProfileObject();
-	buffer += "<tr>"
-	buffer += "<td>deleteProfile()</td>"
-	buffer += "<td>profilename, candeletefiles</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		prop.deleteProfile("nsIProfileTestingNew", true);
-		WritePassFail("Pass","deleted Profile: nsIProfileTestingNew");
-	 }
-	 catch(e){
-			WritePassFail("Fail",e);
-	  }
-}
-
-function CloneProfile()
-{
-	var prop = getProfileObject();
-	buffer += "<tr>"
-	buffer += "<td>cloneProfile()</td>"
-	buffer += "<td>profilename</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		var currentprofile = prop.currentProfile;
-		prop.cloneProfile("nsIProfileTesting");
-		WritePassFail("Pass","Cloned Profile: nsIProfileTesting");
-	 }
-	 catch(e){
-			WritePassFail("Fail",e);
-	  }
-}
-
-function ShutDownCurrentProfile()
-{
-	var prop = getProfileObject();
-	buffer += "<tr>"
-	buffer += "<td>shutDownCurrentProfile()</td>"
-	buffer += "<td>shutDownType</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		//prop.shutDownCurrentProfile(SHUTDOWN_PERSIST);
-		WritePassFail("Pass","Only works with browsers supporting on the fly profile switching");
-	 }
-	 catch(e){
-			WritePassFail("Fail",e);
-	  }
-}
-
-
-</script>
-
-</head>
-
-<body>
-<script type="text/javascript">
-   RunAllTests();
-</script>
-</body>
-
-</html>
-
diff --git a/embedding/qa/jstests/sHistory/NsISHistoryTestCase1.html b/embedding/qa/jstests/sHistory/NsISHistoryTestCase1.html
deleted file mode 100644
index 1af10247595..00000000000
--- a/embedding/qa/jstests/sHistory/NsISHistoryTestCase1.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<html>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML ANCHOR Node
-     Author: depstein@netscape.com
-     Last Updated:09.18.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-<title> nsISHistory Interface Test Case </title>
-<script TYPE="text/javascript" SRC="nsISHistoryTestLib.js"></script>
-<script TYPE="text/javascript">
-
-var urlList = ["http://www.intel.com",
-               "http://www.yahoo.com",
-               "http://www.mozilla.org"
-                ];
-var cnt = 0;
-var testWin = null;
-var sHistory = null;
-var count = 0;
-var index = 0;
-var maxLength = 100;
-
-testWin = window.open('about:blank', "testWin");
-setTimeout("loadPages();", 2000);
-
-function loadPages()
-{
-
-  var urlTotal = urlList.length;
-  var initTime = 10000;
-
-  callSHistInit(cnt);
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  // Load pages sequentially in the child window
-
-   testWin.location = urlList[cnt++];
-
-   if (cnt == urlTotal)
-      setTimeout("sHistoryTests()", 5000);
-   else
-      setTimeout("loadPages()", 6000);
-
-}
-
-function callSHistInit(cnt)
-{
-  // Calls the sHistoryInit() function to create sHistory object
-  if (cnt == 0)
-	 sHistory = sHistoryInit(testWin);
-}
-
-function sHistoryTests()
-{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-
-  // begins testing session history interface;
-  if (!sHistory)
-  {
-    alert("Unable to get session history");
-    return;
-  }
-
-  alert("Testing nsISHistory interfaces\n");
-
-  count = testHistoryCount(sHistory);	 // GetCount()
-  alert("global count: " + count);
-
-  index = testHistoryIndex(sHistory);	 // GetIndex()
-  alert ("global index: " + index);
-
-  maxLength = testMaxLength(sHistory);	 // GetMaxLength()
-  alert ("global maxLength: " + maxLength);
-
-  // Test GetEntryAtIndex()
-	 for(cnt = 0; cnt < count; cnt++) {
-	   entry = testGetEntryAtIndex(sHistory, cnt, false);
-	   if (entry)
-		 alert("GetEntryAtIndex() Valid, cnt =  " + cnt);
-	   else
-		 alert("GetEntryAtIndex() Invalid, cnt = " + cnt);
-	 }   // for
-
-	 // Test the enumerator
-	 var simpleEnum = testSimpleEnum(sHistory);	// Get simple enumerator
-	 alert("global simpleEnum: " + simpleEnum);
-	 if (simpleEnum) {
-		var enumCnt = 0;
-		while (simpleEnum.hasMoreElements())
-		{
-			nextObj = simpleEnum.getNext();
-			alert("global nextObj: " + nextObj);
-			if (!nextObj)
-			  continue;
-			nextHE = nextObj.QueryInterface(Components.interfaces.nsIHistoryEntry);
-			alert("global nextHE: " + nextHE);
-			if (!nextHE)
-			  continue;
-		    testHistoryEntry(nextHE, enumCnt);
-		    enumCnt++;
-		}  // while
-	 }   // if simplenum
-
-}
-
-</script>
-</head>
-<body>
-<script TYPE="text/javascript">
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/sHistory/NsISHistoryTestCase1.txt b/embedding/qa/jstests/sHistory/NsISHistoryTestCase1.txt
deleted file mode 100644
index c616257ce8d..00000000000
--- a/embedding/qa/jstests/sHistory/NsISHistoryTestCase1.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   depstein@netscape.com (original author)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<html>
-<head>
-<title> nsISHistory Interface Test Case </title>
-<script TYPE="text/javascript" SRC="nsISHistoryTestLib.js"></script>
-<script TYPE="text/javascript">
-
-var urlList = ["http://www.intel.com",
-               "http://www.yahoo.com",
-               "http://www.mozilla.org"
-                ];
-var cnt = 0;
-var testWin = null;
-var sHistory = null;
-var count = 0;
-var index = 0;
-var maxLength = 100;
-
-testWin = window.open('about:blank', "testWin");
-setTimeout("loadPages();", 2000);
-
-function loadPages()
-{
-
-  var urlTotal = urlList.length;
-  var initTime = 10000;
-
-  callSHistInit(cnt);
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  // Load pages sequentially in the child window
-
-   testWin.location = urlList[cnt++];
-
-   if (cnt == urlTotal)
-      setTimeout("sHistoryTests()", 5000);
-   else
-      setTimeout("loadPages()", 6000);
-
-}
-
-function callSHistInit(cnt)
-{
-  // Calls the sHistoryInit() function to create sHistory object
-  if (cnt == 0)
-	 sHistory = sHistoryInit(testWin);
-}
-
-function sHistoryTests()
-{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-
-  // begins testing session history interface;
-  if (!sHistory)
-  {
-    alert("Unable to get session history");
-    return;
-  }
-
-  alert("Testing nsISHistory interfaces\n");
-
-  count = testHistoryCount(sHistory);	 // GetCount()
-  alert("global count: " + count);
-
-  index = testHistoryIndex(sHistory);	 // GetIndex()
-  alert ("global index: " + index);
-
-  maxLength = testMaxLength(sHistory);	 // GetMaxLength()
-  alert ("global maxLength: " + maxLength);
-
-  // Test GetEntryAtIndex()
-	 for(cnt = 0; cnt < count; cnt++) {
-	   entry = testGetEntryAtIndex(sHistory, cnt, false);
-	   if (entry)
-		 alert("GetEntryAtIndex() Valid, cnt =  " + cnt);
-	   else
-		 alert("GetEntryAtIndex() Invalid, cnt = " + cnt);
-	 }   // for
-
-	 // Test the enumerator
-	 var simpleEnum = testSimpleEnum(sHistory);	// Get simple enumerator
-	 alert("global simpleEnum: " + simpleEnum);
-	 if (simpleEnum) {
-		var enumCnt = 0;
-		while (simpleEnum.hasMoreElements())
-		{
-			nextObj = simpleEnum.getNext();
-			alert("global nextObj: " + nextObj);
-			if (!nextObj)
-			  continue;
-			nextHE = nextObj.QueryInterface(Components.interfaces.nsIHistoryEntry);
-			alert("global nextHE: " + nextHE);
-			if (!nextHE)
-			  continue;
-		    testHistoryEntry(nextHE, enumCnt);
-		    enumCnt++;
-		}  // while
-	 }   // if simplenum
-
-}
-
-</script>
-</head>
-<body>
-<script TYPE="text/javascript">
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/embedding/qa/jstests/sHistory/SHListenerTest.html b/embedding/qa/jstests/sHistory/SHListenerTest.html
deleted file mode 100644
index 4ccc5029e48..00000000000
--- a/embedding/qa/jstests/sHistory/SHListenerTest.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-<title>SessionHistory.html</title>
-<!-- Descrpt: test Session History interfaces
-     Author: radha@netscape.com
-     Revs: 06.27.01 - Created
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   depstein@netscape.com
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<script TYPE="text/javascript" SRC="nsISHistoryTestLib.js">
-</script>
-
-<script TYPE="text/javascript" SRC="nsISHListenerTestLib.js">
-</script>
-
-<script TYPE="text/javascript">
-
-// *** Variables ***
-var results = null;
-var SHListener=null;
-var debug = 1;
-var testWin=null;
-var updateInfo="<p>Creating New window ....<br>";
-
-var cnt = 0;
-var urlList = ["file://D|/Embed-info/scripts/nsISHistory/loadHistoryPage.html",
-		"http://www.intel.com",
-               "http://www.yahoo.com",
-               "http://www.mozilla.org",
-               "http://www.mozilla.org/newsbot",
-               "http://www.cisco.com"
-               ];
-// Variables to verify if the callbacks are invoked properly
-var backCallback = false;
-var forwardCallback = false;
-var reloadCallback = false;
-var gotoCallback = false;
-var purgeCallback = false;
-var histLenInChild = 0;
-
-
-function ddump(s)
-{
-   if (debug==1) {
-     t = s + "\n";
-     dump(t);
-   }
-   else if (debug==2)
-     alert(s);
-}
-
-function startTestcase()
-{
-   results = "<p> About to create new child window ...<br></p>";
-   loadPages();
-}
-
-function loadPages()
-{
-  ddump("In loadPages");
-  alert("cnt = " + cnt);
-  alert("the uri = " + urlList[cnt]);
-
-  /* Load pages sequentially in the child window
-   * The first url will set up the listener
-   * The last url will test nsISHistory
-   */
-
-   if (cnt == 0) {
-      testWin = window.open(urlList[cnt++], "testWin");
-      testWin.onLoad = myLoadFunction();
-   }
-   else
-      testWin.location = urlList[cnt++];
-
-   uriTotal = urlList.length;
-   if (cnt == (uriTotal - 1)) {
-      DoWebNavigationInChild();	// includes loading last page
-   }
-   else {
-     ddump("calling SetTimeOut again");
-     setTimeout("loadPages()", 6000);
-   }
-}
-
-function myLoadFunction()
-{
-   setTimeout("SetListenerInChild()", 6000);
-}
-
-function DoWebNavigationInChild()
-{
-   // Trigger History operations
-   setTimeout("GoBackInChild()", 5000);
-}
-
-function GoBackInChild()
-{
-   ddump("Inside GoBackInChild");
-   if (testWin) {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      testWin.history.back();
-      setTimeout("GoForwardInChild()", 6000);
-   }
-}
-
-function GoForwardInChild()
-{
-   ddump("Inside GoForwardInChild");
-   if (testWin) {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      testWin.history.forward();
-      setTimeout("DoReloadInChild()", 6000);
-   }
-}
-
-function DoReloadInChild()
-{
-   ddump("Inside DoReloadInChild");
-   if (testWin) {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
- 	  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-      testWin.location.reload();
-      setTimeout("GotoIndexInChild(-1)", 6000);
-   }
-}
-
-
-function GotoIndexInChild(index)
-{
-   ddump("Inside GotoIndexInChild; index = " + index);
-   if (testWin) {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      testWin.history.go(index);
-      setTimeout("LoadLastPageInChild()", 5000);
-   }
-}
-
-function LoadLastPageInChild()
-{
-   ddump("Inside LoadLastPageInChild");
-   if (testWin) {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      // Load the last page in the child window
-      testWin.location.href = urlList[cnt];
-      setTimeout("PurgeHistoryInChild()", 6000);
-   }
-}
-
-function PurgeHistoryInChild()
-{
-    ddump("Inside PurgeHistoryInChild");
-    if (testWin) {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      histLenInChild = testWin.history.length;
-
-      // Purge all history entries in the child window.
-      if (histLenInChild >0) {
-         netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-      sHistory = sHistoryInit(testWin);
- 	  purgeEntries(sHistory, histLenInChild);
-      }
-    }
-       ddump("End of script.");
-}
-
-
-// Called back by the child to set listener object in it.
-function SetListenerInChild()
-{
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    sHListener = new sessionHistoryListener();
-    ddump("in SHListenerTest.html: sHistoryListener object = " + sHListener);
-    testWin.SetListener(sHListener);
-}
-
-</script>
-</head>
-
-<body>
-<form name="results" action="/ngdriver/cgi-bin/writeresults.cgi" method="post">
-
-<textarea cols=60 rows=10 name="textarea">
-</TEXTAREA>
-</form>
-
-<script TYPE="text/javascript">
-   setTimeout("startTestcase()", 3000);
-</script>
-
-<p>
- This is test case for Session History Listener. <br>
-
-
-</body>
-</html>
-
diff --git a/embedding/qa/jstests/sHistory/loadHistoryPage.html b/embedding/qa/jstests/sHistory/loadHistoryPage.html
deleted file mode 100644
index dc38f7c1f23..00000000000
--- a/embedding/qa/jstests/sHistory/loadHistoryPage.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-<title>loadHistoryPage</title>
-
-<! -- called from SHListenerTest.html.
-   -- Sets the sHistory listener, and purges sHistory.
-   -->
-
-
-<script TYPE="text/javascript" src="nsISHistoryTestLib.js">
-</script>
-</head>
-<body>
-
-<script TYPE="text/javascript">
-
-var tc ;
-var debug=1;
-
-function SetListener(listener)
-{
-   sHistory = sHistoryInit(window);	// js window
-   ddump("loadHistoryPage.html: session history object = " + sHistory + "\n About to set listener\n");
-   setSHistoryListener(sHistory, listener);
-}
-
-function ddump(s)
-{
-   if (debug==1)
-     dump(s);
-   else if (debug==2)
-     alert(s);
-}
-
-function purgeTheEntries(entries)
-{
-   sHistory = sHistoryInit(window);  // js window
-   ddump("session history object = " + sHistory + "\n About to purge history.\n");
-   purgeEntries(sHistory, entries);
-}
-
-</script>
-Loading Session History Listener testcase
-</body>
-</html>
-
diff --git a/embedding/qa/jstests/sHistory/nsISHListenerTestLib.js b/embedding/qa/jstests/sHistory/nsISHListenerTestLib.js
deleted file mode 100644
index 8229be189dc..00000000000
--- a/embedding/qa/jstests/sHistory/nsISHListenerTestLib.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator Test Cases..
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   radha@netscape.com (original author)
- *   depstein@netscape.com
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/********************************************************
-nsISHistoryListener object
-*********************************************************/
-
-function sessionHistoryListener()
-{
-   ddump("In sessionHistoryListener constructor\n");
-   this.interfaceName = "nsISHistoryListener";
-
-}
-
-// implementations of SHistoryListener methods
-sessionHistoryListener.prototype =
-{
-    result: "",
-    debug: 1,
-
-    QueryInterface: function(aIID)
-    {
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-        if (aIID.equals(Components.interfaces.nsISHistoryListener) ||
-            aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
-            aIID.equals(Components.interfaces.nsISupports))
-            return this;
-
-        throw Components.results.NS_ERROR_NO_INTERFACE;
-    },
-
-    OnHistoryNewEntry: function(newUrl)
-    {
-       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-       uriSpec = newUrl.spec;
-
-       ddump("In OnHistoryNewEntry(). uriSpec = " + uriSpec + "\n");
-    },
-
-    OnHistoryGoBack: function(uri)
-    {
-       uriSpec = uri.spec;
-
-       ddump("In OnHistoryGoBack(). uriSpec = " + uriSpec + "\n");
-       backCallback = true;
-       return true;
-    },
-
-    OnHistoryGoForward: function(uri)
-    {
-       uriSpec = uri.spec;
-
-       ddump("In OnHistoryGoForward(). uriSpec = " + uriSpec + "\n");
-       forwardCallback = true;
-       return true;
-    },
-
-    OnHistoryReload: function(uri, reloadFlags)
-    {
-       uriSpec = uri.spec;
-
-       ddump("In OnHistoryReload(). uriSpec = " + uriSpec + "\n");
-       ddump("In OnHistoryReload(). reloadFlags = " + reloadFlags + "\n");
-       reloadCallback = true;
-       return true;
-    },
-
-    OnHistoryGotoIndex: function(index, uri)
-    {
-       uriSpec = uri.spec;
-
-       ddump("In OnHistoryGotoIndex(). uriSpec = " + uriSpec + "\n");
-       ddump("In OnHistoryGotoIndex(). index = " + index + "\n");
-       gotoCallback = true;
-       return true;
-    },
-
-    OnHistoryPurge: function(numEntries)
-    {
-       ddump("In OnHistoryPurge(). numEntries = " + numEntries + "\n");
-       purgeCallback = true;
-       return true;
-    },
-
-    ddump: function(s)
-    {
-       if (debug ==1)
-          dump(s);
-       else if (debug==2)
-          alert(s);
-    }
-}
-
-
diff --git a/embedding/qa/jstests/sHistory/nsISHistoryTestLib.js b/embedding/qa/jstests/sHistory/nsISHistoryTestLib.js
deleted file mode 100644
index 9bcba258f9e..00000000000
--- a/embedding/qa/jstests/sHistory/nsISHistoryTestLib.js
+++ /dev/null
@@ -1,259 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Radha Kulkarni <radha@netscape.com>
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// nsISHistoryTestLib.js is a JavaScript library containing methods for
-// testing of nsISHistory (session history) and nsIHistoryEntry interfaces. 
-// See nsISHistoryTestCase1.html (located in the same folder) for examples 
-// of how to use these methods.
-
-// ***************************************************************************
-// sHistoryInit() creates and returns the session history object. 
-function sHistoryInit(theWindow)
-{
-  var sHistory = null;
-  var ifaceReq;
-  var webNav;
-  
-  try
-  {       
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");       
-  
-    try {
-       ifaceReq = theWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
-    }
-    catch(e){
-       alert("Unable to get interface requestor object: " + e);
-       return null;
-    }
-    try {
-       webNav = ifaceReq.getInterface(Components.interfaces.nsIWebNavigation);
-    }
-    catch(e) {
-      alert("Unable to get WebNavigation: " + e);
-      return null;
-    }               
-    try {
-       sHistory = webNav.sessionHistory;
-    }
-    catch(e) {
-      alert("Didn't get SessionHistory object: " + e);
-      return null;
-    } 
-    return sHistory;
-  }
-  catch(e) 
-  {
-    alert("Could not find Session History component: " + e);
-    return null;
-  }
-}
-
-// *************************************************************************
-// testHistoryCount() returns the number of entries in the session history.
-// It accepts the session history object as the input parameter.
-function testHistoryCount(sHistory)
-{
-  if (!sHistory) {
-    alert("Didn't get SessionHistory object");
-    return 0;
-  }
-  var cnt = sHistory.count;     // GetCount() 
-  return cnt; 
-}
-
-// *************************************************************************
-// testHistoryIndex() returns the current session history index.
-// returns negative one if the history object is null.
-// It accepts the session history object as the input parameter.
-// In your test script, 
-function testHistoryIndex(sHistory)
-{
-  if (!sHistory) {
-    alert("Didn't get SessionHistory object");
-    return -1;
-  }
-  var shIndex = sHistory.index;   // GetIndex()
-  return shIndex;
-}
-
-// *************************************************************************
-// testMaxLength() returns the maximum number of session history entries.
-// It accepts the session history object as the input parameter.
-function testMaxLength(sHistory)
-{
-  if (!sHistory) {
-    alert("Didn't get SessionHistory object");
-    return 0;
-  }
-  var maxLen = sHistory.maxLength;  // GetMaxLength
-  return maxLen;
-}
-
-// *************************************************************************
-// testGetEntryAtIndex() returns a referenced entry of the session history.
-// index. It accepts the session history object as the 1st input parameter,
-// a counter to track entries for the 2nd parameter, and a modify index 
-// parameter for the 3rd one (which if 'true' allows the index entry to be
-// modified).
-function testGetEntryAtIndex(sHistory, cnt, modIndex)
-{
-  if (!sHistory) {
-    alert("Didn't get SessionHistory object");
-    return null;
-  }
-  var entry = sHistory.getEntryAtIndex(cnt, modIndex);
-
-  return entry;
-}
-
-// *************************************************************************
-function  testSimpleEnum(sHistory)
-// testSimpleEnum() returns an enumerated list of all the session history
-// entries. It accepts the session history object as the input parameter
-{
-  if (!sHistory) {
-    alert("Didn't get SessionHistory object");
-    return null;
-  }
-   var simpleEnum = sHistory.SHistoryEnumerator;
-   
-   return simpleEnum;
-}
-
-// *************************************************************************
-// testHistoryEntry() obtains the URI string, title, and sub-Frame status
-// of the web page (i.e. whether the web page is in a frame). It accepts
-// the history entry object as the 1st parameter, and the session history
-// index as the 2nd one. 
-function  testHistoryEntry(entry, index)
-{
-  if (!entry)
-    alert("Didn't get history entry object");
-
-   // Get URI for the  next Entry
-   Uri = entry.URI;
-   uriSpec = Uri.spec;
-   dump("The URI = " + uriSpec);
-
-   // Get Title for the nextEntry
-   title = entry.title;
-   dump("The page title = " + title);
-    
-   // Get SubFrame Status for the nextEntry
-   frameStatus = entry.isSubFrame;
-   dump("The subframe value = " + frameStatus);
-}
-
-// *************************************************************************
-// testHistoryEntryUri() returns the URI string for a given index. It accepts
-// the history entry object as the 1st parameter, and the session history
-// index as the 2nd one.
-function  testHistoryEntryUri(nextHE, index)
-{
-  if (!nextHE) {
-    alert("Didn't get history entry object");
-    return null;
-  }
-   // Get URI for the  next Entry
-   Uri = entry.URI;
-   uriSpec = Uri.spec;
-   
-   return uriSpec;
-}
-
-// *************************************************************************
-// testHistoryEntryTitle() returns the web page title for a given index. It accepts
-// the history entry object as the 1st parameter, and the session history
-// index as the 2nd one.
-function  testHistoryEntryTitle(nextHE, index)
-{
-  if (!nextHE) {
-    alert("Didn't get history entry object");
-    return null;
-  }
-   // Get Title for the nextEntry
-   title = entry.title;
-   
-   return title;
-}
-
-// *************************************************************************
-// testHistoryEntryFrame() returns the sub-frame status for a given index. It accepts
-// the history entry object as the 1st parameter, and the session history
-// index as the 2nd one.
-function  testHistoryEntryFrame(nextHE, index)
-{
-  if (!nextHE) {
-    alert("Didn't get history entry object");
-    return null;
-  }
-  // Get SubFrame Status for the nextEntry
-   frameStatus = entry.isSubFrame;
-   
-   return frameStatus;
-}
-  
- // *************************************************************************
-// purgeEntries() purges entries in the session history. It accepts the session
-// history object as the 1st parameter. The 2nd parameter is for the number of
-// entries to purge (it will purge the earliest entries of the session history).
-function purgeEntries(sHistory, numEntries)
-{
-  if (!sHistory) {
-    alert("Didn't get SessionHistory object"); 
-  }         
-  sHistory.PurgeHistory(numEntries);        
-} 
-
-// *************************************************************************
-// setSHistoryListener() adds a session history listener. This enables session
-// history events to be tracked (i.e. url load, forward, back, ...). A listener
-// and the session history object are the input parameters.
-function setSHistoryListener(sHistory, listener)
-{
-  dump("Inside nsISHistoryTestLib.js: setSHistoryListener()");
-  if (!sHistory) {
-    alert("Didn't get SessionHistory object");
-  }
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");       
-    sHistory.addSHistoryListener(listener);
-}
\ No newline at end of file
diff --git a/embedding/qa/jstests/webNav/nsIWebNavTestCase1.html b/embedding/qa/jstests/webNav/nsIWebNavTestCase1.html
deleted file mode 100644
index 052ee8c6911..00000000000
--- a/embedding/qa/jstests/webNav/nsIWebNavTestCase1.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<html>
-<title> nsIAccessible Interface Test Case </title>
-<!-- Descrpt: Test nsIAccessible Interface attributes and methods
-     for HTML ANCHOR Node
-     Author: depstein@netscape.com
-     Last Updated:09.18.02.
-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-<script TYPE="text/javascript" SRC="nsIWebNavTestLib.js"></script>
-<script TYPE="text/javascript">
-
-// This script tests out the methods and attributes in nsIWebNavigation.
-// It uses the nsIWebNavTestLib.js test library.
-var interfaceName = "nsIWebNavigation";
-var testWin = null;
-
-var webNav = null;
-var goBack = 0;
-var goForward = 0;
-var index = 0;
-var cnt = 0;
-var indexCnt = 0;
-var reloadCnt = 0;
-
-var urlList;
-var loadFlagList;
-var urlTotal;
-var loadFlagTotal;
-var urlElement;
-var flagElement;
-var referrer;
-var postData;
-var headers;
-
-testWin = window.open('about:blank');
-
-setTimeout("loadURITests();", 2000);
-
-function loadURITests()
-{
-  var initTime = 10000;
-
-  callNavInit(cnt);
-
-  urlList = ["http://www.intel.com",
-			 "http://www.yahoo.com",
-			 "http://www.mozilla.org",
-			 "ftp://ftp.mozilla.org",
-			 "http://www.mozilla.org/newsbot",
-			 "https://www.sun.com",
-			 "http://www.oracle.com"
-		   		];
-
-  loadFlagList = [webNav.LOAD_FLAGS_NONE,
-				  webNav.LOAD_FLAGS_IS_REFRESH,
-				  webNav.LOAD_FLAGS_IS_LINK,
-				  webNav.LOAD_FLAGS_BYPASS_HISTORY,
-				  webNav.LOAD_FLAGS_REPLACE_HISTORY,
-				  webNav.LOAD_FLAGS_BYPASS_CACHE,
-				  webNav.LOAD_FLAGS_BYPASS_PROXY,
-				  webNav.LOAD_FLAGS_BYPASS_CACHE | webNav.LOAD_FLAGS_BYPASS_PROXY,
-				  webNav.LOAD_FLAGS_CHARSET_CHANGE
-				  ];
-
-  urlTotal  	  = urlList.length;
-  loadFlagTotal = loadFlagList.length;
-
-  referrer = null;
-  postData = null;
-  headers  = null;
-
-   if (!testWin) {
-       alert("didn't get test window");
-       return;
-   }
-   if (!webNav) {
-        alert("didn't get web navigation object");
-        return;
-   }
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  // Load pages sequentially in the child window
-
-   testLoadURI(webNav, urlList[cnt++], loadFlagList[0], referrer, postData, headers);
-
-   if (cnt == urlTotal)
-     setTimeout("nsIWebNavTests(webNav, urlTotal, loadFlagTotal)", 10000);
-   else
-     setTimeout("loadURITests(webNav)", 10000);
-}
-
-function callNavInit(cnt)
-{
-  // Calls the webNavInit() function to create nsIWebNav object
-  if (cnt == 0)
- 	webNav = webNavInit(testWin);
-}
-
-function nsIWebNavTests(webNav, urlTotal, loadFlagTotal)
-{
-  // Test cases for nsIWebNavigation
-
-  dump("Testing nsIWebNavigation interface\n");
-
-  if (!webNav)
-  {
-	alert("Unable to get web navigation object");
-	return;
-  }
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var getDoc = testDocument(webNav);
-  dump("getDoc object = " + getDoc  + "\n");
-
-  var getCurrURI = testCurrentURI(webNav);
-  dump("getCurrURI object = " + getCurrURI  + "\n");
-  dump("The current uri = " + getCurrURI.spec  + "\n");
-
-	  		/*	not implemented yet */
-//  var getRefURI = testReferringURI(webNav);
-//  dump("getRefURI object = " + getRefURI  + "\n");
-
-  var getsHistory = testSessionHistory(webNav);
-  dump("getsHistory object = " + getsHistory  + "\n");
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  doWebNavigation(webNav, urlTotal, loadFlagTotal);
-}
-
-function doWebNavigation(webNav, urlTotal, loadFlagTotal)
-{
-  if (!webNav)
-    return;
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  setTimeout("doCanGoBack(webNav, urlTotal, loadFlagTotal)", 10000);	 // canGoBack()
-}
-
-function doCanGoBack(webNav, urlTotal, loadFlagTotal)
-{
-	var goBack = testCanGoBack(webNav, 0);
-	dump("goBack = " + goBack + "\n");
-	setTimeout("doGoBack(webNav, urlTotal, loadFlagTotal)", 10000);
-}
-
-function doGoBack(webNav, urlTotal, loadFlagTotal)
-{
-	testGoBack(webNav);
-	setTimeout("doCanGoForward(webNav, urlTotal, loadFlagTotal)", 10000);
-}
-
-function doCanGoForward(webNav, urlTotal, loadFlagTotal)
-{
-	var goForward = testCanGoForward(webNav, 0);
-	dump("goForward = " + goForward + "\n");
-	setTimeout("doGoForward(webNav, urlTotal, loadFlagTotal)", 10000);
-}
-
-function doGoForward(webNav, urlTotal, loadFlagTotal)
-{
-	testGoForward(webNav);
-	indexCnt = 0;
-	setTimeout("recurseIndex(webNav, indexCnt, urlTotal, loadFlagTotal)", 10000);
-}
-
-function recurseIndex(webNav, indexCnt, urlTotal, loadFlagTotal)
-{
-  if (!webNav)
-	return;
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  dump("indexCnt = " + indexCnt + "\n");
-  if (indexCnt < urlTotal) {
-    testGotoIndex(webNav, indexCnt);		// gotoIndex()
-	setTimeout("recurseIndex(webNav, ++indexCnt, urlTotal, loadFlagTotal)", 10000);
-  }
-  else {
-    reloadCnt = 0;
-    setTimeout("recurseReload(webNav, reloadCnt, loadFlagTotal)", 10000);
-  }
-}
-
-function recurseReload(webNav, reloadCnt, loadFlagTotal)
-{
-  if (!webNav)
-	return;
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  dump("reloadCnt = " + reloadCnt + "\n");
-  if (reloadCnt < loadFlagTotal) {
-    testReload(webNav, loadFlagList[reloadCnt]);	// reload()
-	dump("loadFlag = " + loadFlagList[reloadCnt] + "\n");
-	setTimeout("recurseReload(webNav, ++reloadCnt, urlTotal, loadFlagTotal)", 10000);
-  }
-  else {
-    webNav.loadURI("http://www.microsoft.com", loadFlagList[0], null, null, null);
-    testStop(webNav, webNav.STOP_CONTENT);
-  }
-}
-
-</script>
-</head>
-<body>
-</body>
-</html>
diff --git a/embedding/qa/jstests/webNav/nsIWebNavTestCase1.txt b/embedding/qa/jstests/webNav/nsIWebNavTestCase1.txt
deleted file mode 100644
index 3c9794bd530..00000000000
--- a/embedding/qa/jstests/webNav/nsIWebNavTestCase1.txt
+++ /dev/null
@@ -1,186 +0,0 @@
-<html>
-<head>
-<script TYPE="text/javascript" SRC="nsIWebNavTestLib.js"></script>
-<script TYPE="text/javascript">
-// This script tests out the methods and attributes in nsIWebNavigation.
-// It uses the nsIWebNavTestLib.js test library.
-var interfaceName = "nsIWebNavigation";
-var testWin = window.open("about:blank");
-  // Calls the webNavInit() function to create nsIWebNav object
-var webNav  = webNavInit(testWin);
-var goBack = 0;
-var goForward = 0;
-var index = 0;
-var cnt = 0;
-var indexCnt = 0;
-var reloadCnt = 0;
-
-var urlList = ["http://www.intel.com",
-			 "http://www.yahoo.com",
-			 "http://www.mozilla.org",
-			 "ftp://ftp.mozilla.org",
-			 "http://www.mozilla.org/newsbot",
-			 "http://www.sun.com",
-			 "http://www.cisco.com"
-		   ];
-
-var loadFlagList = [webNav.LOAD_FLAGS_NONE,
-				  webNav.LOAD_FLAGS_IS_REFRESH,
-				  webNav.LOAD_FLAGS_IS_LINK,
-				  webNav.LOAD_FLAGS_BYPASS_HISTORY,
-				  webNav.LOAD_FLAGS_REPLACE_HISTORY,
-				  webNav.LOAD_FLAGS_BYPASS_CACHE,
-				  webNav.LOAD_FLAGS_BYPASS_PROXY,
-				  webNav.LOAD_FLAGS_BYPASS_CACHE | webNav.LOAD_FLAGS_BYPASS_PROXY,
-				  webNav.LOAD_FLAGS_CHARSET_CHANGE
-				  ];
-
-var urlTotal  	  = urlList.length;
-var loadFlagTotal = loadFlagList.length;
-
-function loadURITests()
-{
-  var initTime = 10000;
-
-   if (!testWin) {
-       alert("didn't get test window");
-       return;
-   }
-   if (!webNav) {
-        alert("didn't get web navigation object");
-        return;
-   }
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  // Load pages sequentially in the child window
-
-   testLoadURI(webNav, urlList[cnt++], loadFlagList[0], null, null, null);
-
-   if (cnt == urlTotal)
-     setTimeout("nsIWebNavTests()", 10000);
-   else
-     setTimeout("loadURITests()", 10000);
-}
-
-function nsIWebNavTests()
-{
-  // Test cases for nsIWebNavigation
-
-  dump("Testing nsIWebNavigation interface\n");
-
-  if (!webNav)
-  {
-	alert("Unable to get web navigation object");
-	return;
-  }
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  var getDoc = testDocument(webNav);
-  dump("getDoc object = " + getDoc  + "\n");
-
-  var getCurrURI = testCurrentURI(webNav);
-  dump("getCurrURI object = " + getCurrURI  + "\n");
-  dump("The current uri = " + getCurrURI.spec  + "\n");
-
-	  		/*	not implemented yet */
-//  var getRefURI = testReferringURI(webNav);
-//  dump("getRefURI object = " + getRefURI  + "\n");
-
-  var getsHistory = testSessionHistory(webNav);
-  dump("getsHistory object = " + getsHistory  + "\n");
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  doWebNavigation(webNav);
-}
-
-function doWebNavigation(webNav)
-{
-  if (!webNav)
-    return;
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  setTimeout("doCanGoBack(webNav)", 10000);	 // canGoBack()
-}
-
-function doCanGoBack(webNav)
-{
-	var goBack = testCanGoBack(webNav, 0);
-	dump("goBack = " + goBack + "\n");
-	setTimeout("doGoBack(webNav)", 10000);
-}
-
-function doGoBack(webNav)
-{
-	testGoBack(webNav);
-	setTimeout("doCanGoForward(webNav)", 10000);
-}
-
-function doCanGoForward(webNav)
-{
-	var goForward = testCanGoForward(webNav, 0);
-	dump("goForward = " + goForward + "\n");
-	setTimeout("doGoForward(webNav)", 10000);
-}
-
-function doGoForward(webNav)
-{
-	testGoForward(webNav);
-	indexCnt = 0;
-	setTimeout("recurseIndex(webNav, indexCnt)", 10000);
-}
-
-function recurseIndex(webNav, indexCnt)
-{
-  if (!webNav)
-	return;
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  dump("indexCnt = " + indexCnt + "\n");
-  if (indexCnt < urlTotal) {
-    testGotoIndex(webNav, indexCnt);		// gotoIndex()
-	setTimeout("recurseIndex(webNav, ++indexCnt)", 10000);
-  }
-  else {
-    reloadCnt = 0;
-    setTimeout("recurseReload(webNav, reloadCnt)", 10000);
-  }
-}
-
-function recurseReload(webNav, reloadCnt)
-{
-  if (!webNav)
-	return;
-
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  dump("reloadCnt = " + reloadCnt + "\n");
-  if (reloadCnt < loadFlagTotal) {
-    testReload(webNav, loadFlagList[reloadCnt]);	// reload()
-	dump("loadFlag = " + loadFlagList[reloadCnt] + "\n");
-	setTimeout("recurseReload(webNav, ++reloadCnt)", 10000);
-  }
-  else {
-    webNav.loadURI("http://www.microsoft.com", loadFlagList[0], null, null, null);
-    testStop(webNav, loadFlagList[0]);
-  }
-}
-
-</script>
-</head>
-<body>
-<script TYPE="text/javascript">
-  loadURITests();
-</script>
-</body>
-</html>
diff --git a/embedding/qa/jstests/webNav/nsIWebNavTestLib.js b/embedding/qa/jstests/webNav/nsIWebNavTestLib.js
deleted file mode 100644
index 2201b224212..00000000000
--- a/embedding/qa/jstests/webNav/nsIWebNavTestLib.js
+++ /dev/null
@@ -1,288 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// nsIWebNavTestLib.js is a JavaScript library containing methods for
-// testing of nsIWebNavigation interface. 
-
-// ***************************************************************************
-// webNavInit() creates and returns the session history object. 
-function webNavInit(theWindow)
-{
-  //alert("In nsIWebNavTest::Init method");
-  var webNav = null;
-  try
-  {       
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");       
-  
-    var ifaceReq = theWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor);    
-    if (!ifaceReq) {
-       alert("Unable to get interface requestor object");
-       return false;
-    }
-    webNav = ifaceReq.getInterface(Components.interfaces.nsIWebNavigation);
- 
-    if(!webNav) {
-      alert("Unable to get WebNavigation");
-      return false;
-    }               
- 
-    return webNav;
-  }
-  catch(e) 
-  {
-    alert("Could not find Web Navigation component" + e);
-    return false;
-  }
-}
-
-// *************************************************************************
-// testCanGoBack() returns a boolean to determine if goBack is possible.
-// It accepts the web navigation object as the first input parameter.
-// The second parameter is used to trigger goBack() if it's true.
-function testCanGoBack(webNav, navEvent)
-{
-  if (!webNav) {
-    alert("Didn't get web navigation object");
-    return false;  
-  }
-  
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-  var back = webNav.canGoBack;  	// attribute canGoBack
-  if (back == true && navEvent == 1)
-  {
-    dump("goBack value : " + back  + "\n");  
-    setTimeout("testGoBack(webNav, 0)");
-  }
-  
-  return back; 
-}
-
-// *************************************************************************
-// testCanGoForward() returns a boolean to determine if goForward is possible.
-// It accepts the web navigation object as the input parameter.
-// The second parameter is used to trigger goBack() if it's true.
-function testCanGoForward(webNav, navEvent)
-{
-  if (!webNav) {
-    alert("Didn't get web navigation object");
-    return false;  
-  }
-  
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-  var forward = webNav.canGoForward;   // attribute canGoForward
-  if (forward == true && navEvent == 1)
-  {
-    dump("goForward value : " + forward  + "\n");
-    setTimeout("testGoForward(webNav, 0)", 10000);
-  }
-  
-  return forward;
-}
-
-// *************************************************************************
-// testGoBack() navigates to the previous url in the session history.
-// It accepts the web navigation object as the input parameter.
-function testGoBack(webNav)
-{
-  dump("inside testGoBack()\n");
-
-  if (!webNav) {
-    alert("Didn't get web navigation object");
-    return false;  
-  }
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    
-  webNav.goBack();  		// function goBack()
-}
-
-// *************************************************************************
-// testGoForward() navigates to the next url in the session history.
-// It accepts the web navigation object as the input parameter.
-function testGoForward(webNav)
-{
-  dump("inside testGoForward()\n"); 
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-   
-  if (!webNav) {
-    alert("Didn't get web navigation object");
-    return false;  
-  }
-   
-  webNav.goForward();  	// function goForward()    
-}
-
-// *************************************************************************
-// testGotoIndex() navigates to the specified index of the session history.
-// It accepts the web navigation object as the input parameter.
-// The index specifying the sHistory entry is the 2nd parameter).
-function testGotoIndex(webNav, index)
-{
-  dump("inside testGotoIndex()\n");  
-  if (!webNav) {
-    alert("Didn't get web navigation object");
-    return false;  
-  }
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-  webNav.gotoIndex(index);
-}
-
-// *************************************************************************
-
-// testLoadURI() navigates to the designated url. It accepts 6 parameters:
-// 1) the webNav object, 2) the uri (e.g. http://...), 3) flags for loading
-// 4) a referring url, 5) Post data for request handling, 6) headers
-function testLoadURI(webNav, uri, loadFlags, referrer, postData, headers)
-{
- // alert("get inside of testLoadURI()");
-  if (!webNav) {
-    alert("Didn't get web navigation object");
-    return false;  
-  }
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-  webNav.loadURI(uri, loadFlags, referrer, postData, headers);
-  getCurrURI = testCurrentURI(webNav);
-  dump("the loaded uri = " + getCurrURI.spec + "\n");
-}
-
-// *************************************************************************
-// testReload() reloads the current uri. It accepts the webNav object for
-// the first parameter, the loaded Flags as the second one.
-function testReload(webNav, loadFlags)
-{
-    dump("inside testReload()\n");
-    if (!webNav) {
-      alert("Didn't get web navigation object");
-      return false;  
-    }
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserAccess");
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    
-    webNav.reload(loadFlags);
-}
-
-// *************************************************************************
-// testStop() stops the uri from being loaded. It accepts the webNav object
-// for the first parameter, the loaded Flags as the second one. 
-function testStop(webNav, stopFlags)
-{
-  if (!webNav) {
-      alert("Didn't get web navigation object");
-      return false;  
-  }
-  
-  webNav.stop(stopFlags);
-}
-
-// *************************************************************************
-// testDocument() returns the current DOM document for the web browser. It 
-// accepts the webNav object for the parameter.
-function testDocument(webNav)
-{
-  if (!webNav) {
-    alert("Didn't get web navigation object");
-    return false;  
-  }
-   // Get the document
-   getDoc = webNav.document;
-   
-   return getDoc;
-}
-
-// *************************************************************************
-// testCurrentURI() returns The currently loaded URI. It accepts the webNav
-// object for the parameter.
-function  testCurrentURI(webNav)
-{
-  if (!webNav) {
-    alert("Didn't get web navigation object");
-    return false;  
-  }
-  // Get the current URI
-   getCurrURI = webNav.currentURI;
-   
-   return getCurrURI;
-}
-
-/*  not implemented yet  
-// *************************************************************************
-// testReferringURI() gets the referring URI. It accepts the webNav
-// object for the parameter.
-function testReferringURI(webNav)
-{
-  if (!webNav) {
-    alert("Didn't get web navigation object");
-    return false;
-  } 
-    // Get the refering URI
-  getRefURI = webNav.referringURI;
- // alert("The referring uri = " + getRefURI.spec);
-
-  return getRefURI;     
-} 
-*/
-
-// *************************************************************************
-// testSessionHistory() gets the session history. It accepts the webNav
-// object for the parameter.
-function testSessionHistory(webNav)
-{
-  if (!webNav) {
-    alert("Didn't get web navigation object");
-    return null;
-  }
-   // Get the session history 
-  getSHistory = webNav.sessionHistory; 
-  
-  return getSHistory;
-}
-
-// ****************************************************************
-// Supplementary test functions
-
diff --git a/embedding/qa/jstests/xpcom/nsILocalFile.html b/embedding/qa/jstests/xpcom/nsILocalFile.html
deleted file mode 100644
index ea3538fbabe..00000000000
--- a/embedding/qa/jstests/xpcom/nsILocalFile.html
+++ /dev/null
@@ -1,400 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -         Ashish Bhatt <ashishbhatt@netscape.com>   
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<title>nsILocalFile Tets case</title>
-
-<head>
-
-<script type="text/javascript" src="../jslib/bridge.js"></script>
-<script type="text/javascript">
-
-var gLocalFileObject ;
-var buffer ;
-
-var path = "C:\\Program Files" ;
-var localfile = getLocalFileObject();
-var path ;
-var discriptor ;
-
-if (navigator.platform == "Win32")
-{
-	path = "C:\\Program Files" ;
-	discriptor= "..\\..\\" ;
-}
-else if(navigator.platform == "MacPPC")
-{
-	path = "osx:" ;
-	discriptor = "..:..:" ;
-}
-else
-{
-	path = "/usr/local" ;
-	discriptor = "../../" ;
-}
-
-
-
-function getLocalFileObject()
-{
-
-	if (gLocalFileObject)
-	   return gLocalFileObject ;
-
-	try{
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-        gLocalFileObject = Components.classes["@mozilla.org/file/local;1"].
-                createInstance(Components.interfaces.nsILocalFile)
-
-		return gLocalFileObject ;
-	 }
-	 catch(e){
-		if (isRunningStandalone())
-			alert("Exception: " + e);
-		else
-			WriteResults("Exception: " + e);
-	  }
-
-}
-
-function WritePassFail(aValue,e)
-{
-
-  if( aValue ==  "Pass")
-  {
-	  buffer += "<td>"+ e +"</td>" ;
-	  buffer += "<td>Pass</td>"
-  }
-  else
-  {
-	  buffer += "<td>" +"Exception: " + e + "</td>" ;
-	  buffer += "<td bgcolor='#FF0000'>Fail</td>"
-  }
-
-  buffer += "</tr>"
-
-}
-
-function RunAllTests()
-{
-	// "<td bgcolor='#FF0000'>
-
-	buffer = "<b>Results for <a href='http://lxr.mozilla.org/seamonkey/source/xpcom/io/nsILocalFile.idl'>nsILocalFile :</a></b><br><br>"
-	buffer += "<table border cols=4 width='70%'>"
-	buffer += "<tr>"
-	buffer += "<td><b>Property/Method</b></td>"
-	buffer += "<td><b>Params</b></td>"
-	buffer += "<td><b>Output/Bug/Error</b></td>"
-	buffer += "<td><b>Result</b></td>"
-	buffer += "</tr>"
-
-	initWithPath();
-	initWithFile();
-	getfollowLinks();
-	setfollowLinks()
-	GetdiskSpaceAvailable() ;  // maybe we should put this somewhere else.
-	appendRelativePath();
-	GetpersistentDescriptor();
-	reveal();
-	launch();
-	getRelativeDescriptor();
-	setRelativeDescriptor();
-
-	buffer += "</table>"
-	if (isRunningStandalone())
-	{
-	   document.clear();
-	   document.write(buffer);
-	}
-	else
-		WriteResults(buffer);
-
-
-
-}
-
-function initWithPath()
-{
-
-	//var localfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>initWithPath()</td>"
-	buffer += "<td>native path</td>"
-
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		localfile.initWithPath(path) ;
-		WritePassFail("Pass","initWithPath :" + path);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function appendRelativePath()
-{
-   var localfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>appendRelativePath()</td>"
-	buffer += "<td>path</td>"
-   try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		localfile.initWithPath(path) ;
-		localfile.appendRelativePath("try.txt");
-
-		WritePassFail("Pass","");
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function initWithFile()
-{
-   //var localfile = getLocalFileObject();
-   var Mylocalfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>initWithFile()</td>"
-	buffer += "<td>nsILocalFile</td>"
-   try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		Mylocalfile.initWithFile(localfile);
-
-
-		WritePassFail("Pass","");
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function getfollowLinks()
-{
-   //var localfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>followLinks(get)</td>"
-	buffer += "<td>none</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		abc = localfile.followLinks;
-		WritePassFail("Pass",abc);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function setfollowLinks()
-{
-   //var localfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>followLinks(set)</td>"
-	buffer += "<td>true/false</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		localfile.followLinks = true;
-		WritePassFail("Pass","followlinks = true");
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function GetdiskSpaceAvailable()
-{
-	//var localfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>diskSpaceAvailable</td>"
-	buffer += "<td>none</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-
-		var diskspace = localfile.diskSpaceAvailable;
-		WritePassFail("Pass","Diskspace:" +  diskspace);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-
-
-
-function GetpersistentDescriptor()
-{
-	//var localfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>persistentDescriptor</td>"
-	buffer += "<td>none</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-
-		var discriptor = localfile.persistentDescriptor;
-		WritePassFail("Pass","Discriptor:" +  discriptor);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function reveal()
-{
-	//var localfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>reveal()</td>"
-	buffer += "<td>Works only on platform which support this kind of functionality. Should Open the folder where the file is located</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-
-		localfile.reveal();
-		WritePassFail("Pass","");
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function launch()
-{
-	//var localfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>launch()</td>"
-	buffer += "<td>Works only on platform which support this kind of functionality. Should try to open the file</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		if(!localfile.exists())
-			localfile.create(0 ,0777)
-		localfile.launch();
-		WritePassFail("Pass","");
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-
-function getRelativeDescriptor()
-{
-	//var localfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>getRelativeDescriptor()</td>"
-	buffer += "<td>none</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-
-		var discriptor = localfile.getRelativeDescriptor(localfile);
-		WritePassFail("Pass","Relative Discriptor:" +  discriptor);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function setRelativeDescriptor()
-{
-	//var localfile = getLocalFileObject();
-
-	buffer += "<tr>"
-	buffer += "<td>getRelativeDescriptor()</td>"
-	buffer += "<td>none</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		localfile.setRelativeDescriptor(localfile,discriptor	);
-		WritePassFail("Pass","Set Discriptor:" +  discriptor);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-</script>
-
-</head>
-
-<body>
-<script type="text/javascript">
-   RunAllTests();
-</script>
-</body>
-
-</html>
-
diff --git a/embedding/qa/jstests/xpcom/nsIProperties.html b/embedding/qa/jstests/xpcom/nsIProperties.html
deleted file mode 100644
index a6b60f7597a..00000000000
--- a/embedding/qa/jstests/xpcom/nsIProperties.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ashish Bhatt <ashishbhatt@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<title>nsIProperties Tets case</title>
-
-<head>
-
-<script type="text/javascript" src="http://www.mozilla.org/quality/embed/jstests/accessibility/jslib/bridge.js"> </script>
-
-<script type="text/javascript">
-
-var gPropObject ;
-var buffer ;
-
-function getPropertyObject()
-{
-
-	if (gPropObject)
-	   return gPropObject ;
-
-	try{
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		gPropObject = Components.classes["@mozilla.org/properties;1"].
-				createInstance(Components.interfaces.nsIProperties)
-
-		return gPropObject ;
-	 }
-	 catch(e){
-		if (isRunningStandalone())
-			alert("Exception: " + e);
-		else
-			WriteResults("Exception: " + e);
-	  }
-
-}
-
-function WritePassFail(aValue,e)
-{
-
-  if( aValue ==  "Pass")
-  {
-	  buffer += "<td>"+  e  +"</td>" ;
-	  buffer += "<td>Pass</td>"
-  }
-  else
-  {
-	  buffer += "<td>" +"Exception: " + e + "</td>" ;
-	  buffer += "<td bgcolor='#FF0000'>Fail</td>"
-  }
-
-  buffer += "</tr>"
-
-}
-
-function RunAllTests()
-{
-	// "<td bgcolor='#FF0000'>
-
-	buffer = "<b>Results for <a href='http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsIProperties.idl'>nsIProperties :</a></b><br><br>"
-	buffer += "<table border cols=4 width='70%'>"
-	buffer += "<tr>"
-	buffer += "<td><b>Property/Method</b></td>"
-	buffer += "<td><b>Params</b></td>"
-	buffer += "<td><b>Bug/Error</b></td>"
-	buffer += "<td><b>Result</b></td>"
-	buffer += "</tr>"
-
-	set();
-	get();
-	has();
-	undefine();
-	getKeys();
-
-	buffer += "</table>"
-	if (isRunningStandalone())
-	{
-	   document.clear();
-	   document.write(buffer);
-	}
-	else
-		WriteResults(buffer);
-}
-
-function set()
-{
-	var prop = getPropertyObject();
-	buffer += "<tr>"
-	buffer += "<td>set()</td>"
-	buffer += "<td>Name, Value(nsISupports)</td>"
-	try{
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		var ifaceReq = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindow);
-		prop.set("Name", ifaceReq);
-		WritePassFail("Pass",ifaceReq);
-	 }
-	 catch(e){
-			WritePassFail("Fail",e);
-	  }
-}
-
-function get()
-{
-	var prop = getPropertyObject();
-	buffer += "<tr>"
-	buffer += "<td>get()</td>"
-	buffer += "<td>Name, Type(nsISupports)</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		var abc =  prop.get("Name", Components.interfaces.nsIDOMWindow);
-		WritePassFail("Pass",abc);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-
-function has()
-{
-	var prop = getPropertyObject();
-	buffer += "<tr>"
-	buffer += "<td>has()</td>"
-	buffer += "<td>Name</td>"
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		var bhas = prop.has("Name");
-		if (bhas)
-			WritePassFail("Pass","true");
-		else
-			WritePassFail("Pass","false");
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function getKeys()
-{
-
-	var prop = getPropertyObject();
-
-	buffer += "<tr>"
-	buffer += "<td>getKeys()</td>"
-	buffer += "<td>Name, Type(nsISupports)</td>"
-
-	try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		//prop.define("Name", Components.interfaces.nsIFile);
-		WritePassFail("Fail","Test case not ready");
-		//WritePassFail("Pass",1);
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-function undefine()
-{
-   var prop = getPropertyObject();
-	buffer += "<tr>"
-	buffer += "<td>undefine()</td>"
-	buffer += "<td>Name</td>"
-   try{
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		prop.undefine("Name");
-		WritePassFail("Pass","Undefine");
-	 }
-	 catch(e){
-		WritePassFail("Fail",e);
-	  }
-}
-
-</script>
-
-</head>
-
-<body>
-<script type="text/javascript">
-   RunAllTests();
-</script>
-</body>
-
-</html>
diff --git a/embedding/qa/mozembed/Makefile.in b/embedding/qa/mozembed/Makefile.in
deleted file mode 100644
index 74074ee37f0..00000000000
--- a/embedding/qa/mozembed/Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   radha@netscape.com
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/embedding/qa/mozembed/makefile.win b/embedding/qa/mozembed/makefile.win
deleted file mode 100644
index e586e423d41..00000000000
--- a/embedding/qa/mozembed/makefile.win
+++ /dev/null
@@ -1,43 +0,0 @@
-#!nmake
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH=..\..\..
-
-DIRS=public src
-
-include <$(DEPTH)\config\rules.mak>
diff --git a/embedding/qa/mozembed/public/Makefile.in b/embedding/qa/mozembed/public/Makefile.in
deleted file mode 100644
index ce71010f88d..00000000000
--- a/embedding/qa/mozembed/public/Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= mozEmbed
-
-XPIDLSRCS	= nsIQABrowserChrome.idl  \
-            nsIQABrowserUIGlue.idl  \
-            nsIQABrowserView.idl    \
-                  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/embedding/qa/mozembed/public/makefile.win b/embedding/qa/mozembed/public/makefile.win
deleted file mode 100644
index 5423a8a37ae..00000000000
--- a/embedding/qa/mozembed/public/makefile.win
+++ /dev/null
@@ -1,54 +0,0 @@
-#!nmake
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH=..\..\..\..
-
-REQUIRES =  widget \
-            webBrowser_core  \
-            $(NULL)
-
-MODULE=mozEmbed
-
-XPIDLSRCS =                   \
-    .\nsIQABrowserChrome.idl  \
-    .\nsIQABrowserUIGlue.idl \
-    .\nsIQABrowserView.idl  \
-    $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
diff --git a/embedding/qa/mozembed/public/nsIQABrowserChrome.idl b/embedding/qa/mozembed/public/nsIQABrowserChrome.idl
deleted file mode 100644
index 61e60bc09be..00000000000
--- a/embedding/qa/mozembed/public/nsIQABrowserChrome.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Radha Kulkarni <radha@netscape.com>, Original Author
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#include "nsISupports.idl"
-
-#include "nsIBaseWindow.idl"
-#include "nsIWeakReference.idl"
-
-interface nsIQABrowserUIGlue;
-interface nsIQABrowserView;
-
-[scriptable, uuid(31D58E11-E4A3-49fc-B544-C100F375A280)]
-interface nsIQABrowserChrome : nsISupports
-{
-  // Hold a handle to the nsIQABrowserUIGlue which is above the chrome 
-  // and to the nsIQABrowserView below the chrome. 
-  void initQAChrome(in nsIQABrowserUIGlue uiGlue,  in nativeWindow nativeWnd);
-};
diff --git a/embedding/qa/mozembed/public/nsIQABrowserUIGlue.idl b/embedding/qa/mozembed/public/nsIQABrowserUIGlue.idl
deleted file mode 100644
index 6ad79e42e15..00000000000
--- a/embedding/qa/mozembed/public/nsIQABrowserUIGlue.idl
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -- /
-  BEGIN LICENSE BLOCK 
-  Version: Mozilla-sample-code 1.0
- 
-  Copyright (c) 2002 Netscape Communications Corporation and
-  other contributors
- 
-  Permission is hereby granted, free of charge, to any person obtaining a
-  copy of this Mozilla sample software and associated documentation files
-  (the "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to permit
-  persons to whom the Software is furnished to do so, subject to the
-  following conditions:
- 
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
- 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  DEALINGS IN THE SOFTWARE.
- 
-  Contributor(s):
-    Radha Kulkarni <radha@netscape.com> 
- 
-   END LICENSE BLOCK  */
-
-// This interface acts as a glue between the required/optional 
-// Gecko embedding interfaces and the actual platform specific
-// code that owns the UI.
-// For ex, in the mozembed sample the required interfaces such as 
-// nsIWebBrowserChrome etc. are implemented in a XP way in the
-// WebBrowserChrome.js. However, when they get called to update the
-// statusbar etc. they call on this interface to get the actual job
-// done. 
-
-
-#include "nsISupports.idl"
-#include "nsIBaseWindow.idl"
-
-interface nsIWebBrowserChrome;
-interface nsIWebBrowser;
-interface nsIDOMEvent;
-interface nsIDOMNode;
-
-[scriptable, uuid(86D2C83D-AEFA-4382-BDC5-881A9232ED7B)]
-interface nsIQABrowserUIGlue : nsISupports 
-{
-
-  void  destroy(in nsIWebBrowserChrome aChrome);
-  void  destroyed(in nsIWebBrowserChrome aChrome);
-  void  setFocus(in nsIWebBrowserChrome aChrome);
-  void  updateStatusBarText(in nsIWebBrowserChrome aChrome, in   wstring aStatusText);
-  void  updateCurrentURI(in nsIWebBrowserChrome aChrome);
-  void  updateBusyState(in nsIWebBrowserChrome aChrome, in boolean aBusy);
-  void  updateProgress(in nsIWebBrowserChrome aChrome, in long  aCurrent, in long aMax);  
-  void  showContextMenu(in nsIWebBrowserChrome aChrome, in long aContextFlags, in nsIDOMEvent aEvent, in nsIDOMNode aNode);
-  void  showTooltip(in nsIWebBrowserChrome aChrome, in long  aXCoords, in long aYCoords, in wstring aTipText);
-  void  hideTooltip(in nsIWebBrowserChrome aChrome);
-  void  showWindow(in nsIWebBrowserChrome aChrome, in boolean  aShow);
-  void  sizeTo(in nsIWebBrowserChrome aChrome, in long  aWidth, in long aHeight);
-  string getResourceStringById(in long aID);
-
-  attribute boolean visibility;
-  attribute wstring title;
-  attribute boolean allowNewBrowserWindows;
-
-  nsIWebBrowserChrome createNewBrowserWindow(in long  aChromeFlags, in nsIWebBrowserChrome  aParent);
-  void loadURL(in string aURL);
-  void loadHomePage();
-};
-
diff --git a/embedding/qa/mozembed/public/nsIQABrowserView.idl b/embedding/qa/mozembed/public/nsIQABrowserView.idl
deleted file mode 100644
index 39b73a0a9d9..00000000000
--- a/embedding/qa/mozembed/public/nsIQABrowserView.idl
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Radha Kulkarni <radha@netscape.com>, Original Author
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#include "nsISupports.idl"
-#include "nsIBaseWindow.idl"
-
-interface nsIWebBrowser;
-interface nsIWebBrowserChrome;
-
-[scriptable, uuid(169157F5-A70F-4ea7-BA36-BDFDE702CCFE)]
-interface nsIQABrowserView : nsISupports 
-{
-  //void Init(in nativeWindow aNativeWnd);
-  void CreateBrowser(in nativeWindow aNativeWnd, in nsIWebBrowserChrome aChrome);
-  void DestroyBrowser();  
-
-  // Get a handle to the nsIWebBrowser object. 
-  readonly attribute nsIWebBrowser WebBrowser;
-
-};
diff --git a/embedding/qa/mozembed/src/Makefile.in b/embedding/qa/mozembed/src/Makefile.in
deleted file mode 100644
index d0ead665ebe..00000000000
--- a/embedding/qa/mozembed/src/Makefile.in
+++ /dev/null
@@ -1,92 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= mozEmbed
-PROGRAM		= mozEmbed$(BIN_SUFFIX)
-RESFILE   = $(MODULE).res
-MOZILLA_INTERNAL_API = 1
-
-REQUIRES	= xpcom \
-		  string \
-		  embed_base \
-		  webbrwsr \
-		  webshell \
-		  windowwatcher \
-		  profile \
-		  necko \
-		  docshell \
-		  dom \
-		  widget \
-		  uriloader \
-		  shistory \
-		  webbrowserpersist \
-		  gfx \
-      mozEmbed \
-		  $(NULL)
-
-
-CPPSRCS		= nsQABrowserView.cpp   \
-            nsQABrowserChrome.cpp \
-            nsQABrowserModule.cpp \
-            nsQAWindowCreator.cpp \
-            mozEmbed.cpp          \
-            StdAfx.cpp            \
-            $(NULL)
-
-EXTRA_DSO_LIBS	= embed_base_s gkgfx
-
-LIBS		= \
-		$(EXTRA_DSO_LIBS) \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
-		$(NULL)
-
-OS_LIBS +=                      \
-    ole32.lib                   \
-    comdlg32.lib                \
-    shell32.lib                 \
-    version.lib                 \
-    $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/embedding/qa/mozembed/src/SMALL.ICO b/embedding/qa/mozembed/src/SMALL.ICO
deleted file mode 100644
index ec288075e2874b7f8371930b7fdc8c4071fce40c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmc(Zu?>JQ3<NI{1Eivbk}X)xqj@AG1_=L26CrwR-@oG|lA$PTtvHSXt6g}qi^3v>
r?D{1EDk6qS)ruf9b<uj!nmeKN$ntZHJ-iEC8{G1l>wKN{X8!X4mZ>tL

diff --git a/embedding/qa/mozembed/src/StdAfx.cpp b/embedding/qa/mozembed/src/StdAfx.cpp
deleted file mode 100644
index 28bbef71192..00000000000
--- a/embedding/qa/mozembed/src/StdAfx.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// stdafx.cpp : source file that includes just the standard includes
-//	winEmbed.pch will be the pre-compiled header
-//	stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/embedding/qa/mozembed/src/StdAfx.h b/embedding/qa/mozembed/src/StdAfx.h
deleted file mode 100644
index 0613097c849..00000000000
--- a/embedding/qa/mozembed/src/StdAfx.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
-
-// Windows Header Files:
-#include <windows.h>
-
-// C RunTime Header Files
-#include <stdlib.h>
-#include <malloc.h>
-#include <memory.h>
-#include <tchar.h>
-
-// Local Header Files
-
-// TODO: reference additional headers your program requires here
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
diff --git a/embedding/qa/mozembed/src/makefile.win b/embedding/qa/mozembed/src/makefile.win
deleted file mode 100644
index 1d8f9ac0f09..00000000000
--- a/embedding/qa/mozembed/src/makefile.win
+++ /dev/null
@@ -1,108 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-DEPTH=..\..\..\..
-
-MAKE_OBJ_TYPE   = EXE
-
-MODULE          = mozEmbed
-REQUIRES	= xpcom \
-		  string \
-		  embed_base \
-		  webBrowser_core \
-		  webshell \
-		  windowwatcher \
-		  profile \
-		  necko \
-		  docshell \
-		  dom \
-		  widget \
-		  uriloader \
-		  shistory \
-		  webbrowserpersist \
-		  gfx \
-      mozEmbed \
-		  $(NULL)
-
-PROGRAM         = .\$(OBJDIR)\$(MODULE).exe
-RESFILE         = $(MODULE).res
-
-
-#
-# Control the default heap size.
-# This is the heap returned by GetProcessHeap().
-# As we use the CRT heap, the default size is too large and wastes VM.
-#
-# The default heap size is 1MB on Win32.
-# The heap will grow if need be.
-#
-# Set it to 256k.  See bug 127069.
-#
-LLFLAGS=$(LLFLAGS) /HEAP:0x40000
-
-
-OBJS =                           \
-    .\$(OBJDIR)\nsQABrowserView.obj     \
-    .\$(OBJDIR)\nsQABrowserChrome.obj   \
-    .\$(OBJDIR)\nsQAWindowCreator.obj \
-    .\$(OBJDIR)\StdAfx.obj       \
-    .\$(OBJDIR)\nsQABrowserModule.obj \
-    .\$(OBJDIR)\mozEmbed.obj \
-    $(NULL)
-
-LLIBS=                          \
-    $(DIST)\lib\baseembed_s.lib \
-    $(DIST)\lib\gkgfx.lib   \
-    $(DIST)\lib\xpcom.lib       \
-    $(LIBNSPR)		            \
-    $(NULL)
-
-WIN_LIBS=                       \
-    ole32.lib                   \
-    comdlg32.lib                \
-    shell32.lib                 \
-    version.lib                 \
-    $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(PROGRAM)
-    $(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
-
-clobber_all::
-    $(RM) $(DIST)\bin\$(MODULE).exe
-
diff --git a/embedding/qa/mozembed/src/mozEmbed.ICO b/embedding/qa/mozembed/src/mozEmbed.ICO
deleted file mode 100644
index b276a959679bf59784dd4fcd071783a0e3b120a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1078
zcmeH_(G9{d3`8$2-#8=W3v~=e%V-&gPj673Qz50ONC-aR((~D|<yO^6Ns~&+3fv~?
zg66!{OOnpBv~XA86(*gCQf2lSl_s59HzAV3s@58fwLe<d$RH=KBK+~we*h2c5w;jP
z(|$!IW(PjcjeEM?_OFU6d>+m(@Zs}DevFE#>EP=wMAG+sZf26J3yG1txtqmTpsWSn
TOD>ppkC9I`*0N_?`+d9vY|+CV

diff --git a/embedding/qa/mozembed/src/mozEmbed.cpp b/embedding/qa/mozembed/src/mozEmbed.cpp
deleted file mode 100644
index 3a616d061dc..00000000000
--- a/embedding/qa/mozembed/src/mozEmbed.cpp
+++ /dev/null
@@ -1,1503 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Radha Kulkarni <radha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <stdio.h>
-#include "stdafx.h"
-
-// Win32 header files
-#include "windows.h"
-#include "commctrl.h"
-#include "commdlg.h"
-
-// Mozilla header files
-#include "nsCOMPtr.h"
-#include "nsEmbedAPI.h"
-#include "nsWeakReference.h"
-#include "nsIClipboardCommands.h"
-#include "nsXPIDLString.h"
-#include "nsIWebBrowserPersist.h"
-#include "nsIWebBrowserFocus.h"
-#include "nsIWindowWatcher.h"
-#include "nsIProfile.h"
-//#include "nsIObserverService.h"
-#include "nsIObserver.h"
-#include "nsIProfileChangeStatus.h"
-#include "nsIURI.h"
-#include "plstr.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCRT.h"
-#include "nsString.h"
-
-#include "nsIWebBrowser.h"
-#include "nsIComponentManager.h"
-#include "nsServiceManagerUtils.h"
-#include "nsIEmbeddingSiteWindow.h"
-#include "nsIWebNavigation.h"
-#include "nsIWebBrowserChrome.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIComponentRegistrar.h"
-#include "nsIModule.h"
-#include "nsIGenericFactory.h"
-
-// Local header files
-//#include "nsIQABrowserChrome.h"
-#include "mozEmbed.h"
-#include "nsQAWindowCreator.h"
-#include "resource.h"
-#include "nsQABrowserCID.h"
-#include "nsQABrowserUIGlue.h"
-//#include "nsIQABrowserView.h"
-
-
-// Printing header files
-#include "nsIPrintSettings.h"
-#include "nsIWebBrowserPrint.h"
-
-
-#define MAX_LOADSTRING 100
-#define MAX_BROWSER_ALLOWED 50
-
-const TCHAR *szWindowClass = _T("MOZEMBED");
-
-// Forward declarations of functions included in this code module:
-static ATOM             MyRegisterClass(HINSTANCE hInstance);
-static LRESULT CALLBACK BrowserWndProc(HWND, UINT, WPARAM, LPARAM);
-static BOOL    CALLBACK BrowserDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-static nsresult InitializeWindowCreator();
-static nsresult OpenWebPage(const char * url);
-static nsresult ResizeEmbedding(nsIWebBrowserChrome* chrome);
-// Profile chooser stuff
-static BOOL ChooseNewProfile(BOOL bShowForMultipleProfilesOnly, const char *szDefaultProfile);
-static LRESULT CALLBACK ChooseProfileDlgProc(HWND, UINT, WPARAM, LPARAM);
-extern nsresult RegisterComponents();
-
-// Global variables
-static UINT gDialogCount = 0;
-static BOOL gProfileSwitch = FALSE;
-static HINSTANCE ghInstanceResources = NULL;
-static HINSTANCE ghInstanceApp = NULL;
-static char gFirstURL[1024];
-
-// A list of URLs to populate the URL drop down list with
-static const TCHAR *gDefaultURLs[] = 
-{
-    _T("http://www.mozilla.org/"),
-    _T("http://www.netscape.com/"),
-    _T("http://browsertest.web.aol.com/tests/javascript/javascpt/index.htm"),
-    _T("http://127.0.0.1/"),
-    _T("http://www.yahoo.com/"),
-    _T("http://www.travelocity.com/"),
-    _T("http://www.disney.com/"),
-    _T("http://www.go.com/"),
-    _T("http://www.google.com/"),
-    _T("http://www.ebay.com/"),
-    _T("http://www.shockwave.com/"),
-    _T("http://www.slashdot.org/"),
-    _T("http://www.quicken.com/"),
-    _T("http://www.hotmail.com/"),
-    _T("http://www.cnn.com/"),
-    _T("http://www.javasoft.com/")
-};
-
-//
-//  FUNCTION: GetBrowserFromChrome()
-//
-//  PURPOSE: Returns the HWND for the webbrowser container associated
-//           with the specified chrome.
-//
-HWND GetBrowserFromChrome(nsIWebBrowserChrome *aChrome)
-{
-  if (!aChrome)
-  {
-      return NULL;
-  }
-	nsCOMPtr<nsIEmbeddingSiteWindow> baseWindow = do_QueryInterface(aChrome);
-  HWND hwnd = NULL;
-	baseWindow->GetSiteWindow((void **) & hwnd);
-  return hwnd;
-}
-
-//
-//  FUNCTION: GetBrowserDlgFromChrome()
-//
-//  PURPOSE: Returns the HWND for the browser dialog associated with
-//           the specified chrome.
-//
-HWND GetBrowserDlgFromChrome(nsIWebBrowserChrome *aChrome)
-{
-  return GetParent(GetBrowserFromChrome(aChrome));
-}
-
-
-//
-//  FUNCTION: UpdateUI()
-//
-//  PURPOSE: Refreshes the buttons and menu items in the browser dialog
-//
-void UpdateUI(nsIWebBrowserChrome *aChrome)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    nsCOMPtr<nsIWebNavigation> webNavigation;
-    aChrome->GetWebBrowser(getter_AddRefs(webBrowser));
-    webNavigation = do_QueryInterface(webBrowser);
-
-    PRBool canGoBack = PR_FALSE;
-    PRBool canGoForward = PR_FALSE;
-    if (webNavigation)
-    {
-        webNavigation->GetCanGoBack(&canGoBack);
-        webNavigation->GetCanGoForward(&canGoForward);
-    }
-
-    PRBool canCutSelection = PR_FALSE;
-    PRBool canCopySelection = PR_FALSE;
-    PRBool canPaste = PR_FALSE;
-
-    nsCOMPtr<nsIClipboardCommands> clipCmds(do_GetInterface(webBrowser));
-    if (clipCmds)
-    {
-        clipCmds->CanCutSelection(&canCutSelection);
-        clipCmds->CanCopySelection(&canCopySelection);
-        clipCmds->CanPaste(&canPaste);
-    }
-
-    HMENU hmenu = GetMenu(hwndDlg);
-    if (hmenu)
-    {
-        EnableMenuItem(hmenu, MOZ_GoBack, MF_BYCOMMAND |
-            ((canGoBack) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-        EnableMenuItem(hmenu, MOZ_GoForward, MF_BYCOMMAND |
-            ((canGoForward) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-
-        EnableMenuItem(hmenu, MOZ_Cut, MF_BYCOMMAND |
-            ((canCutSelection) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-        EnableMenuItem(hmenu, MOZ_Copy, MF_BYCOMMAND |
-            ((canCopySelection) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-        EnableMenuItem(hmenu, MOZ_Paste, MF_BYCOMMAND |
-            ((canPaste) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
-    }
-
-    HWND button;
-    button = GetDlgItem(hwndDlg, IDC_BACK);
-    if (button)
-      EnableWindow(button, canGoBack);
-    button = GetDlgItem(hwndDlg, IDC_FORWARD);
-    if (button)
-      EnableWindow(button, canGoForward);
-}
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////
-// Main program
-////////////////////////////////////////////////////////////////////////////////////////////
-
-int main(int argc, char *argv[])
-{
-    printf("You are embedded, man!\n\n");
-    printf("******************************************************************\n");
-    printf("*                                                                *\n");
-    printf("*  IMPORTANT NOTE:                                               *\n");
-    printf("*                                                                *\n");
-    printf("*  WinEmbed is not supported!!! Do not raise bugs on it unless   *\n");
-    printf("*  it is badly broken (e.g. crash on start/exit, build errors)   *\n");
-    printf("*  or you have the patch to make it better! MFCEmbed is now our  *\n");
-    printf("*  embedding test application on Win32 and all testing should    *\n");
-    printf("*  be done on that.                                              *\n");
-    printf("*                                                                *\n");
-    printf("******************************************************************\n");
-    printf("\n\n");
-    
-    // Sophisticated command-line parsing in action
-  char *szFirstURL = "http://www.mozilla.org/projects/embedding";
-	char *szDefaultProfile = nsnull;
-	int argn;
-	for (argn = 1; argn < argc; argn++)
-	{
-		if (stricmp("-P", argv[argn]) == 0)
-		{
-			if (argn + 1 < argc)
-			{
-				szDefaultProfile = argv[++argn];
-			}
-		}
-		else
-		{
-	        szFirstURL = argv[argn];
-		}
-    }
-	strncpy(gFirstURL, szFirstURL, sizeof(gFirstURL) - 1);
-
-  ghInstanceApp = GetModuleHandle(NULL);
-  ghInstanceResources = GetModuleHandle(NULL);
-
-	// Initialize global strings
-    TCHAR szTitle[MAX_LOADSTRING];
-	LoadString(ghInstanceResources, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
-	MyRegisterClass(ghInstanceApp);
-
-  // Init Embedding APIs
-  NS_InitEmbedding(nsnull, nsnull);
-  RegisterComponents();
-
-	// Choose the new profile
-  // Have to do this to initialise global history
-	if (!ChooseNewProfile(TRUE, szDefaultProfile))
-    {
-        NS_TermEmbedding();
-        return 1;
-    }
-
-  WPARAM rv;
-  {   
-    InitializeWindowCreator();
-
-    // Open the initial browser window
-    OpenWebPage(gFirstURL);
-
-	  // Main message loop.
-    // NOTE: We use a fake event and a timeout in order to process idle stuff for
-    //       Mozilla every 1/10th of a second.
-    PRBool runCondition = PR_TRUE;
-
-    rv = AppCallbacks::RunEventLoop(runCondition);
-
-    // observer->Release();
-  }
-  // Close down Embedding APIs
-  NS_TermEmbedding();
-
-  return rv;
-}
-
-
-/* InitializeWindowCreator creates and hands off an object with a callback
-   to a window creation function. This is how all new windows are opened,
-   except any created directly by the embedding app. */
-nsresult InitializeWindowCreator()
-{
-
-    printf("In InitializeWindowCreator\n");
-    // create an nsWindowCreator and give it to the WindowWatcher service
-    WindowCreator *creatorCallback = new WindowCreator();
-    if (creatorCallback)
-    {
-        nsCOMPtr<nsIWindowCreator> windowCreator(static_cast<nsIWindowCreator *>(creatorCallback));
-        if (windowCreator)
-        {
-            nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
-            if (wwatch)
-            {
-                wwatch->SetWindowCreator(windowCreator);
-                return NS_OK;
-            }
-        }
-    }
-    return NS_ERROR_FAILURE;
-}
-
-//-----------------------------------------------------------------------------
-
-//
-//  FUNCTION: OpenWebPage()
-//
-//  PURPOSE: Opens a new browser dialog and starts it loading to the
-//           specified url.
-//
-nsresult OpenWebPage(const char *url)
-{
-  nsresult  rv;
-  printf("In OpenWebpage\n");
-  
-  if (gDialogCount == MAX_BROWSER_ALLOWED)
-    return NS_ERROR_FAILURE;
-
-  // Create the UI Glue object. This is the glue between nsIWebBrowserChrome and
-  // the native UI code.
-  nsCOMPtr<nsIQABrowserUIGlue> browserUIGlue;
-  browserUIGlue = do_CreateInstance(NS_QABROWSERUIGLUE_CONTRACTID, &rv);
- 
-  if (!browserUIGlue)
-    return NS_ERROR_FAILURE;
-  
-  // Create a new browser  window
-  nsIWebBrowserChrome *  chrome;
-  rv = browserUIGlue->CreateNewBrowserWindow(nsIWebBrowserChrome::CHROME_ALL, nsnull,
-                                        &chrome);
-  if (NS_SUCCEEDED(rv)) {
-    browserUIGlue->LoadURL(url);
-  }
-  return rv;
-
-}   
-
-
-
-//
-//  FUNCTION: SaveWebPage()
-//
-//  PURPOSE: Saves the contents of the web page to a file
-//
-void SaveWebPage(nsIWebBrowser *aWebBrowser)
-{
-  // Use the browser window title as the initial file name
-  nsCOMPtr<nsIBaseWindow> webBrowserAsWin = do_QueryInterface(aWebBrowser);
-	nsXPIDLString windowTitle;
-	webBrowserAsWin->GetTitle(getter_Copies(windowTitle));
-  nsCString fileName; fileName.AssignWithConversion(windowTitle);
-
-	// Sanitize the title of all illegal characters
-  fileName.CompressWhitespace();     // Remove whitespace from the ends
-  fileName.StripChars("\\*|:\"><?"); // Strip illegal characters
-  fileName.ReplaceChar('.', L'_');   // Dots become underscores
-  fileName.ReplaceChar('/', L'-');   // Forward slashes become hyphens
-
-  // Copy filename to a character buffer
-	char szFile[_MAX_PATH];
-  memset(szFile, 0, sizeof(szFile));
-  PL_strncpyz(szFile, fileName.get(), sizeof(szFile) - 1); // XXXldb probably should be just sizeof(szfile)
-
-  // Initialize the file save as information structure
-  OPENFILENAME saveFileNameInfo;
-  memset(&saveFileNameInfo, 0, sizeof(saveFileNameInfo));
-	saveFileNameInfo.lStructSize = sizeof(saveFileNameInfo);
-	saveFileNameInfo.hwndOwner = NULL;
-	saveFileNameInfo.hInstance = NULL;
-	saveFileNameInfo.lpstrFilter =
-        "Web Page, HTML Only (*.htm;*.html)\0*.htm;*.html\0"
-        "Web Page, Complete (*.htm;*.html)\0*.htm;*.html\0"
-        "Text File (*.txt)\0*.txt\0"; 
-	saveFileNameInfo.lpstrCustomFilter = NULL; 
-	saveFileNameInfo.nMaxCustFilter = NULL; 
-	saveFileNameInfo.nFilterIndex = 1; 
-	saveFileNameInfo.lpstrFile = szFile; 
-	saveFileNameInfo.nMaxFile = sizeof(szFile); 
-	saveFileNameInfo.lpstrFileTitle = NULL;
-	saveFileNameInfo.nMaxFileTitle = 0; 
-	saveFileNameInfo.lpstrInitialDir = NULL; 
-	saveFileNameInfo.lpstrTitle = NULL; 
-	saveFileNameInfo.Flags = OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; 
-	saveFileNameInfo.nFileOffset = NULL; 
-	saveFileNameInfo.nFileExtension = NULL; 
-	saveFileNameInfo.lpstrDefExt = "htm"; 
-	saveFileNameInfo.lCustData = NULL; 
-	saveFileNameInfo.lpfnHook = NULL; 
-	saveFileNameInfo.lpTemplateName = NULL; 
-
-	if (GetSaveFileName(&saveFileNameInfo))
-	{
-    // Does the user want to save the complete document including
-    // all frames, images, scripts, stylesheets etc. ?
-    char *pszDataPath = NULL;
-    if (saveFileNameInfo.nFilterIndex == 2) // 2nd choice means save everything
-    {
-      static char szDataFile[_MAX_PATH];
-      char szDataPath[_MAX_PATH];
-      char drive[_MAX_DRIVE];
-      char dir[_MAX_DIR];
-      char fname[_MAX_FNAME];
-      char ext[_MAX_EXT];
-
-      _splitpath(szFile, drive, dir, fname, ext);
-      sprintf(szDataFile, "%s_files", fname);
-      _makepath(szDataPath, drive, dir, szDataFile, "");
-
-      pszDataPath = szDataPath;
-    }
-
-     // Save away
-     nsCOMPtr<nsIWebBrowserPersist> persist(do_QueryInterface(aWebBrowser));
-
-     nsCOMPtr<nsILocalFile> file;
-     NS_NewNativeLocalFile(nsDependentCString(szFile), TRUE, getter_AddRefs(file));
-
-     nsCOMPtr<nsILocalFile> dataPath;
-     if (pszDataPath)
-     {
-        NS_NewNativeLocalFile(nsDependentCString(pszDataPath), TRUE, getter_AddRefs(dataPath));
-     }
-
-     persist->SaveDocument(nsnull, file, dataPath, nsnull, 0, 0);
-  }
-}
-
-
-//
-//  FUNCTION: ResizeEmbedding()
-//
-//  PURPOSE: Resizes the webbrowser window to fit its container.
-//
-nsresult ResizeEmbedding(nsIWebBrowserChrome* chrome)
-{
-    if (!chrome)
-        return NS_ERROR_FAILURE;
-    
-    nsCOMPtr<nsIEmbeddingSiteWindow> embeddingSite = do_QueryInterface(chrome);
-    HWND hWnd;
-	  embeddingSite->GetSiteWindow((void **) & hWnd);
-    
-    if (!hWnd)
-        return NS_ERROR_NULL_POINTER;
-    
-    RECT rect;
-    GetClientRect(hWnd, &rect);
-    
-	  // Make sure the browser is visible and sized
-	  nsCOMPtr<nsIWebBrowser> webBrowser;
-	  chrome->GetWebBrowser(getter_AddRefs(webBrowser));
-    nsCOMPtr<nsIBaseWindow> webBrowserAsWin = do_QueryInterface(webBrowser);
-	  if (webBrowserAsWin)
-	  {
-        webBrowserAsWin->SetPositionAndSize(rect.left, 
-                                   rect.top, 
-                                   rect.right - rect.left, 
-                                   rect.bottom - rect.top,
-                                   PR_TRUE);
-		    webBrowserAsWin->SetVisibility(PR_TRUE);
-    }
-
-    return NS_OK;
-}
-
-
-//
-//  FUNCTION: MyRegisterClass()
-//
-//  PURPOSE: Registers the window class.
-//
-//  COMMENTS:
-//
-//    This function and its usage is only necessary if you want this code
-//    to be compatible with Win32 systems prior to the 'RegisterClassEx'
-//    function that was added to Windows 95. It is important to call this function
-//    so that the application will get 'well formed' small icons associated
-//    with it.
-//
-ATOM MyRegisterClass(HINSTANCE hInstance)
-{
-	WNDCLASSEX wcex;
-
-  memset(&wcex, 0, sizeof(wcex));
-	wcex.cbSize = sizeof(WNDCLASSEX); 
-
-	wcex.style			= CS_HREDRAW | CS_VREDRAW;
-	wcex.lpfnWndProc	= (WNDPROC) BrowserWndProc;
-	wcex.cbClsExtra		= 0;
-	wcex.cbWndExtra		= 0;
-	wcex.hInstance		= hInstance;
-	wcex.hIcon			= LoadIcon(ghInstanceResources, (LPCTSTR)IDI_MOZEMBED);
-	wcex.hCursor		= LoadCursor(NULL, IDC_ARROW);
-	wcex.hbrBackground	= (HBRUSH)(COLOR_WINDOW+1);
-	wcex.lpszClassName	= szWindowClass;
-	wcex.hIconSm		= LoadIcon(ghInstanceResources, (LPCTSTR)IDI_SMALL);
-
-	return RegisterClassEx(&wcex);
-}
-
-
-
-//
-//  FUNCTION: BrowserDlgProc()
-//
-//  PURPOSE: Browser dialog windows message handler.
-//
-//  COMMENTS:
-//
-//    The code for handling buttons and menu actions is here.
-//
-BOOL CALLBACK BrowserDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	if (uMsg == WM_COMMAND && LOWORD(wParam) == MOZ_SwitchProfile)
-	{
-        ChooseNewProfile(FALSE, NULL);
-		return FALSE;
-	}
-
-    // Get the browser and other pointers since they are used a lot below
-    HWND hwndBrowser = GetDlgItem(hwndDlg, IDC_BROWSER);
-    nsIWebBrowserChrome *chrome = nsnull ;
-    if (hwndBrowser)
-    {
-        chrome = (nsIWebBrowserChrome *) GetWindowLong(hwndBrowser, GWL_USERDATA);
-    }
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    nsCOMPtr<nsIWebNavigation> webNavigation;
-    nsCOMPtr<nsIWebBrowserPrint> webBrowserPrint;
-    if (chrome)
-    {
-        chrome->GetWebBrowser(getter_AddRefs(webBrowser));
-        webNavigation = do_QueryInterface(webBrowser);
-        webBrowserPrint = do_GetInterface(webBrowser);
-    }
-
-    // Test the message
-    switch (uMsg)
-    {
-    case WM_INITDIALOG:
-        return TRUE;
-
-    case WM_INITMENU:
-        UpdateUI(chrome);
-        return TRUE;
-
-    case WM_SYSCOMMAND:
-        if (wParam == SC_CLOSE)
-        {
-          if (!webNavigation || !webBrowser || !chrome)
-            return FALSE;
-          
-          webNavigation->Stop(nsIWebNavigation::STOP_ALL);
-          chrome->ExitModalEventLoop(NS_OK);
-
-          // Explicitly destroy the embedded browser and then the chrome
-          // First the browser
-          nsCOMPtr<nsIBaseWindow> browserAsWin = do_QueryInterface(webBrowser);
-          if (browserAsWin)
-            browserAsWin->Destroy();
-
-          // Now the chrome
-          chrome->SetWebBrowser(nsnull);
-          NS_RELEASE(chrome);
-         
-          return FALSE;        
-        }
-        break;
-    case WM_DESTROY:
-	    return FALSE;
-
-    case WM_COMMAND: 
-      {
-        if (!webBrowser)
-        {
-            return FALSE;
-        }
-
-        // Test which command was selected
-        switch (LOWORD(wParam))
-		    {
-        case IDC_ADDRESS:
-            if (HIWORD(wParam) == CBN_EDITCHANGE || HIWORD(wParam) == CBN_SELCHANGE)
-            {
-                // User has changed the address field so enable the Go button
-                EnableWindow(GetDlgItem(hwndDlg, IDC_GO), TRUE);
-            }
-            break;
-
-        case IDC_GO:
-            {
-                TCHAR szURL[2048];
-                memset(szURL, 0, sizeof(szURL));
-                GetDlgItemText(hwndDlg, IDC_ADDRESS, szURL,
-                    sizeof(szURL) / sizeof(szURL[0]) - 1);
-                webNavigation->LoadURI(
-                    NS_ConvertASCIItoUTF16(szURL).get(),
-                    nsIWebNavigation::LOAD_FLAGS_NONE,
-                    nsnull,
-                    nsnull,
-                    nsnull);
-            }
-            break;
-
-        case IDC_STOP:
-            webNavigation->Stop(nsIWebNavigation::STOP_ALL);
-            UpdateUI(chrome);
-            break;
-
-        case IDC_RELOAD:
-            webNavigation->Reload(nsIWebNavigation::LOAD_FLAGS_NONE);
-            break;
-
-        case IDM_EXIT:
-            PostMessage(hwndDlg, WM_SYSCOMMAND, SC_CLOSE, 0);
-            break;
-
-        // File menu commands
-
-        case MOZ_NewBrowser:
-            OpenWebPage(gFirstURL);
-            break;
-
-        case MOZ_Save:
-            SaveWebPage(webBrowser);
-            break;
-
-        case MOZ_Print:
-            {
-                // NOTE: Embedding code shouldn't need to get the docshell or
-                //       contentviewer AT ALL. This code below will break one
-                //       day but will have to do until the embedding API has
-                //       a cleaner way to do the same thing.
-              if (webBrowserPrint)
-              {
-                  nsCOMPtr<nsIPrintSettings> printSettings;
-                  webBrowserPrint->GetGlobalPrintSettings(getter_AddRefs(printSettings));
-                  NS_ASSERTION(printSettings, "You can't PrintPreview without a PrintSettings!");
-                  if (printSettings) 
-                  {
-                      printSettings->SetPrintSilent(PR_TRUE);
-                      webBrowserPrint->Print(printSettings, (nsIWebProgressListener*)nsnull);
-                  }
-              }
-            }
-            break;
-
-        // Edit menu commands
-
-        case MOZ_Cut:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->CutSelection();
-            }
-            break;
-
-        case MOZ_Copy:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->CopySelection();
-            }
-            break;
-
-        case MOZ_Paste:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->Paste();
-            }
-            break;
-
-        case MOZ_SelectAll:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->SelectAll();
-            }
-            break;
-
-        case MOZ_SelectNone:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->SelectNone();
-            }
-            break;
-
-        // Go menu commands
-        case IDC_BACK:
-        case MOZ_GoBack:
-            webNavigation->GoBack();
-            UpdateUI(chrome);
-            break;
-
-        case IDC_FORWARD:
-        case MOZ_GoForward:
-            webNavigation->GoForward();
-            UpdateUI(chrome);
-            break;
-
-        // Help menu commands
-        case MOZ_About:
-            {
-                TCHAR szAboutTitle[MAX_LOADSTRING];
-                TCHAR szAbout[MAX_LOADSTRING];
-                LoadString(ghInstanceResources, IDS_ABOUT_TITLE, szAboutTitle, MAX_LOADSTRING);
-                LoadString(ghInstanceResources, IDS_ABOUT, szAbout, MAX_LOADSTRING);
-                MessageBox(NULL, szAbout, szAboutTitle, MB_OK);
-            }
-            break;
-          }
-
-	    return TRUE;
-      }
-
-    case WM_ACTIVATE:
-        {
-            nsCOMPtr<nsIWebBrowserFocus> focus(do_GetInterface(webBrowser));
-            if(focus)
-            {
-                switch (wParam)
-                {
-                case WA_ACTIVE:
-                    focus->Activate();
-                    break;
-                case WA_INACTIVE:
-                    focus->Deactivate();
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-        break;
-
-    case WM_SIZE:
-        {
-            UINT newDlgWidth = LOWORD(lParam);
-            UINT newDlgHeight = HIWORD(lParam);
-
-            // TODO Reposition the control bar - for the moment it's fixed size
-
-            // Reposition the status area. Status bar
-            // gets any space that the fixed size progress bar doesn't use.
-            int progressWidth;
-            int statusWidth;
-            int statusHeight;
-            HWND hwndStatus = GetDlgItem(hwndDlg, IDC_STATUS);
-            if (hwndStatus) {
-              RECT rcStatus;
-              GetWindowRect(hwndStatus, &rcStatus);
-              statusHeight = rcStatus.bottom - rcStatus.top;
-            } else
-              statusHeight = 0;
-
-            HWND hwndProgress = GetDlgItem(hwndDlg, IDC_PROGRESS);
-            if (hwndProgress) {
-              RECT rcProgress;
-              GetWindowRect(hwndProgress, &rcProgress);
-              progressWidth = rcProgress.right - rcProgress.left;
-            } else
-              progressWidth = 0;
-            statusWidth = newDlgWidth - progressWidth;
-
-            if (hwndStatus)
-              SetWindowPos(hwndStatus,
-                           HWND_TOP,
-                           0, newDlgHeight - statusHeight,
-                           statusWidth,
-                           statusHeight,
-                           SWP_NOZORDER);
-            if (hwndProgress)
-              SetWindowPos(hwndProgress,
-                           HWND_TOP,
-                           statusWidth, newDlgHeight - statusHeight,
-                           0, 0,
-                           SWP_NOSIZE | SWP_NOZORDER);
-
-            // Resize the browser area (assuming the browse is
-            // sandwiched between the control bar and status area)
-            RECT rcBrowser;
-            POINT ptBrowser;
-            GetWindowRect(hwndBrowser, &rcBrowser);
-            ptBrowser.x = rcBrowser.left;
-            ptBrowser.y = rcBrowser.top;
-            ScreenToClient(hwndDlg, &ptBrowser);
-            int browserHeight = newDlgHeight - ptBrowser.y - statusHeight;
-            if (browserHeight < 1)
-            {
-                browserHeight = 1;
-            }
-            SetWindowPos(hwndBrowser,
-                         HWND_TOP,
-                         0, 0,
-                         newDlgWidth,
-                         newDlgHeight - ptBrowser.y - statusHeight,
-                         SWP_NOMOVE | SWP_NOZORDER);
-        }
-        return TRUE;
-    }
-    return FALSE;
-}
-
-
-//
-//  FUNCTION: BrowserWndProc(HWND, unsigned, WORD, LONG)
-//
-//  PURPOSE:  Processes messages for the browser container window.
-//
-LRESULT CALLBACK BrowserWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    nsIWebBrowserChrome *chrome = (nsIWebBrowserChrome *) GetWindowLong(hWnd, GWL_USERDATA);
-	switch (message) 
-	{
-    case WM_SIZE:
-        // Resize the embedded browser
-        ResizeEmbedding(chrome);
-        return 0;
-    case WM_ERASEBKGND:
-        // Reduce flicker by not painting the non-visible background
-        return 1;
-    }
-    return DefWindowProc(hWnd, message, wParam, lParam);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Profile chooser dialog
-
-
-//
-//  FUNCTION: ChooseNewProfile()
-//
-//  PURPOSE: Allows the user to select a new profile from a list.
-//           The bShowForMultipleProfilesOnly argument specifies whether the
-//           function should automatically select the first profile and return
-//           without displaying a dialog box if there is only one profile to
-//           select.
-//
-BOOL ChooseNewProfile(BOOL bShowForMultipleProfilesOnly, const char *szDefaultProfile)
-{
-    nsresult rv;
-    nsCOMPtr<nsIProfile> profileService = 
-             do_GetService(NS_PROFILE_CONTRACTID, &rv);
-    if (NS_FAILED(rv))
-    {
-        return FALSE;
-    }
-
-    if (szDefaultProfile)
-    {
-        // Make a new default profile
-        nsAutoString newProfileName; newProfileName.AssignWithConversion(szDefaultProfile);
-        rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE);
-        if (NS_FAILED(rv)) return FALSE;
-        rv = profileService->SetCurrentProfile(newProfileName.get());
-        if (NS_FAILED(rv)) return FALSE;
-        return TRUE;
-    }
-
-    PRInt32 profileCount = 0;
-    rv = profileService->GetProfileCount(&profileCount);
-    if (profileCount == 0)
-    {
-        // Make a new default profile
-        NS_NAMED_LITERAL_STRING(newProfileName, "mozEmbed");
-        rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE);
-        if (NS_FAILED(rv)) return FALSE;
-        rv = profileService->SetCurrentProfile(newProfileName.get());
-        if (NS_FAILED(rv)) return FALSE;
-        return TRUE;
-    }
-    else if (profileCount == 1 && bShowForMultipleProfilesOnly)
-    {
-        // GetCurrentProfile returns the profile which was last used but is not nescesarily
-        // active. Call SetCurrentProfile to make it installed and active.
-        
-        nsXPIDLString   currProfileName;
-        rv = profileService->GetCurrentProfile(getter_Copies(currProfileName));
-        if (NS_FAILED(rv)) return FALSE;
-        rv = profileService->SetCurrentProfile(currProfileName);
-        if (NS_FAILED(rv)) return FALSE;
-        return TRUE;
-    }
-
-    INT nResult;
-    nResult = DialogBox(ghInstanceResources, (LPCTSTR)IDD_CHOOSEPROFILE, NULL, (DLGPROC)ChooseProfileDlgProc);
-    return (nResult == IDOK) ? TRUE : FALSE;
-}
-
-
-//
-//  FUNCTION: ChooseProfileDlgProc(HWND, unsigned, WORD, LONG)
-//
-//  PURPOSE:  Dialog handler procedure for the open uri dialog.
-//
-LRESULT CALLBACK ChooseProfileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-  nsresult rv;
-	switch (message)
-	{
-	case WM_INITDIALOG:
-        {
-            HWND hwndProfileList = GetDlgItem(hDlg, IDC_PROFILELIST);
-
-            nsCOMPtr<nsIProfile> profileService = 
-                     do_GetService(NS_PROFILE_CONTRACTID, &rv);
-
-            // Get the list of profile names and add them to the list box
-            PRUint32 listLen = 0;
-            PRUnichar **profileList = nsnull;
-            rv = profileService->GetProfileList(&listLen, &profileList);
-            for (PRUint32 index = 0; index < listLen; index++)
-            {
-#ifdef UNICODE
-                SendMessageW(hwndProfileList, LB_ADDSTRING, 0, (LPARAM) profileList[index]);
-#else
-                nsCAutoString profile; profile.AssignWithConversion(profileList[index]);
-                SendMessageA(hwndProfileList, LB_ADDSTRING, 0, (LPARAM) profile.get());
-#endif
-            }
-
-            // Select the current profile (if there is one)
-
-            // Get the current profile
-#ifdef UNICODE
-            nsXPIDLString currProfile;
-            profileService->GetCurrentProfile(getter_Copies(currProfile));
-#else
-            nsXPIDLString currProfileUnicode;
-            profileService->GetCurrentProfile(getter_Copies(currProfileUnicode));
-            nsCAutoString currProfile; currProfile.AssignWithConversion(currProfileUnicode);
-#endif
-
-            // Now find and select it
-            INT currentProfileIndex = LB_ERR;
-            currentProfileIndex = SendMessage(hwndProfileList, LB_FINDSTRINGEXACT, -1, (LPARAM) currProfile.get());
-            if (currentProfileIndex != LB_ERR)
-            {
-                SendMessage(hwndProfileList, LB_SETCURSEL, currentProfileIndex, 0);
-            }
-        }
-		return TRUE;
-
-	case WM_COMMAND:
-		if (LOWORD(wParam) == IDOK ||
-			(HIWORD(wParam) & LBN_DBLCLK && LOWORD(wParam) == IDC_PROFILELIST))
-        {
-            HWND hwndProfileList = GetDlgItem(hDlg, IDC_PROFILELIST);
-
-            // Get the selected profile from the list box and make it current
-            INT currentProfileIndex = SendMessage(hwndProfileList, LB_GETCURSEL, 0, 0);
-            if (currentProfileIndex != LB_ERR)
-            {
-                nsCOMPtr<nsIProfile> profileService = 
-                         do_GetService(NS_PROFILE_CONTRACTID, &rv);
-                // Convert TCHAR name to unicode and make it current
-                INT profileNameLen = SendMessage(hwndProfileList, LB_GETTEXTLEN, currentProfileIndex, 0);
-                TCHAR *profileName = new TCHAR[profileNameLen + 1];
-                SendMessage(hwndProfileList, LB_GETTEXT, currentProfileIndex, (LPARAM) profileName);
-                nsAutoString newProfile; newProfile.AssignWithConversion(profileName);
-                rv = profileService->SetCurrentProfile(newProfile.get());
-            }
-	        EndDialog(hDlg, IDOK);
-        }
-		else if (LOWORD(wParam) == IDCANCEL)
-		{
-	        EndDialog(hDlg, LOWORD(wParam));
-		}
-        return TRUE;
-	}
-
-    return FALSE;
-}
-
-
-//-----------------------------------------------------------------------------
-// AppCallbacks
-//-----------------------------------------------------------------------------
-
-
-void AppCallbacks::EnableChromeWindow(nsIWebBrowserChrome *aWindow,
-                      PRBool aEnabled)
-{
-  HWND hwnd = GetBrowserDlgFromChrome(aWindow);
-  ::EnableWindow(hwnd, aEnabled ? TRUE : FALSE);
-}
-
-PRUint32 AppCallbacks::RunEventLoop(PRBool &aRunCondition)
-{
-  MSG msg;
-  HANDLE hFakeEvent = ::CreateEvent(NULL, TRUE, FALSE, NULL);
-
-  while (aRunCondition ) {
-    // Process pending messages
-    while (::PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
-      if (!::GetMessage(&msg, NULL, 0, 0)) {
-        // WM_QUIT
-        aRunCondition = PR_FALSE;
-        break;
-      }
-
-      PRBool wasHandled = PR_FALSE;
-      ::NS_HandleEmbeddingEvent(msg, wasHandled);
-      if (wasHandled)
-        continue;
- 
-      ::TranslateMessage(&msg);
-      ::DispatchMessage(&msg);
-    }
-
-    // Do idle stuff
-    ::MsgWaitForMultipleObjects(1, &hFakeEvent, FALSE, 100, QS_ALLEVENTS);
-  }
-  ::CloseHandle(hFakeEvent);
-  return msg.wParam;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// nsQABrowserUIGlue
-///////////////////////////////////////////////////////////////////////////////
-
-nsQABrowserUIGlue::nsQABrowserUIGlue():mAllowNewWindows(PR_TRUE)
-{
-}
-
-nsQABrowserUIGlue::~nsQABrowserUIGlue()
-{
-
-}
-
-NS_IMPL_ISUPPORTS1(nsQABrowserUIGlue, nsIQABrowserUIGlue)
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIQABrowserUIGlue
-////////////////////////////////////////////////////////////////////////////////
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::CreateNewBrowserWindow(PRInt32 aChromeFlags,
-                                          nsIWebBrowserChrome *aParent,
-                                          nsIWebBrowserChrome **aNewWindow)
-{
-
-  printf("In nsQABrowserUIGlue::CreateNewBrowserWindow\n");
-
-  nsresult rv;
-  
-
-  // Create the chrome object. This implements all the interfaces
-  // that an embedding application must implement. 
-  nsCOMPtr<nsIQABrowserChrome> chrome(do_CreateInstance(NS_QABROWSERCHROME_CONTRACTID, &rv));
-  if (!chrome)
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIWebBrowserChrome> webBrowserChrome(do_QueryInterface(chrome));
-
-  if (!webBrowserChrome)
-    return NS_ERROR_FAILURE;
-
-  // now an extra addref; the window owns itself (to be released by
-  // nsQABrowserUIGlue::Destroy) 
-  *aNewWindow = webBrowserChrome.get();
-  NS_ADDREF(*aNewWindow);
- 
-    // Set the chrome flags on the chrome. This may not be necessary.
-  webBrowserChrome->SetChromeFlags(aChromeFlags);
-  //  chrome->SetParent(aParent);
-
-  // Create the browser view object. nsIBrowserView  creates and holds
-  // handle to the nsIWebBrowser  object.   
-  mBrowserView = do_CreateInstance(NS_QABROWSERVIEW_CONTRACTID, &rv);
-  if (!mBrowserView)
-    return NS_ERROR_FAILURE;
-
-  // Create the native window.
-  nativeWindow nativeWnd;
-  nativeWnd = CreateNativeWindow(*aNewWindow);
-  
-  // Wire all the layers together.
-  chrome->InitQAChrome(this,  nativeWnd);
-
-    // Create the actual browser.
-  mBrowserView->CreateBrowser(nativeWnd, webBrowserChrome);
- 
-  // Place it where we want it.
-  ResizeEmbedding(webBrowserChrome);
-
-  // if opened as chrome, it'll be made visible after the chrome has loaded.
-  // otherwise, go ahead and show it now.
-  if (!(aChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME))
-    ShowWindow(*aNewWindow, PR_TRUE);
-
-  return NS_OK;
-}
-
-
-//
-// FUNCTION: Destroy()
-//
-// PURPOSE: Destroy the window specified by the chrome
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::Destroy(nsIWebBrowserChrome* chrome)
-{
-  nsCOMPtr<nsIWebBrowser> webBrowser;
-  nsCOMPtr<nsIWebNavigation> webNavigation;
-
-  chrome->GetWebBrowser(getter_AddRefs(webBrowser));
-  webNavigation = do_QueryInterface(webBrowser);
-  if (webNavigation)
-    webNavigation->Stop(nsIWebNavigation::STOP_ALL);
-
-  chrome->ExitModalEventLoop(NS_OK);
-
-  // Explicitly destroy the embedded browser and then the chrome
-  // First the browser
-  nsCOMPtr<nsIBaseWindow> browserAsWin = do_QueryInterface(webBrowser);
-  if (browserAsWin)
-    browserAsWin->Destroy();
-
-      // Now the chrome
-  chrome->SetWebBrowser(nsnull);
-  NS_RELEASE(chrome);
-  return NS_OK;
-}
-
-
-//
-// FUNCTION: Called as the final act of a chrome object during its destructor
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::Destroyed(nsIWebBrowserChrome* chrome)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(chrome);
-	if (hwndDlg == NULL)
-	{
-		return NS_ERROR_FAILURE;
-	}
-
-    // Clear the window user data
-    HWND hwndBrowser = GetDlgItem(hwndDlg, IDC_BROWSER);
-    SetWindowLong(hwndBrowser, GWL_USERDATA, nsnull);
-	  DestroyWindow(hwndBrowser);
-    DestroyWindow(hwndDlg);
-
-    --gDialogCount;
-    if (gDialogCount == 0)
-    {
-        if (gProfileSwitch)
-        {
-            gProfileSwitch = FALSE;
-            OpenWebPage(gFirstURL);
-        }
-        else
-        {
-            // Quit when there are no more browser objects
-            PostQuitMessage(0);
-        }
-    }
-    return NS_OK;
-}
-
-
-//
-// FUNCTION: Set the input focus onto the browser window
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::SetFocus(nsIWebBrowserChrome *chrome)
-{
-  HWND hwndDlg = GetBrowserDlgFromChrome(chrome);
-	if (hwndDlg == NULL)
-	{
-		return NS_ERROR_FAILURE;
-	}
-    
-  HWND hwndBrowser = GetDlgItem(hwndDlg, IDC_BROWSER);
-  ::SetFocus(hwndBrowser);
-  return NS_OK;
-}
-
-//
-//  FUNCTION: UpdateStatusBarText()
-//
-//  PURPOSE: Set the status bar text.
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::UpdateStatusBarText(nsIWebBrowserChrome *aChrome, const PRUnichar* aStatusText)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    nsCString status; 
-    if (aStatusText)
-        status.AssignWithConversion(aStatusText);
-    SetDlgItemText(hwndDlg, IDC_STATUS, status.get());
-    return NS_OK;
-}
-
-
-//
-//  FUNCTION: UpdateCurrentURI()
-//
-//  PURPOSE: Updates the URL address field
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::UpdateCurrentURI(nsIWebBrowserChrome *aChrome)
-{
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    nsCOMPtr<nsIWebNavigation> webNavigation;
-    aChrome->GetWebBrowser(getter_AddRefs(webBrowser));
-    webNavigation = do_QueryInterface(webBrowser);
-
-    nsCOMPtr<nsIURI> currentURI;
-    webNavigation->GetCurrentURI(getter_AddRefs(currentURI));
-    if (currentURI)
-    {
-        nsCAutoString uriString;
-        currentURI->GetAsciiSpec(uriString);
-        HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-        SetDlgItemText(hwndDlg, IDC_ADDRESS, uriString.get());
-    }
-    return NS_OK;
-}
-
-
-//
-//  FUNCTION: UpdateBusyState()
-//
-//  PURPOSE: Refreshes the stop/go buttons in the browser dialog
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::UpdateBusyState(nsIWebBrowserChrome *aChrome, PRBool aBusy)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    HWND button;
-    button = GetDlgItem(hwndDlg, IDC_STOP);
-    if (button)
-        EnableWindow(button, aBusy);
-    button = GetDlgItem(hwndDlg, IDC_GO);
-    if (button)
-        EnableWindow(button, !aBusy);
-    UpdateUI(aChrome);
-    return NS_OK;
-}
-
-
-//
-//  FUNCTION: UpdateProgress()
-//
-//  PURPOSE: Refreshes the progress bar in the browser dialog
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::UpdateProgress(nsIWebBrowserChrome *aChrome, PRInt32 aCurrent, PRInt32 aMax)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    HWND hwndProgress = GetDlgItem(hwndDlg, IDC_PROGRESS);
-    if (aCurrent < 0)
-    {
-        aCurrent = 0;
-    }
-    if (aCurrent > aMax)
-    {
-        aMax = aCurrent + 20; // What to do?
-    }
-    if (hwndProgress)
-    {
-        SendMessage(hwndProgress, PBM_SETRANGE, 0, MAKELPARAM(0, aMax));
-        SendMessage(hwndProgress, PBM_SETPOS, aCurrent, 0);
-    }
-    return NS_OK;
-}
-
-//
-//  FUNCTION: ShowContextMenu()
-//
-//  PURPOSE: Display a context menu for the given node
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::ShowContextMenu(nsIWebBrowserChrome *aChrome, PRInt32 aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode)
-{
-    // TODO code to test context flags and display a popup menu should go here
-  return NS_OK;
-}
-
-//
-//  FUNCTION: ShowTooltip()
-//
-//  PURPOSE: Show a tooltip
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::ShowTooltip(nsIWebBrowserChrome *aChrome, PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText)
-{
-    // TODO code to show a tooltip should go here
-  return NS_OK;
-}
-
-//
-//  FUNCTION: HideTooltip()
-//
-//  PURPOSE: Hide the tooltip
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::HideTooltip(nsIWebBrowserChrome *aChrome)
-{
-    // TODO code to hide a tooltip should go here
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::ShowWindow(nsIWebBrowserChrome *aChrome, PRBool aShow)
-{
-  HWND win = GetBrowserDlgFromChrome(aChrome);
-  return ::ShowWindow(win, aShow ? SW_RESTORE : SW_HIDE);
-}
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::SizeTo(nsIWebBrowserChrome *aChrome, PRInt32 aWidth, PRInt32 aHeight)
-{
-  HWND win = GetBrowserDlgFromChrome(aChrome);
-  RECT winRect;
-
-  ::GetWindowRect(win, &winRect);
-  return ::MoveWindow(win, winRect.left, winRect.top, aWidth, aHeight, TRUE);
-}
-
-//
-//  FUNCTION: GetResourceStringByID()
-//
-//  PURPOSE: Get the resource string for the ID
-//
-NS_IMETHODIMP
-nsQABrowserUIGlue::GetResourceStringById(PRInt32 aID, char ** aReturn)
-{
-    char resBuf[MAX_LOADSTRING];
-    int retval = LoadString( ghInstanceResources, aID, (LPTSTR)resBuf, sizeof(resBuf) );
-    if (retval != 0)
-    {
-        int resLen = strlen(resBuf);
-        *aReturn = (char *)calloc(resLen+1, sizeof(char *));
-        if (!*aReturn) return NS_OK;
-            PL_strncpy(*aReturn, (char *) resBuf, resLen);
-    }
-    return NS_OK; 
-}
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::SetTitle(const PRUnichar * aTitle)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::GetTitle(PRUnichar ** aTitle)
-{
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::SetVisibility(PRBool aVisibility)
-{
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::GetVisibility(PRBool * aVisibility)
-{
-  *aVisibility = PR_TRUE;
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::SetAllowNewBrowserWindows(PRBool aValue)
-{
-  mAllowNewWindows = aValue;
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::GetAllowNewBrowserWindows(PRBool * aReturn)
-{
-  if (aReturn)
-    *aReturn = mAllowNewWindows;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::LoadHomePage()
-{
-  NS_NAMED_LITERAL_CSTRING (url, "http://www.mozilla.org/embedding");
-  return LoadURL(url.get());
-
-}
-
-NS_IMETHODIMP
-nsQABrowserUIGlue::LoadURL(const char * aURL)
-{
-  nsresult rv = NS_OK;
-  // Start loading a page
-  nsCOMPtr<nsIWebBrowser> newBrowser;
-  mBrowserView->GetWebBrowser(getter_AddRefs(newBrowser));
-  nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(newBrowser, &rv));
-  if (webNav)
-    return webNav->LoadURI(NS_ConvertASCIItoUTF16(aURL).get(),
-                           nsIWebNavigation::LOAD_FLAGS_NONE,
-                           nsnull,
-                           nsnull,
-                           nsnull);
-  return rv;
-}
-
-
-//
-//  FUNCTION: CreateNativeWindow()
-//
-//  PURPOSE: Creates a new browser dialog.
-//  COMMENTS:
-//
-//    This function loads the browser dialog from a resource template
-//    and returns the HWND for the webbrowser container dialog item
-//    to the caller.
-//
-nativeWindow
-nsQABrowserUIGlue::CreateNativeWindow(nsIWebBrowserChrome* chrome)
-{
-  // Load the browser dialog from resource
-  HWND hwndDialog;
-  PRUint32 chromeFlags;
-
-  chrome->GetChromeFlags(&chromeFlags);
-  if ((chromeFlags & nsIWebBrowserChrome::CHROME_ALL) == nsIWebBrowserChrome::CHROME_ALL)
-    hwndDialog = CreateDialog(ghInstanceResources,
-                              MAKEINTRESOURCE(IDD_BROWSER),
-                              NULL,
-                              BrowserDlgProc);
-  else
-    hwndDialog = CreateDialog(ghInstanceResources,
-                              MAKEINTRESOURCE(IDD_BROWSER_NC),
-                              NULL,
-                              BrowserDlgProc);
-  if (!hwndDialog)
-    return (void *) nsnull;
-
-  // Stick a menu onto it
-  if (chromeFlags & nsIWebBrowserChrome::CHROME_MENUBAR) {
-    HMENU hmenuDlg = LoadMenu(ghInstanceResources, MAKEINTRESOURCE(IDC_MOZEMBED));
-    SetMenu(hwndDialog, hmenuDlg);
-  } else
-    SetMenu(hwndDialog, 0);
-
-  // Add some interesting URLs to the address drop down
-  HWND hwndAddress = GetDlgItem(hwndDialog, IDC_ADDRESS);
-  if (hwndAddress) {
-    for (int i = 0; i < sizeof(gDefaultURLs) / sizeof(gDefaultURLs[0]); i++)
-    {
-      SendMessage(hwndAddress, CB_ADDSTRING, 0, (LPARAM) gDefaultURLs[i]);
-    }
-  }
-
-  // Fetch the browser window handle
-  HWND hwndBrowser = GetDlgItem(hwndDialog, IDC_BROWSER);
-  SetWindowLong(hwndBrowser, GWL_USERDATA, (LONG)chrome);  // save the browser LONG_PTR.
-  SetWindowLong(hwndBrowser, GWL_STYLE, GetWindowLong(hwndBrowser, GWL_STYLE) | WS_CLIPCHILDREN);
-
-  // Activate the window
-  PostMessage(hwndDialog, WM_ACTIVATE, WA_ACTIVE, 0);
-
-  gDialogCount++;
-
-  return (void *) hwndBrowser;
-}
diff --git a/embedding/qa/mozembed/src/mozEmbed.h b/embedding/qa/mozembed/src/mozEmbed.h
deleted file mode 100644
index bff8855500c..00000000000
--- a/embedding/qa/mozembed/src/mozEmbed.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prtypes.h"
-
-class nsIWebBrowserChrome;
-
-namespace AppCallbacks {
-  void     EnableChromeWindow(nsIWebBrowserChrome *aWindow, PRBool aEnabled);
-
-  PRUint32 RunEventLoop(PRBool &aRunCondition);
-}
diff --git a/embedding/qa/mozembed/src/mozEmbed.rc b/embedding/qa/mozembed/src/mozEmbed.rc
deleted file mode 100644
index 88af806a8b7..00000000000
--- a/embedding/qa/mozembed/src/mozEmbed.rc
+++ /dev/null
@@ -1,263 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-#include "resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_MOZEMBED            ICON    DISCARDABLE     "mozEmbed.ICO"
-IDI_SMALL               ICON    DISCARDABLE     "SMALL.ICO"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDC_MOZEMBED MENU DISCARDABLE 
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "New Browser...",              MOZ_NewBrowser
-        MENUITEM SEPARATOR
-        MENUITEM SEPARATOR
-        MENUITEM "&Save As...",                 MOZ_Save
-        MENUITEM "E&xit",                       IDM_EXIT
-    END
-    POPUP "&Edit"
-    BEGIN
-        MENUITEM "Cu&t",                        MOZ_Cut
-        MENUITEM "&Copy",                       MOZ_Copy
-        MENUITEM "&Paste",                      MOZ_Paste
-        MENUITEM SEPARATOR
-        MENUITEM "Select All",                  MOZ_SelectAll
-        MENUITEM "Select None",                 MOZ_SelectNone
-    END
-    POPUP "&Go"
-    BEGIN
-        MENUITEM "&Back",                       MOZ_GoBack
-        MENUITEM "&Forward",                    MOZ_GoForward
-    END
-    POPUP "&Debug"
-    BEGIN
-        MENUITEM "&This space for rent",        ID_DEBUG_THISSPACEFORRENT
-        , GRAYED
-    END
-END
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "#include ""windows.h""\r\n"
-    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "#include ""resource.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_APP_TITLE           "winEmbed"
-    IDS_HELLO               "Embedding Mozilla is so much fun!!"
-    IDS_ABOUT               "winEmbed - Gecko embedding sample"
-    IDS_ABOUT_TITLE         "About winEmbed"
-    IDS_HIST_BACK           "Going Back to: "
-    IDS_HIST_FORWARD        "Going Forward to: "
-    IDS_HIST_RELOAD_NORMAL  "Reloading url, (normal) :"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_HIST_RELOAD_BYPASSPROXY "Reloading url, (bypassing Proxy) :"
-    IDS_HIST_RELOAD_BYPASSCACHE "Reloading url, (bypassing cache) :"
-    IDS_HIST_ADDURL         " added to Session History"
-    IDS_HIST_RELOAD_BYPASSPROXYANDCACHE 
-                            "Reloading url, (bypassing Proxy and cache) :"
-    IDS_HIST_PURGE          "purged from session history"
-    IDS_HIST_GOTO           "Going to history index : "
-    IDS_HIST_URL            " URL : "
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_BROWSER DIALOG DISCARDABLE  0, 0, 400, 217
-STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPCHILDREN | 
-    WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-CAPTION "winEmbed sample - UNSUPPORTED"
-MENU IDC_MOZEMBED
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "Back",IDC_BACK,1,1,21,13
-    PUSHBUTTON      "Forward",IDC_FORWARD,23,1,30,13
-    PUSHBUTTON      "Reload",IDC_RELOAD,57,1,28,13
-    PUSHBUTTON      "Stop",IDC_STOP,86,1,25,13
-    LTEXT           "Address:",IDC_STATIC,115,3,28,8
-    COMBOBOX        IDC_ADDRESS,145,1,193,52,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
-                    WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "Go",IDC_GO,340,1,25,13
-    CONTROL         "Embedded Browser",IDC_BROWSER,"MOZEMBED",WS_TABSTOP,0,
-                    16,400,192
-    CONTROL         "Status",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | 
-                    SS_SUNKEN | WS_GROUP,0,208,316,9
-    CONTROL         "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER,
-                    316,208,84,9
-END
-
-IDD_BROWSER_NC DIALOG DISCARDABLE  0, 0, 400, 217
-STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPCHILDREN | 
-    WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-CAPTION "winEmbed chromeless sample"
-MENU IDC_MOZEMBED
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Embedded Browser",IDC_BROWSER,"MOZEMBED",WS_TABSTOP,0,0,
-                    400,217
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_BROWSER, DIALOG
-    BEGIN
-        RIGHTMARGIN, 292
-        BOTTOMMARGIN, 216
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.K.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (Ireland) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENI)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_CHOOSEPROFILE DIALOG DISCARDABLE  0, 0, 186, 154
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Choose Profile"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Available Profiles:",IDC_STATIC,7,7,56,8
-    LISTBOX         IDC_PROFILELIST,7,18,117,129,LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "Select",IDOK,129,18,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,129,36,50,14
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_CHOOSEPROFILE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 147
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (Ireland) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/embedding/qa/mozembed/src/nsQABrowserCID.h b/embedding/qa/mozembed/src/nsQABrowserCID.h
deleted file mode 100644
index 8da4b5aa4e9..00000000000
--- a/embedding/qa/mozembed/src/nsQABrowserCID.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Radha Kulkarni <radha@netscape.com>, Original Author
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-#define NS_QABROWSERUIGLUE_CONTRACTID "@mozilla.org/qaembed-browseruiglue;1"
-#define NS_QABROWSERUIGLUE_CID \
-{0x243e56f6, 0xeaab, 0x469b,   \
-{0xba, 0x36, 0xfd, 0xfc, 0xbc, 0xbe, 0x73, 0x77}}
-
-
-#define NS_QABROWSERCHROME_CONTRACTID "@mozilla.org/qaembed-browserchrome;1"
-#define NS_QABROWSERCHROME_CID \
-{0xa7ddddd, 0x9bb9, 0x411e,    \
-{0xb2, 0x80, 0xab, 0x1b, 0x83, 0x4b, 0x88, 0x80}}
-
-
-#define NS_QABROWSERVIEW_CONTRACTID "@mozilla.org/qaembed-browserview;1"
-#define NS_QABROWSERVIEW_CID \
-{0x6f5af858, 0xe5c2, 0x4b5a, \
-{0x9e, 0xf1, 0x9e, 0x19, 0xa3, 0xab, 0x92, 0x18}}
diff --git a/embedding/qa/mozembed/src/nsQABrowserChrome.cpp b/embedding/qa/mozembed/src/nsQABrowserChrome.cpp
deleted file mode 100644
index 11835de46da..00000000000
--- a/embedding/qa/mozembed/src/nsQABrowserChrome.cpp
+++ /dev/null
@@ -1,405 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Radha Kulkarni (radha@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Mozilla Includes
-#include "nsIGenericFactory.h"
-#include "nsIComponentManager.h"
-#include "nsString.h"
-#include "nsXPIDLString.h"
-#include "nsIURI.h"
-#include "nsIWebProgress.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIDOMWindow.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIRequest.h"
-#include "nsIChannel.h"
-#include "nsCWebBrowser.h"
-#include "nsWidgetsCID.h"
-#include "nsIProfileChangeStatus.h"
-#include "nsCRT.h"
-#include "nsWeakReference.h"
-
-// Local includes
-#include "resource.h"
-#include "mozEmbed.h"
-#include "nsQABrowserChrome.h"
-
-
-nsQABrowserChrome::nsQABrowserChrome()
-{
-    mNativeWindow = nsnull;
-    mSizeSet = PR_FALSE;
-}
-
-nsQABrowserChrome::~nsQABrowserChrome()
-{
-  if (mBrowserUIGlue)
-    mBrowserUIGlue->Destroyed(this);
-}
-
-
-//*****************************************************************************
-// nsQABrowserChrome::nsISupports
-//*****************************************************************************   
-
-
-NS_IMPL_ISUPPORTS7(nsQABrowserChrome, 
-                   nsIQABrowserChrome, 
-                   nsIWebBrowserChrome,
-                   nsIInterfaceRequestor,
-                   nsIEmbeddingSiteWindow,
-                   nsIWebProgressListener,
-                   nsIWebBrowserChromeFocus,
-                   nsISupportsWeakReference);
-
-
-
-//*****************************************************************************
-// nsQABrowserChrome::nsIInterfaceRequestor
-//*****************************************************************************   
-
-NS_IMETHODIMP nsQABrowserChrome::GetInterface(const nsIID &aIID, void** aInstancePtr)
-{
-    NS_ENSURE_ARG_POINTER(aInstancePtr);
-
-    *aInstancePtr = 0;
-    if (aIID.Equals(NS_GET_IID(nsIDOMWindow)))
-    {
-        if (mWebBrowser)
-        {
-            return mWebBrowser->GetContentDOMWindow((nsIDOMWindow **) aInstancePtr);
-        }
-        return NS_ERROR_NOT_INITIALIZED;
-    }
-    return QueryInterface(aIID, aInstancePtr);
-}
-
-//*****************************************************************************
-// nsQABrowserChrome::nsIQABrowserChrome
-//*****************************************************************************   
-
-NS_IMETHODIMP
-nsQABrowserChrome::InitQAChrome(nsIQABrowserUIGlue * aUIGlue,  nativeWindow aNativeWnd)
-{
-  mBrowserUIGlue = aUIGlue;
-  mNativeWindow = aNativeWnd;
-  
-  return NS_OK;
-}
-
-//*****************************************************************************
-// nsQABrowserChrome::nsIQABrowserChrome
-//*****************************************************************************   
-
-NS_IMETHODIMP nsQABrowserChrome::SetStatus(PRUint32 aType, const PRUnichar* aStatus)
-{
-  if (mBrowserUIGlue)
-    return mBrowserUIGlue->UpdateStatusBarText(this, aStatus);
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsQABrowserChrome::GetWebBrowser(nsIWebBrowser** aWebBrowser)
-{
-    NS_ENSURE_ARG_POINTER(aWebBrowser);
-    *aWebBrowser = mWebBrowser;
-    NS_IF_ADDREF(*aWebBrowser);
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsQABrowserChrome::SetWebBrowser(nsIWebBrowser* aWebBrowser)
-{
-    mWebBrowser = aWebBrowser;
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsQABrowserChrome::GetChromeFlags(PRUint32* aChromeMask)
-{
-  if (aChromeMask)
-    *aChromeMask = mChromeFlags;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsQABrowserChrome::SetChromeFlags(PRUint32 aChromeMask)
-{
-    mChromeFlags = aChromeMask;
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsQABrowserChrome::DestroyBrowserWindow(void)
-{
-  if (mBrowserUIGlue)
-    return mBrowserUIGlue->Destroy(this);
-  return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsQABrowserChrome::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
-{
-  /* This isn't exactly correct: we're setting the whole window to
-     the size requested for the browser. At time of writing, though,
-     it's fine and useful for mozEmbed's purposes. 
-  */
-  mSizeSet = PR_TRUE;
-  if (mBrowserUIGlue)
-    return mBrowserUIGlue->SizeTo(this, aCX, aCY);
-  return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsQABrowserChrome::ShowAsModal(void)
-{
-/*
-  if (mDependentParent)
-    AppCallbacks::EnableChromeWindow(mDependentParent, PR_FALSE);
-
-  mContinueModalLoop = PR_TRUE;
-  AppCallbacks::RunEventLoop(mContinueModalLoop);
-
-  if (mDependentParent)
-    AppCallbacks::EnableChromeWindow(mDependentParent, PR_TRUE);
-*/
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsQABrowserChrome::IsWindowModal(PRBool *aReturn)
-{
-  if (aReturn)
-    *aReturn = PR_FALSE;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsQABrowserChrome::ExitModalEventLoop(nsresult aStatus)
-{
-  mContinueModalLoop = PR_FALSE;
-  return NS_OK;
-}
-
-//*****************************************************************************
-// nsQABrowserChrome::nsIEmbeddingSiteWindow
-//*****************************************************************************   
-
-NS_IMETHODIMP nsQABrowserChrome::SetDimensions(PRUint32 aFlags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsQABrowserChrome::GetDimensions(PRUint32 aFlags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy)
-{
-    if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_POSITION)
-    {
-        *x = 0;
-        *y = 0;
-    }
-    if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_INNER ||
-        aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_OUTER)
-    {
-        *cx = 0;
-        *cy = 0;
-    }
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setFocus (); */
-NS_IMETHODIMP nsQABrowserChrome::SetFocus()
-{
-  if (mBrowserUIGlue)
-    return mBrowserUIGlue->SetFocus(this);
-  return NS_ERROR_FAILURE;
-}
-
-/* attribute wstring title; */
-NS_IMETHODIMP nsQABrowserChrome::GetTitle(PRUnichar * *aTitle)
-{
-   NS_ENSURE_ARG_POINTER(aTitle);
-   *aTitle = nsnull;   
-   return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsQABrowserChrome::SetTitle(const PRUnichar * aTitle)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute boolean visibility; */
-NS_IMETHODIMP nsQABrowserChrome::GetVisibility(PRBool * aVisibility)
-{
-    NS_ENSURE_ARG_POINTER(aVisibility);
-    *aVisibility = PR_TRUE;
-    return NS_OK;
-}
-NS_IMETHODIMP nsQABrowserChrome::SetVisibility(PRBool aVisibility)
-{
-    return NS_OK;
-}
-
-/* attribute nativeSiteWindow siteWindow */
-NS_IMETHODIMP nsQABrowserChrome::GetSiteWindow(void * *aSiteWindow)
-{
-   NS_ENSURE_ARG_POINTER(aSiteWindow);
-   *aSiteWindow = mNativeWindow;
-   return NS_OK;
-}
-
-
-//*****************************************************************************
-// nsQABrowserChrome::nsIWebProgressListener
-//*****************************************************************************   
-NS_IMETHODIMP
-nsQABrowserChrome::OnProgressChange(nsIWebProgress *progress, nsIRequest *request,
-                                    PRInt32 curSelfProgress, PRInt32 maxSelfProgress,
-                                    PRInt32 curTotalProgress, PRInt32 maxTotalProgress)
-{
-  if (mBrowserUIGlue)
-    return mBrowserUIGlue->UpdateProgress(this, curTotalProgress, maxTotalProgress);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsQABrowserChrome::OnStateChange(nsIWebProgress *progress, nsIRequest *request,
-                                               PRUint32 progressStateFlags, nsresult status)
-{
-  if (!mBrowserUIGlue)
-    return NS_ERROR_FAILURE;
-
-  if ((progressStateFlags & STATE_START) && (progressStateFlags & STATE_IS_DOCUMENT))
-  {
-    mBrowserUIGlue->UpdateBusyState(this, PR_TRUE);
-  }
-
-  if ((progressStateFlags & STATE_STOP) && (progressStateFlags & STATE_IS_DOCUMENT))
-  {
-    mBrowserUIGlue->UpdateBusyState(this, PR_FALSE);
-    mBrowserUIGlue->UpdateProgress(this, 0, 100);
-    mBrowserUIGlue->UpdateStatusBarText(this, nsnull);
-    ContentFinishedLoading();
-  }
-
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsQABrowserChrome::OnLocationChange(nsIWebProgress* aWebProgress,
-                                    nsIRequest* aRequest,
-                                    nsIURI *location)
-{
-  if (!mBrowserUIGlue)
-    return NS_ERROR_FAILURE;
-
-  PRBool isSubFrameLoad = PR_FALSE; // Is this a subframe load
-  if (aWebProgress) {
-    nsCOMPtr<nsIDOMWindow>  domWindow;
-    nsCOMPtr<nsIDOMWindow>  topDomWindow;
-    aWebProgress->GetDOMWindow(getter_AddRefs(domWindow));
-    if (domWindow) { // Get root domWindow
-      domWindow->GetTop(getter_AddRefs(topDomWindow));
-    }
-    if (domWindow != topDomWindow)
-      isSubFrameLoad = PR_TRUE;
-  }
-  if (!isSubFrameLoad)
-    mBrowserUIGlue->UpdateCurrentURI(this);
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsQABrowserChrome::OnStatusChange(nsIWebProgress* aWebProgress,
-                                 nsIRequest* aRequest,
-                                 nsresult aStatus,
-                                 const PRUnichar* aMessage)
-{
-  if (mBrowserUIGlue)
-    return mBrowserUIGlue->UpdateStatusBarText(this, aMessage);
-  return NS_OK;
-}
-
-
-
-NS_IMETHODIMP 
-nsQABrowserChrome::OnSecurityChange(nsIWebProgress *aWebProgress, 
-                                    nsIRequest *aRequest, 
-                                    PRUint32 state)
-{
-    return NS_OK;
-}
-//*****************************************************************************
-// nsQABrowserChrome::nsInsQABrowserChromeFocus
-//*****************************************************************************   
-
-NS_IMETHODIMP
-nsQABrowserChrome::FocusNextElement()
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsQABrowserChrome::FocusPrevElement()
-{
-    return NS_OK;
-}
-
-
-
-void
-nsQABrowserChrome::ContentFinishedLoading()
-{
-  // if it was a chrome window and no one has already specified a size,
-  // size to content
-  if (mWebBrowser && !mSizeSet && mBrowserUIGlue &&
-     (mChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME)) {
-    nsCOMPtr<nsIDOMWindow> contentWin;
-    mWebBrowser->GetContentDOMWindow(getter_AddRefs(contentWin));
-    if (contentWin)
-        contentWin->SizeToContent();
-    mBrowserUIGlue->ShowWindow(this, PR_TRUE);
-  }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/embedding/qa/mozembed/src/nsQABrowserChrome.h b/embedding/qa/mozembed/src/nsQABrowserChrome.h
deleted file mode 100644
index af754ee62b0..00000000000
--- a/embedding/qa/mozembed/src/nsQABrowserChrome.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __nsQABrowserChrome__
-#define __nsQABrowserChrome__
-
-#include "nsCOMPtr.h"
-#include "nsIGenericFactory.h"
-#include "nsString.h"
-#include "nsIWebBrowserChrome.h"
-#include "nsIQABrowserChrome.h"
-#include "nsIDocShell.h"
-#include "nsIBaseWindow.h"
-#include "nsIEmbeddingSiteWindow.h"
-#include "nsIWebNavigation.h"
-#include "nsIWebBrowser.h"
-#include "nsWeakReference.h"
-#include "nsIWeakReference.h"
-#include "nsIQABrowserView.h"
-#include "nsIQABrowserUIGlue.h"
-#include "nsIWebProgressListener.h"
-#include "nsIWebBrowserChromeFocus.h"
-
-/*
-#include "nsIContentViewer.h"
-#include "nsIContentViewerFile.h"
-
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIObserver.h"
-#include "nsISHistoryListener.h"
-#include "nsIContextMenuListener.h"
-#include "nsITooltipListener.h"
-*/
-
-class nsQABrowserChrome   : public nsIWebBrowserChrome,
-                            public nsIEmbeddingSiteWindow,
-                            public nsIInterfaceRequestor,
-                            public nsIQABrowserChrome,
-                            public nsSupportsWeakReference,
-                            public nsIWebProgressListener,
-                            public nsIWebBrowserChromeFocus
-{
-public:
-    nsQABrowserChrome();
-    virtual ~nsQABrowserChrome();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIWEBBROWSERCHROME
-    NS_DECL_NSIQABROWSERCHROME
-    NS_DECL_NSIINTERFACEREQUESTOR
-    NS_DECL_NSIEMBEDDINGSITEWINDOW
-    NS_DECL_NSIWEBBROWSERCHROMEFOCUS
-    NS_DECL_NSIWEBPROGRESSLISTENER
-
-protected:
-
-    void ContentFinishedLoading();
-
-    nativeWindow mNativeWindow;
-    PRUint32     mChromeFlags;
-    PRBool       mContinueModalLoop;
-    PRBool       mSizeSet;
-
-    nsCOMPtr<nsIWebBrowser> mWebBrowser;
-    nsCOMPtr<nsIQABrowserUIGlue> mBrowserUIGlue;    
-    nsCOMPtr<nsIWebBrowserChrome> mDependentParent; // opener (for dependent windows only)
-    
-};
-
-#endif /* __nsQABrowserChrome__ */
diff --git a/embedding/qa/mozembed/src/nsQABrowserModule.cpp b/embedding/qa/mozembed/src/nsQABrowserModule.cpp
deleted file mode 100644
index 66d067f1248..00000000000
--- a/embedding/qa/mozembed/src/nsQABrowserModule.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Radha Kulkarni (radha@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIModule.h"
-#include "nsIGenericFactory.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIComponentRegistrar.h"
-
-#include "nsQABrowserCID.h"
-#include "nsQABrowserView.h"
-#include "nsQABrowserUIGlue.h"
-#include "nsQABrowserChrome.h"
-
-// Factory Constructors
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsQABrowserView)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsQABrowserUIGlue)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsQABrowserChrome)
-
-// Component Table
-
-
-
-static NS_DEFINE_CID(kBrowserViewCID, NS_QABROWSERVIEW_CID);
-static NS_DEFINE_CID(kBrowserUIGlueCID, NS_QABROWSERUIGLUE_CID);
-static NS_DEFINE_CID(kBrowserChromeCID, NS_QABROWSERCHROME_CID);
-
-static const nsModuleComponentInfo gQAEmbeddingModuleViewInfo[] =
-{
-   { "QA_BrowserView Component", NS_QABROWSERVIEW_CID, 
-     NS_QABROWSERVIEW_CONTRACTID, nsQABrowserViewConstructor }
-};
-
-static const nsModuleComponentInfo gQAEmbeddingModuleUIInfo[] =
-{
-   { "QA_BrowserUIGlue Component", NS_QABROWSERUIGLUE_CID,
-     NS_QABROWSERUIGLUE_CONTRACTID, nsQABrowserUIGlueConstructor }
-};
-
-static const nsModuleComponentInfo gQAEmbeddingModuleChromeInfo[] =
-{
-   { "QA_BrowserChrome Component", NS_QABROWSERCHROME_CID,
-     NS_QABROWSERCHROME_CONTRACTID, nsQABrowserChromeConstructor }
-};
-
-nsresult
-RegisterComponents()
-{
-
-  nsresult rv=NS_OK;
-  nsIGenericFactory* fact;
-
-  // Register the factory for all supporting interfaces. 
-  nsCOMPtr<nsIComponentRegistrar> registrar;
-  rv = NS_GetComponentRegistrar(getter_AddRefs(registrar));
-  if (NS_FAILED(rv))
-    return rv;
-
-  // Register nsQABrowserView
-  rv = NS_NewGenericFactory(&fact, gQAEmbeddingModuleViewInfo);
-  rv = registrar->RegisterFactory(kBrowserViewCID,
-                                  "QA Embedding BrowserView",
-                                  NS_QABROWSERVIEW_CONTRACTID,
-                                  fact);
-  NS_RELEASE(fact);
-
-  //Register nsQABrowserUIGlue
-  rv = NS_NewGenericFactory(&fact, gQAEmbeddingModuleUIInfo);
-
-  rv = registrar->RegisterFactory(kBrowserUIGlueCID,
-                                  "QA Embedding BrowserUIGlue",
-                                  NS_QABROWSERUIGLUE_CONTRACTID,
-                                  fact);
-  NS_RELEASE(fact);
-
-  //Register nsQABrowserChrome
-  rv = NS_NewGenericFactory(&fact, gQAEmbeddingModuleChromeInfo);
-
-  rv = registrar->RegisterFactory(kBrowserChromeCID,
-                                  "QA Embedding BrowserChrome",
-                                  NS_QABROWSERCHROME_CONTRACTID,
-                                  fact);
-  NS_RELEASE(fact);
-  return rv;
-
-}
-
-
-
-
-#if 0
-nsresult
-NSRegisterSelf(nsISupports* aServMgr, const char* aPath)
-{
-  nsresult rv;
-  nsCOMPtr<nsIComponentManagerObsolete> compMgr =
-           do_GetService(kComponentManagerCID, aServMgr, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = compMgr->RegisterComponent(kBrowserViewCID,
-                                  "QA Embedding BrowserView",
-                                  NS_QABROWSERVIEW_CONTRACTID,
-                                  aPath, PR_TRUE, PR_TRUE);
-  rv = compMgr->RegisterComponent(kBrowserUIGlueCID,
-                                  "QA Embedding BrowserUIGlue",
-                                  NS_QABROWSERUIGLUE_CONTRACTID,
-                                  aPath, PR_TRUE, PR_TRUE);
-
-  return rv;
-
-}
-
-nsresult
-NSUnregisterSelf(nsISupports* aServMgr, const char* aPath)
-{
-  nsresult rv;
-  nsCOMPtr<nsIComponentManagerObsolete> compMgr =
-         do_GetService(kComponentManagerCID, aServMgr, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  //rv = compMgr->UnregisterComponent(kRDFDataSourceCID, aPath);
-
-  rv = compMgr->UnregisterComponent(kBrowserViewCID, aPath);
-  rv = compMgr->UnregisterComponent(kBrowserUIGlueCID, aPath);
-                            
-  return rv;
-}
-#endif  /* 0 */
-
-
-
-// NSGetModule implementation.
-
-
-#if 0
-
-NS_IMPL_NSGETMODULE(Mozilla_Embedding_Component, gQAEmbeddingModuleInfo)
-
-nsresult
-NSGetFactory(nsISupports* aServMgr,
-             const nsCID &aClass,
-             const char* aClassName,
-             const char* aContractID,
-             nsIFactory **aFactory)
-{
-  nsresult rv=NS_OK;
-  nsIGenericFactory* fact;
- // if (aClass.Equals(kBrowserViewCID))
-    rv = NS_NewGenericFactory(&fact, gQAEmbeddingModuleInfo);
- // else if (aClass.Equals(kBrowserUIGlueCID))
- //   rv = NS_NewGenericFactory(&fact, NS_NewQABrowserUIGlueFactory);
- //   rv = NS_ERROR_FAILURE;
-
-  if (NS_SUCCEEDED(rv))
-    *aFactory = fact;
-
-#ifdef DEBUG_radha
-  printf("nsQABrowserComponent NSGetFactory!\n");
-#endif
-  return rv;
-}
-
-#endif  
diff --git a/embedding/qa/mozembed/src/nsQABrowserUIGlue.h b/embedding/qa/mozembed/src/nsQABrowserUIGlue.h
deleted file mode 100644
index 9e01ceeb406..00000000000
--- a/embedding/qa/mozembed/src/nsQABrowserUIGlue.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Radha Kulkarni (radha@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/**
- * nsQABrowserView is an XPCOM component that creates a nsIWebBrowser
- * object and supports testing of nsIWebBrowser and other related embedding
- * interfaces with in mozilla.  All the embedding  examples that currently
- * use nsIWebBrowser like MFCEmbed, gtkEmbed are platform specific. This object
- * on the other hand provides a XP implementation and can be used as a
- * reference implementation for QA purposes with in mozilla.
- */
-#ifndef nsQABrowserUIGlue_h_
-#define nsQABrowserUIGlue_h_
-
-#include "nsISupports.h"
-#include "nsIQABrowserUIGlue.h"
-#include "nsIQABrowserChrome.h"
-#include "nsIQABrowserView.h"
-
-
-extern nsresult NS_NewQABrowserUIGlueFactory(nsISupports *, const nsIID& iid, void ** result);
-
-class nsQABrowserUIGlue : public nsIQABrowserUIGlue
-{
-public:
-  nsQABrowserUIGlue();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIQABROWSERUIGLUE
-
-protected:
-  virtual ~nsQABrowserUIGlue();
-  nativeWindow CreateNativeWindow(nsIWebBrowserChrome  * aChrome);
-
-private:
-  PRBool mAllowNewWindows;
-  nsCOMPtr<nsIQABrowserView> mBrowserView;
-};
-
-
-#endif //nsQABrowserUIGlue_h_
\ No newline at end of file
diff --git a/embedding/qa/mozembed/src/nsQABrowserView.cpp b/embedding/qa/mozembed/src/nsQABrowserView.cpp
deleted file mode 100644
index 39b2f9ffc3f..00000000000
--- a/embedding/qa/mozembed/src/nsQABrowserView.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Radha Kulkarni (radha@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <stdio.h>
-
-//locals
-#include "nsQABrowserView.h"
-#include "nsIQABrowserView.h"
-#include "nsIInterfaceRequestor.h"
-
-//essentials
-#include "nsIComponentManager.h"
-
-
-//Interfaces Needed
-#include "nsCWebBrowser.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIWebProgressListener.h"
-#include "nsIWebBrowserChrome.h"
-#include "nsWeakPtr.h"
-#include "nsWeakReference.h"
-
-nsQABrowserView::nsQABrowserView():mWebBrowser(nsnull)
-{
-  mWebBrowser = nsnull;
-  mWebNav = nsnull;
-  mBaseWindow = nsnull;
-}
-
-nsQABrowserView::~nsQABrowserView()
-{
-}
-
-//*****************************************************************************
-// nsQABrowserView::nsISupports
-//*****************************************************************************   
-
-NS_IMPL_ISUPPORTS2(nsQABrowserView, nsIQABrowserView, nsIInterfaceRequestor)
-
-//*****************************************************************************
-// nsQABrowserView::nsIInterfacerequestor
-//*****************************************************************************
-
-NS_IMETHODIMP
-nsQABrowserView::GetInterface(const nsIID& aIID, void ** aSink)
-{
-  NS_ENSURE_ARG_POINTER(aSink);  
-  printf("In nsQABrowserView::GetInterface\n");
-  if (NS_SUCCEEDED(QueryInterface(aIID, aSink)))
-    return NS_OK;
-
-  if (mWebBrowser) {
-    printf("nsQABrowserView::GetInterface, Got mWebBrowser\n");
-    nsCOMPtr<nsIInterfaceRequestor>  ifcReq(do_QueryInterface(mWebBrowser));
-    if (ifcReq)
-      return ifcReq->GetInterface(aIID, aSink);
-  }
-
-  return NS_NOINTERFACE;
-
-}
-
-
-NS_IMETHODIMP
-nsQABrowserView::CreateBrowser(nativeWindow aNativeWnd, nsIWebBrowserChrome * aChrome)
-{
-
-  nsresult rv;
-  mWebBrowser = do_CreateInstance(NS_WEBBROWSER_CONTRACTID, &rv);
-  if (NS_FAILED(rv) || !mWebBrowser)
-    return NS_ERROR_FAILURE; 
-
-  mWebNav = do_QueryInterface(mWebBrowser, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-  
-  // Set the chrome object the container window. 
-  mWebBrowser->SetContainerWindow(aChrome);
-  if(NS_FAILED(rv))
-		return rv;
-
-  rv = NS_OK;
-  nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(mWebBrowser, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-
-  // If the browser window hosting chrome or content?
-  dsti->SetItemType(nsIDocShellTreeItem::typeContentWrapper);
-
-  // Create the real webbrowser window
-	mBaseWindow = do_QueryInterface(mWebBrowser, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-
-  // Create the actual window
-	rv = mBaseWindow->InitWindow(aNativeWnd, nsnull, 0, 0, -1, -1);
-	rv = mBaseWindow->Create();
-
-  // set a handle to nsIWebBrowser in nsQAWebBrowserChrome
-  aChrome->SetWebBrowser(mWebBrowser);
-
-  // Register the QABrowserChrome object to receive progress messages
-	// These callbacks will be used to update the status/progress bars
-  nsWeakPtr weakling(do_GetWeakReference(aChrome));
-  (void)mWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener));
-
-	// Finally, show the web browser window
-	mBaseWindow->SetVisibility(PR_TRUE);
-
-	return NS_OK;
-}
-
-// XXX Not needed
-NS_IMETHODIMP
-nsQABrowserView::DestroyBrowser()
-{
-  // destroy the actual window.
-  mBaseWindow->Destroy();
-  mWebBrowser = nsnull;
-  mWebNav = nsnull;
-  return NS_OK;
-}
-
-
-
-// Get a handle to the nsIWebBrowser object. 
-NS_IMETHODIMP
-nsQABrowserView::GetWebBrowser(nsIWebBrowser ** aWebBrowser)
-{
-  if (!mWebBrowser || !(aWebBrowser))
-    return NS_ERROR_FAILURE;
-  
-  *aWebBrowser = mWebBrowser;
-  NS_ADDREF(*aWebBrowser);
-  return NS_OK;
-}
- 
diff --git a/embedding/qa/mozembed/src/nsQABrowserView.h b/embedding/qa/mozembed/src/nsQABrowserView.h
deleted file mode 100644
index 67a58c07d10..00000000000
--- a/embedding/qa/mozembed/src/nsQABrowserView.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Radha Kulkarni (radha@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/**
- * nsQABrowserView is an XPCOM component that creates a nsIWebBrowser
- * object and supports testing of nsIWebBrowser and other related embedding
- * interfaces with in mozilla.  All the embedding  examples that currently
- * use nsIWebBrowser like MFCEmbed, gtkEmbed are platform specific. This object
- * on the other hand provides a XP implementation and can be used as a
- * reference implementation for QA purposes with in mozilla.
- */
-#ifndef nsQABrowserView_h_
-#define nsQABrowserView_h_
-
-#include "nsCOMPtr.h"
-#include "nsISupports.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIQABrowserView.h"
-#include "nsQABrowserCID.h"
-#include "nsIQABrowserChrome.h"
-
-#include "nsIWebNavigation.h"
-#include "nsIBaseWindow.h"
-#include "nsIWebBrowser.h"
-
-//extern nsresult NS_NewQABrowserViewFactory(nsISupports *, const nsIID& iid, void ** result);
-
-class nsQABrowserView : public nsIInterfaceRequestor,
-                        public nsIQABrowserView
-{
-public:
-  nsQABrowserView();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIINTERFACEREQUESTOR
-  NS_DECL_NSIQABROWSERVIEW
-
-protected:
-  virtual ~nsQABrowserView();
-
-private:
-  nsCOMPtr<nsIWebBrowser>  mWebBrowser;
-  nsCOMPtr<nsIWebNavigation> mWebNav;
-  nsCOMPtr<nsIBaseWindow> mBaseWindow;
-};
-
-
-#endif //nsQABrowserView_h_
\ No newline at end of file
diff --git a/embedding/qa/mozembed/src/nsQAWindowCreator.cpp b/embedding/qa/mozembed/src/nsQAWindowCreator.cpp
deleted file mode 100644
index 87aed207363..00000000000
--- a/embedding/qa/mozembed/src/nsQAWindowCreator.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsCOMPtr.h"
-#include "nsServiceManagerUtils.h"
-#include "nsIWebBrowserChrome.h"
-#include "nsQAWindowCreator.h"
-#include "nsIQABrowserUIGlue.h"
-#include "nsQABrowserCID.h"
-
-WindowCreator::WindowCreator()
-{
-}
-
-WindowCreator::~WindowCreator()
-{
-}
-
-NS_IMPL_ISUPPORTS1(WindowCreator, nsIWindowCreator)
-
-NS_IMETHODIMP
-WindowCreator::CreateChromeWindow(nsIWebBrowserChrome *parent,
-                                  PRUint32 chromeFlags,
-                                  nsIWebBrowserChrome **_retval)
-{
-    NS_ENSURE_ARG_POINTER(_retval);
-    nsresult rv;
-    nsCOMPtr<nsIQABrowserUIGlue> glue(do_CreateInstance(NS_QABROWSERUIGLUE_CONTRACTID, &rv));
-    if (glue)
-      glue->CreateNewBrowserWindow(PRInt32(chromeFlags), parent, _retval);
-    //AppCallbacks::CreateBrowserWindow(PRInt32(chromeFlags), parent, _retval);
-    return *_retval ? NS_OK : NS_ERROR_FAILURE;
-}
diff --git a/embedding/qa/mozembed/src/nsQAWindowCreator.h b/embedding/qa/mozembed/src/nsQAWindowCreator.h
deleted file mode 100644
index 8baf4b1354f..00000000000
--- a/embedding/qa/mozembed/src/nsQAWindowCreator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __WindowCreator_h_
-#define __WindowCreator_h_
-
-#include "nsIWindowCreator.h"
-
-class WindowCreator :
-      public nsIWindowCreator
-{
-public:
-    WindowCreator();
-    virtual ~WindowCreator();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIWINDOWCREATOR
-};
-
-#endif
-
diff --git a/embedding/qa/mozembed/src/resource.h b/embedding/qa/mozembed/src/resource.h
deleted file mode 100644
index d84f5645451..00000000000
--- a/embedding/qa/mozembed/src/resource.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by mozEmbed.rc
-//
-#define IDC_MYICON                      2
-#define IDD_MOZEMBED_DIALOG             102
-#define IDD_ABOUTBOX                    103
-#define IDS_APP_TITLE                   103
-#define IDM_ABOUT                       104
-#define MOZ_OpenURI                     104
-#define MOZ_GetURI                      104
-#define IDM_EXIT                        105
-#define IDS_HELLO                       106
-#define IDI_MOZEMBED                    107
-#define IDS_ABOUT                       107
-#define IDI_SMALL                       108
-#define IDS_ABOUT_TITLE                 108
-#define IDC_MOZEMBED                    109
-#define IDS_HIST_BACK                   109
-#define IDS_HIST_FORWARD                110
-#define IDS_HIST_RELOAD_NORMAL          111
-#define IDS_HIST_RELOAD_BYPASSPROXY     112
-#define IDS_HIST_RELOAD_BYPASSCACHE     113
-#define IDS_HIST_ADDURL                 114
-#define IDS_HIST_RELOAD_BYPASSPROXYANDCACHE 115
-#define IDS_HIST_PURGE                  116
-#define IDS_HIST_GOTO                   117
-#define IDS_HIST_URL                    118
-#define IDR_MAINFRAME                   128
-#define IDD_BROWSER                     130
-#define IDD_BROWSER_NC                  131
-#define IDD_CHOOSEPROFILE               132
-#define MOZ_EDIT_URI                    1001
-#define IDC_GO                          1003
-#define IDC_BROWSER                     1004
-#define IDC_ADDRESS                     1005
-#define IDC_STOP                        1006
-#define IDC_STATUS                      1007
-#define IDC_BACK                        1008
-#define IDC_FORWARD                     1009
-#define IDC_PROGRESS                    1010
-#define IDC_RELOAD                      1011
-#define IDC_PROFILELIST                 1011
-#define MOZ_Open                        32771
-#define MOZ_Print                       32772
-#define MOZ_NewBrowser                  32773
-#define MOZ_NewEditor                   32774
-#define MOZ_Save                        32775
-#define MOZ_Cut                         32776
-#define MOZ_Copy                        32777
-#define MOZ_Paste                       32778
-#define MOZ_Delete                      32779
-#define MOZ_SelectAll                   32780
-#define MOZ_SelectNone                  32781
-#define MOZ_GoBack                      32782
-#define MOZ_GoForward                   32783
-#define MOZ_About                       32784
-#define ID_DEBUG_THISSPACEFORRENT       32786
-#define MOZ_SwitchProfile               32787
-#define IDC_STATIC                      -1
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        133
-#define _APS_NEXT_COMMAND_VALUE         32788
-#define _APS_NEXT_CONTROL_VALUE         1012
-#define _APS_NEXT_SYMED_VALUE           110
-#endif
-#endif
diff --git a/embedding/qa/testembed/BrowserFrameGlue.cpp b/embedding/qa/testembed/BrowserFrameGlue.cpp
deleted file mode 100644
index 59a19e28cd2..00000000000
--- a/embedding/qa/testembed/BrowserFrameGlue.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// This file has the IBrowserFrameGlueObj implementation
-// This frame glue object is nested inside of the BrowserFrame
-// object(See BrowserFrm.h for more info)
-//
-// This is the place where all the platform specific interaction
-// with the browser frame window takes place in response to 
-// callbacks from Gecko interface methods
-// 
-// The main purpose of this interface is to separate the cross 
-// platform code in BrowserImpl*.cpp from the platform specific
-// code(which is in this file)
-//
-// You'll also notice the use of a macro named "METHOD_PROLOGUE"
-// through out this file. This macro essentially makes the pointer
-// to a "containing" class available inside of the class which is
-// being contained via a var named "pThis". In our case, the 
-// BrowserFrameGlue object is contained inside of the BrowserFrame
-// object so "pThis" will be a pointer to a BrowserFrame object
-// Refer to MFC docs for more info on METHOD_PROLOGUE macro
-
-
-#include "stdafx.h"
-#include "TestEmbed.h"
-#include "BrowserFrm.h"
-#include "Dialogs.h"
-#include "nsReadableUtils.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// IBrowserFrameGlue implementation
-
-void CBrowserFrame::BrowserFrameGlueObj::UpdateStatusBarText(const PRUnichar *aMessage)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	nsCString strStatus; 
-
-    if(aMessage)
-        strStatus.AssignWithConversion(aMessage);
-
-    pThis->m_wndStatusBar.SetPaneText(0, strStatus.get());
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::UpdateProgress(PRInt32 aCurrent, PRInt32 aMax)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-    pThis->m_wndProgressBar.SetRange32(0, aMax);
-    pThis->m_wndProgressBar.SetPos(aCurrent);
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::UpdateBusyState(PRBool aBusy)
-{	
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	// Just notify the view of the busy state
-	// There's code in there which will take care of
-	// updating the STOP toolbar btn. etc
-
-	pThis->m_wndBrowserView.UpdateBusyState(aBusy);
-}
-
-// Called from the OnLocationChange() method in the nsIWebProgressListener 
-// interface implementation in CBrowserImpl to update the current URI
-// Will get called after a URI is successfully loaded in the browser
-// We use this info to update the URL bar's edit box
-//
-void CBrowserFrame::BrowserFrameGlueObj::UpdateCurrentURI(nsIURI *aLocation)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	if(aLocation)
-	{
-		nsCAutoString uriString; 
-//		nsXPIDLCString uriString;
-		aLocation->GetSpec(uriString);
-
-		pThis->m_wndUrlBar.SetCurrentURL(uriString.get());
-	}
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::GetBrowserFrameTitle(PRUnichar **aTitle)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	CString title;
-	pThis->GetWindowText(title);
-
-	if(!title.IsEmpty())
-	{
-		nsString nsTitle;
-		nsTitle.AssignWithConversion(title.GetBuffer(0));
-
-		*aTitle = ToNewUnicode(nsTitle);
-	}
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::SetBrowserFrameTitle(const PRUnichar *aTitle)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	USES_CONVERSION;
-
-	if(W2T(aTitle))
-	{
-		pThis->SetWindowText(W2T(aTitle));
-	}
-	else
-	{
-		// Use the AppName i.e. testembed as the title if we
-		// do not get one from GetBrowserWindowTitle()
-		//
-		CString cs;
-		cs.LoadString(AFX_IDS_APP_TITLE);
-		pThis->SetWindowText(cs);
-	}
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::SetBrowserFrameSize(PRInt32 aCX, PRInt32 aCY)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-	
-	pThis->SetWindowPos(NULL, 0, 0, aCX, aCY, 
-				SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER
-			);
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::GetBrowserFrameSize(PRInt32 *aCX, PRInt32 *aCY)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	RECT wndRect;
-	pThis->GetWindowRect(&wndRect);
-
-	if (aCX)
-		*aCX = wndRect.right - wndRect.left;
-
-	if (aCY)
-		*aCY = wndRect.bottom - wndRect.top;
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::SetBrowserFramePosition(PRInt32 aX, PRInt32 aY)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)	
-
-	pThis->SetWindowPos(NULL, aX, aY, 0, 0, 
-				SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER);
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::GetBrowserFramePosition(PRInt32 *aX, PRInt32 *aY)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	RECT wndRect;
-	pThis->GetWindowRect(&wndRect);
-
-	if (aX)
-		*aX = wndRect.left;
-
-	if (aY)
-		*aY = wndRect.top;
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::GetBrowserFramePositionAndSize(PRInt32 *aX, PRInt32 *aY, PRInt32 *aCX, PRInt32 *aCY)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	RECT wndRect;
-	pThis->GetWindowRect(&wndRect);
-
-	if (aX)
-		*aX = wndRect.left;
-
-	if (aY)
-		*aY = wndRect.top;
-
-	if (aCX)
-		*aCX = wndRect.right - wndRect.left;
-
-	if (aCY)
-		*aCY = wndRect.bottom - wndRect.top;
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::SetBrowserFramePositionAndSize(PRInt32 aX, PRInt32 aY, PRInt32 aCX, PRInt32 aCY, PRBool fRepaint)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	pThis->SetWindowPos(NULL, aX, aY, aCX, aCY, 
-				SWP_NOACTIVATE | SWP_NOZORDER);
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::SetFocus()
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	pThis->SetFocus();
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::FocusAvailable(PRBool *aFocusAvail)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	HWND focusWnd = GetFocus()->m_hWnd;
-
-	if ((focusWnd == pThis->m_hWnd) || ::IsChild(pThis->m_hWnd, focusWnd))
-		*aFocusAvail = PR_TRUE;
-	else
-		*aFocusAvail = PR_FALSE;
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::ShowBrowserFrame(PRBool aShow)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	if(aShow)
-	{
-		pThis->ShowWindow(SW_SHOW);
-		pThis->SetActiveWindow();
-		pThis->UpdateWindow();
-	}
-	else
-	{
-		pThis->ShowWindow(SW_HIDE);
-	}
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::GetBrowserFrameVisibility(PRBool *aVisible)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	// Is the current BrowserFrame the active one?
-	if (GetActiveWindow()->m_hWnd != pThis->m_hWnd)
-	{
-		*aVisible = PR_FALSE;
-		return;
-	}
-
-	// We're the active one
-	//Return FALSE if we're minimized
-	WINDOWPLACEMENT wpl;
-	pThis->GetWindowPlacement(&wpl);
-
-	if ((wpl.showCmd == SW_RESTORE) || (wpl.showCmd == SW_MAXIMIZE))
-		*aVisible = PR_TRUE;
-	else
-		*aVisible = PR_FALSE;
-}
-
-PRBool CBrowserFrame::BrowserFrameGlueObj::CreateNewBrowserFrame(PRUint32 chromeMask, 
-							PRInt32 x, PRInt32 y, 
-							PRInt32 cx, PRInt32 cy,
-							nsIWebBrowser** aWebBrowser)
-{
-   NS_ENSURE_ARG_POINTER(aWebBrowser);
-
-   *aWebBrowser = nsnull;
-
-	CTestEmbedApp *pApp = (CTestEmbedApp *)AfxGetApp();
-	if(!pApp)
-		return PR_FALSE;
-
-	// Note that we're calling with the last param set to "false" i.e.
-	// this instructs not to show the frame window
-	// This is mainly needed when the window size is specified in the window.open()
-	// JS call. In those cases Gecko calls us to create the browser with a default
-	// size (all are -1) and then it calls the SizeBrowserTo() method to set
-	// the proper window size. If this window were to be visible then you'll see
-	// the window size changes on the screen causing an unappealing flicker
-	//
-
-	CBrowserFrame* pFrm = pApp->CreateNewBrowserFrame(chromeMask, x, y, cx, cy, PR_FALSE);
-    if(!pFrm)
-		return PR_FALSE;
-
-	// At this stage we have a new CBrowserFrame and a new CBrowserView
-	// objects. The CBrowserView also would have an embedded browser
-	// object created. Get the mWebBrowser member from the CBrowserView
-	// and return it. (See CBrowserView's CreateBrowser() on how the
-	// embedded browser gets created and how its mWebBrowser member
-	// gets initialized)
-
-	NS_IF_ADDREF(*aWebBrowser = pFrm->m_wndBrowserView.mWebBrowser);
-
-	return PR_TRUE;
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::DestroyBrowserFrame()
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	pThis->PostMessage(WM_CLOSE);
-}
-
-#define GOTO_BUILD_CTX_MENU { bContentHasFrames = FALSE; goto BUILD_CTX_MENU; }
-
-void CBrowserFrame::BrowserFrameGlueObj::ShowContextMenu(PRUint32 aContextFlags, nsIDOMNode *aNode)
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-
-	UINT nIDResource = IDR_CTXMENU_DOCUMENT;
-
-	if(aContextFlags & nsIContextMenuListener::CONTEXT_DOCUMENT)
-		nIDResource = IDR_CTXMENU_DOCUMENT;
-	else if(aContextFlags & nsIContextMenuListener::CONTEXT_TEXT)		
-		nIDResource = IDR_CTXMENU_TEXT;
-	else if(aContextFlags & nsIContextMenuListener::CONTEXT_LINK)
-	{
-		nIDResource = IDR_CTXMENU_LINK;
-
-		// Since we handle all the browser menu/toolbar commands
-		// in the View, we basically setup the Link's URL in the
-		// BrowserView object. When a menu selection in the context
-		// menu is made, the appropriate command handler in the
-		// BrowserView will be invoked and the value of the URL
-		// will be accesible in the view
-		
-		// Reset the value from the last invocation
-		// (A new value will be set after we determine it below)
-		//
-		nsAutoString strUrlUcs2;
-		pThis->m_wndBrowserView.SetCtxMenuLinkUrl(strUrlUcs2);
-
-		// Get the URL from the link. This is two step process
-		// 1. We first get the nsIDOMHTMLAnchorElement
-		// 2. We then get the URL associated with the link
-		nsresult rv = NS_OK;
-		nsCOMPtr<nsIDOMHTMLAnchorElement> linkElement(do_QueryInterface(aNode, &rv));
-		if(NS_FAILED(rv))
-			return;
-
-		rv = linkElement->GetHref(strUrlUcs2);
-		if(NS_FAILED(rv))
-			return;
-
-		// Update the view with the new LinkUrl
-		// Note that this string is in UCS2 format
-		pThis->m_wndBrowserView.SetCtxMenuLinkUrl(strUrlUcs2);
-	}
-	else if(aContextFlags & nsIContextMenuListener::CONTEXT_IMAGE)
-	{
-		nIDResource = IDR_CTXMENU_IMAGE;
-
-		nsAutoString strImgSrcUcs2;
-		pThis->m_wndBrowserView.SetCtxMenuImageSrc(strImgSrcUcs2); // Clear it
-
-		// Get the IMG SRC
-		nsresult rv = NS_OK;
-		nsCOMPtr<nsIDOMHTMLImageElement> imgElement(do_QueryInterface(aNode, &rv));
-		if(NS_FAILED(rv))
-			return;
-
-		rv = imgElement->GetSrc(strImgSrcUcs2);
-		if(NS_FAILED(rv))
-			return;
-
-		pThis->m_wndBrowserView.SetCtxMenuImageSrc(strImgSrcUcs2); // Set the new Img Src
-	}
-
-	CMenu ctxMenu;
-	if(ctxMenu.LoadMenu(nIDResource))
-	{
-		POINT cursorPos;
-		GetCursorPos(&cursorPos);
-
-		(ctxMenu.GetSubMenu(0))->TrackPopupMenu(TPM_LEFTALIGN, cursorPos.x, cursorPos.y, pThis);
-	}
-}
-
-HWND CBrowserFrame::BrowserFrameGlueObj::GetBrowserFrameNativeWnd()
-{
-	METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-	return pThis->m_hWnd;
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::ShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText)
-{
-    METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-    pThis->m_wndTooltip.SetTipText(CString(aTipText));
-    pThis->m_wndTooltip.Show(&pThis->m_wndBrowserView, aXCoords, aYCoords);
-}
-
-void CBrowserFrame::BrowserFrameGlueObj::HideTooltip()
-{
-    METHOD_PROLOGUE(CBrowserFrame, BrowserFrameGlueObj)
-    pThis->m_wndTooltip.Hide();
-}
-
diff --git a/embedding/qa/testembed/BrowserFrm.cpp b/embedding/qa/testembed/BrowserFrm.cpp
deleted file mode 100644
index af0700c0315..00000000000
--- a/embedding/qa/testembed/BrowserFrm.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// The typical MFC View, toolbar, statusbar creation done 
-// in CBrowserFrame::OnCreate()
-//
-// Code to update the Status/Tool bars in response to the
-// Web page loading progress(called from methods in CBrowserImpl)
-//
-// SetupFrameChrome() determines what, if any, UI elements this Frame
-// will sport based on the current "chromeMask" 
-//
-// Also take a look at OnClose() which gets used when you close a browser
-// window. This needs to be overrided mainly to handle supporting multiple
-// browser frame windows via the "New Browser Window" menu item
-// Without this being overridden the MFC framework handles the OnClose and
-// shutsdown the complete application when a frame window is closed.
-// In our case, we want the app to shutdown when the File/Exit menu is chosen
-//
-// Another key functionality this object implements is the IBrowserFrameGlue
-// interface - that's the interface the Gecko embedding interfaces call
-// upong to update the status bar etc.
-// (Take a look at IBrowserFrameGlue.h for the interface definition and
-// the BrowserFrm.h to see how we implement this interface - as a nested
-// class)
-// We pass this Glue object pointer to the CBrowserView object via the 
-// SetBrowserFrameGlue() method. The CBrowserView passes this on to the
-// embedding interface implementaion
-//
-// Please note the use of the macro METHOD_PROLOGUE in the implementation
-// of the nested BrowserFrameGlue object. Essentially what this macro does
-// is to get you access to the outer (or the object which is containing the
-// nested object) object via the pThis pointer.
-// Refer to the AFXDISP.H file in VC++ include dirs
-//
-// Next suggested file to look at : BrowserView.cpp
-
-#include "stdafx.h"
-#include "TestEmbed.h"
-#include "BrowserFrm.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CBrowserFrame
-
-IMPLEMENT_DYNAMIC(CBrowserFrame, CFrameWnd)
-
-BEGIN_MESSAGE_MAP(CBrowserFrame, CFrameWnd)
-	//{{AFX_MSG_MAP(CBrowserFrame)
-	ON_WM_CREATE()
-	ON_WM_SETFOCUS()
-	ON_WM_SIZE()
-	ON_WM_CLOSE()
-	ON_WM_ACTIVATE()
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-static UINT indicators[] =
-{
-	ID_SEPARATOR,           // For the Status line
-	ID_SEPARATOR,           // For the Progress Bar
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// CBrowserFrame construction/destruction
-
-CBrowserFrame::CBrowserFrame(PRUint32 chromeMask)
-{
-	// Save the chromeMask off. It'll be used
-	// later to determine whether this browser frame
-	// will have menubar, toolbar, statusbar etc.
-
-	m_chromeMask = chromeMask;
-}
-
-CBrowserFrame::~CBrowserFrame()
-{
-}
-
-void CBrowserFrame::OnClose()
-{
-	CTestEmbedApp *pApp = (CTestEmbedApp *)AfxGetApp();
-	pApp->RemoveFrameFromList(this);
-
-	DestroyWindow();
-}
-
-// This is where the UrlBar, ToolBar, StatusBar, ProgressBar
-// get created
-//
-int CBrowserFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
-{
-	if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
-		return -1;
-
-	// Pass "this" to the View for later callbacks
-	// and/or access to any public data members, if needed
-	//
-	m_wndBrowserView.SetBrowserFrame(this);
-
-	// Pass on the BrowserFrameGlue also to the View which
-	// it will use during the Init() process after creation
-	// of the BrowserImpl obj. Essentially, the View object
-	// hooks up the Embedded browser's callbacks to the BrowserFrame
-	// via this BrowserFrameGlue object
-	m_wndBrowserView.SetBrowserFrameGlue((PBROWSERFRAMEGLUE)&m_xBrowserFrameGlueObj);
-
-	// create a view to occupy the client area of the frame
-	// This will be the view in which the embedded browser will
-	// be displayed in
-	//
-	if (!m_wndBrowserView.Create(NULL, NULL, AFX_WS_DEFAULT_VIEW,
-		CRect(0, 0, 0, 0), this, AFX_IDW_PANE_FIRST, NULL))
-	{
-		TRACE0("Failed to create view window\n");
-		return -1;
-	}
-
-	// create the URL bar (essentially a ComboBoxEx object)
-	if (!m_wndUrlBar.Create(CBS_DROPDOWN | WS_CHILD, CRect(0, 0, 200, 150), this, ID_URL_BAR))
-	{
-		TRACE0("Failed to create URL Bar\n");
-		return -1;      // fail to create
-	}
-    
-    // Load the Most Recently Used(MRU) Urls into the UrlBar
-    m_wndUrlBar.LoadMRUList();
-
-	// Create the toolbar with Back, Fwd, Stop, etc. buttons..
-	if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP
-		| CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) ||
-		!m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
-	{
-		TRACE0("Failed to create toolbar\n");
-		return -1;      // fail to create
-	}
-
-	// Create a ReBar window to which the toolbar and UrlBar 
-	// will be added
-	if (!m_wndReBar.Create(this))
-	{
-		TRACE0("Failed to create ReBar\n");
-		return -1;      // fail to create
-	}
-	
-	//Add the ToolBar and UrlBar windows to the rebar
-	m_wndReBar.AddBar(&m_wndToolBar);
-	m_wndReBar.AddBar(&m_wndUrlBar, "Enter URL:");
-
-	// Create the status bar with two panes - one pane for actual status
-	// text msgs. and the other for the progress control
-	if (!m_wndStatusBar.Create(this) ||
-		!m_wndStatusBar.SetIndicators(indicators,
-		  sizeof(indicators)/sizeof(UINT)))
-	{
-		TRACE0("Failed to create status bar\n");
-		return -1;      // fail to create
-	}
-
-	// Create the progress bar as a child of the status bar.
-	// Note that the ItemRect which we'll get at this stage
-	// is bogus since the status bar panes are not fully
-	// positioned yet i.e. we'll be passing in an invalid rect
-	// to the Create function below
-	// The actual positioning of the progress bar will be done
-	// in response to OnSize()
-	RECT rc;
-	m_wndStatusBar.GetItemRect (1, &rc);
-	if (!m_wndProgressBar.Create(WS_CHILD|WS_VISIBLE|PBS_SMOOTH, rc, &m_wndStatusBar, ID_PROG_BAR))
-	{
-		TRACE0("Failed to create progress bar\n");
-		return -1;      // fail to create
-	}
-
-	// The third pane(i.e. at index 2) of the status bar will have 
-	// the security lock icon displayed in it. Set up its size(16) 
-	// and style(no border)so that the padlock icons can be properly drawn
-//	m_wndStatusBar.SetPaneInfo(2, -1, SBPS_NORMAL|SBPS_NOBORDERS, 16);
-
-	// Based on the "chromeMask" we were supplied during construction
-	// hide any requested UI elements - statusbar, menubar etc...
-	// Note that the window styles (WM_RESIZE etc) are set inside
-	// of PreCreateWindow()
-
-	SetupFrameChrome(); 
-
-	return 0;
-}
-
-void CBrowserFrame::SetupFrameChrome()
-{
-	if(m_chromeMask == nsIWebBrowserChrome::CHROME_ALL)
-		return;
-
-	if(! (m_chromeMask & nsIWebBrowserChrome::CHROME_MENUBAR) )
-		SetMenu(NULL); // Hide the MenuBar
-
-	if(! (m_chromeMask & nsIWebBrowserChrome::CHROME_TOOLBAR) )
-		m_wndReBar.ShowWindow(SW_HIDE); // Hide the ToolBar
-
-	if(! (m_chromeMask & nsIWebBrowserChrome::CHROME_STATUSBAR) )
-		m_wndStatusBar.ShowWindow(SW_HIDE); // Hide the StatusBar
-}
-
-BOOL CBrowserFrame::PreCreateWindow(CREATESTRUCT& cs)
-{
-	if( !CFrameWnd::PreCreateWindow(cs) )
-		return FALSE;
-
-	cs.dwExStyle &= ~WS_EX_CLIENTEDGE;
-
-	// Change window style based on the chromeMask
-
-	if(! (m_chromeMask & nsIWebBrowserChrome::CHROME_TITLEBAR) )
-		cs.style &= ~WS_CAPTION; // No caption		
-
-	if(! (m_chromeMask & nsIWebBrowserChrome::CHROME_WINDOW_RESIZE) )
-	{
-		// Can't resize this window
-		cs.style &= ~WS_SIZEBOX;
-		cs.style &= ~WS_THICKFRAME;
-		cs.style &= ~WS_MINIMIZEBOX;
-		cs.style &= ~WS_MAXIMIZEBOX;
-	}
-
-	cs.lpszClass = AfxRegisterWndClass(0);
-
-	return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CBrowserFrame message handlers
-void CBrowserFrame::OnSetFocus(CWnd* pOldWnd)
-{
-	// forward focus to the view window
-	m_wndBrowserView.SetFocus();
-}
-
-BOOL CBrowserFrame::OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo)
-{
-	// let the view have first crack at the command
-	if (m_wndBrowserView.OnCmdMsg(nID, nCode, pExtra, pHandlerInfo))
-		return TRUE;
-
-	// otherwise, do default handling
-	return CFrameWnd::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo);
-}
-
-// Needed to properly position/resize the progress bar
-//
-void CBrowserFrame::OnSize(UINT nType, int cx, int cy) 
-{
-       CFrameWnd::OnSize(nType, cx, cy);
-	
-       // Get the ItemRect of the status bar's Pane 1
-       // That's where the progress bar will be located
-       RECT rc;
-       m_wndStatusBar.GetItemRect(1, &rc);
-
-       // Move the progress bar into its correct location
-       //
-       m_wndProgressBar.MoveWindow(&rc);
-}
-
-#ifdef _DEBUG
-void CBrowserFrame::AssertValid() const
-{
-	CFrameWnd::AssertValid();
-}
-
-void CBrowserFrame::Dump(CDumpContext& dc) const
-{
-	CFrameWnd::Dump(dc);
-}
-
-#endif //_DEBUG
-
-
-void CBrowserFrame::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized) 
-{
-	CFrameWnd::OnActivate(nState, pWndOther, bMinimized);
-	
-    m_wndBrowserView.Activate(nState, pWndOther, bMinimized);
-}
diff --git a/embedding/qa/testembed/BrowserFrm.h b/embedding/qa/testembed/BrowserFrm.h
deleted file mode 100644
index 65894c1d888..00000000000
--- a/embedding/qa/testembed/BrowserFrm.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// BrowserFrm.h : interface of the CBrowserFrame class
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _IBROWSERFRM_H
-#define _IBROWSERFRM_H
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#include "BrowserView.h"
-#include "BrowserToolTip.h"
-#include "IBrowserFrameGlue.h"
-#include "MostRecentUrls.h"
-
-// A simple UrlBar class...
-class CUrlBar : public CComboBoxEx
-{
-public:
-	inline void GetEnteredURL(CString& url) {
-		GetEditCtrl()->GetWindowText(url);
-	}
-	inline void GetSelectedURL(CString& url) {
-		GetLBText(GetCurSel(), url);
-	}
-	inline void SetCurrentURL(LPCTSTR pUrl) {
-		SetWindowText(pUrl);
-	}
-	inline void AddURLToList(CString& url, bool bAddToMRUList = true) {
-		COMBOBOXEXITEM ci;
-		ci.mask = CBEIF_TEXT; ci.iItem = -1;
-		ci.pszText = (LPTSTR)(LPCTSTR)url;
-		InsertItem(&ci);
-
-        if(bAddToMRUList)
-            m_MRUList.AddURL((LPTSTR)(LPCTSTR)url);
-	}
-    inline void LoadMRUList() {
-        for (int i=0;i<m_MRUList.GetNumURLs();i++) 
-        {
-            CString urlStr(_T(m_MRUList.GetURL(i)));
-            AddURLToList(urlStr, false); 
-        }
-    }
-    inline BOOL EditCtrlHasFocus() {
-        return (GetEditCtrl()->m_hWnd == CWnd::GetFocus()->m_hWnd);
-    }
-    inline BOOL EditCtrlHasSelection() {
-        int nStartChar = 0, nEndChar = 0;
-        if(EditCtrlHasFocus())
-            GetEditCtrl()->GetSel(nStartChar, nEndChar);
-        return (nEndChar > nStartChar) ? TRUE : FALSE;
-    }
-    inline BOOL CanCutToClipboard() {
-        return EditCtrlHasSelection();
-    }
-    inline void CutToClipboard() {
-        GetEditCtrl()->Cut();
-    }
-    inline BOOL CanCopyToClipboard() {
-        return EditCtrlHasSelection();
-    }
-    inline void CopyToClipboard() {
-        GetEditCtrl()->Copy();
-    }
-    inline BOOL CanPasteFromClipboard() {
-        return EditCtrlHasFocus();
-    }
-    inline void PasteFromClipboard() {
-        GetEditCtrl()->Paste();
-    }
-    inline BOOL CanUndoEditOp() {
-        return EditCtrlHasFocus() ? GetEditCtrl()->CanUndo() : FALSE;
-    }
-    inline void UndoEditOp() {        
-        if(EditCtrlHasFocus())
-            GetEditCtrl()->Undo();
-    }
-
-protected:
-      CMostRecentUrls m_MRUList;
-};
-
-class CBrowserFrame : public CFrameWnd
-{	
-public:
-	CBrowserFrame(PRUint32 chromeMask);
-
-protected: 
-	DECLARE_DYNAMIC(CBrowserFrame)
-
-public:
-	inline CBrowserImpl *GetBrowserImpl() { return m_wndBrowserView.mpBrowserImpl; }
-
-	CToolBar    m_wndToolBar;
-	CStatusBar  m_wndStatusBar;
-	CProgressCtrl m_wndProgressBar;
-	CUrlBar m_wndUrlBar;
-	CReBar m_wndReBar;
-	// The view inside which the embedded browser will
-	// be displayed in
-	CBrowserToolTip m_wndTooltip;
-	CBrowserView    m_wndBrowserView;
-
-    // Wrapper functions for UrlBar clipboard operations
-    inline BOOL CanCutUrlBarSelection() { return m_wndUrlBar.CanCutToClipboard(); }
-    inline void CutUrlBarSelToClipboard() { m_wndUrlBar.CutToClipboard(); }
-    inline BOOL CanCopyUrlBarSelection() { return m_wndUrlBar.CanCopyToClipboard(); }
-    inline void CopyUrlBarSelToClipboard() { m_wndUrlBar.CopyToClipboard(); }
-    inline BOOL CanPasteToUrlBar() { return m_wndUrlBar.CanPasteFromClipboard(); }
-    inline void PasteFromClipboardToUrlBar() { m_wndUrlBar.PasteFromClipboard(); }
-    inline BOOL CanUndoUrlBarEditOp() { return m_wndUrlBar.CanUndoEditOp(); }
-    inline void UndoUrlBarEditOp() { m_wndUrlBar.UndoEditOp(); }
-
-	// This specifies what UI elements this frame will sport
-	// w.r.t. toolbar, statusbar, urlbar etc.
-	PRUint32 m_chromeMask;
-
-protected:
-	//
-	// This nested class implements the IBrowserFramGlue interface
-	// The Gecko embedding interfaces call on this interface
-	// to update the status bars etc.
-	//
-	class BrowserFrameGlueObj : public IBrowserFrameGlue 
-	{
-		//
-		// NS_DECL_BROWSERFRAMEGLUE below is a macro which expands
-		// to the function prototypes of methods in IBrowserFrameGlue
-		// Take a look at IBrowserFrameGlue.h for this macro define
-		//
-
-		NS_DECL_BROWSERFRAMEGLUE
-
-	} m_xBrowserFrameGlueObj;
-	friend class BrowserFrameGlueObj;
-
-public:
-	void SetupFrameChrome();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CBrowserFrame)
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
-	virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CBrowserFrame();
-#ifdef _DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
-#endif
-
-// Generated message map functions
-protected:
-	//{{AFX_MSG(CBrowserFrame)
-	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
-	afx_msg void OnSetFocus(CWnd *pOldWnd);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnClose();
-	afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif //_IBROWSERFRM_H
diff --git a/embedding/qa/testembed/BrowserImpl.cpp b/embedding/qa/testembed/BrowserImpl.cpp
deleted file mode 100644
index 2b1954775ba..00000000000
--- a/embedding/qa/testembed/BrowserImpl.cpp
+++ /dev/null
@@ -1,739 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// This is the class which implements all the interfaces
-// required(and optional) by the mozilla embeddable browser engine
-//
-// Note that this obj gets passed in the IBrowserFrameGlue* using the 
-// Init() method. Many of the interface implementations use this
-// to get the actual task done. Ex: to update the status bar
-//
-// Look at the INTERFACE_MAP_ENTRY's below for the list of 
-// the currently implemented interfaces
-//
-// This file currently has the implementation for all the interfaces
-// which are required of an app embedding Gecko
-// Implementation of other optional interfaces are in separate files
-// to avoid cluttering this one and to demonstrate other embedding
-// principles. For example, nsIPrompt is implemented in a separate DLL.
-// 
-//	nsIWebBrowserChrome	- This is a required interface to be implemented
-//						  by embeddors
-//
-//	nsIEmbeddingSiteWindow - This is a required interface to be implemented
-//						 by embedders			
-//					   - SetTitle() gets called after a document
-//						 load giving us the chance to update our
-//						 titlebar
-//
-// Some points to note...
-//
-// nsIWebBrowserChrome interface's SetStatus() gets called when a user 
-// mouses over the links on a page
-//
-// nsIWebProgressListener interface's OnStatusChange() gets called
-// to indicate progress when a page is being loaded
-//
-// Next suggested file(s) to look at : 
-//			Any of the BrowserImpl*.cpp files for other interface
-//			implementation details
-//
-
-#ifdef _WINDOWS
-  #include "stdafx.h"
-#endif
-
-#include "nsIDOMWindow.h"
-#include "BrowserImpl.h"
-
-#include "QaUtils.h"
-
-#include "nsirequest.h"
-#include "Tests.h"
-#include "prmem.h"
-#include "nsichanneltests.h"
-#include "nsihttpchanneltests.h"
-
-CBrowserImpl::CBrowserImpl()
-{
-  m_pBrowserFrameGlue = NULL;
-  mWebBrowser = nsnull;
-}
-
-
-CBrowserImpl::~CBrowserImpl()
-{
-}
-
-extern storage getSupportObj;
-
-// It's very important that the creator of this CBrowserImpl object
-// Call on this Init() method with proper values after creation
-//
-NS_METHOD CBrowserImpl::Init(PBROWSERFRAMEGLUE pBrowserFrameGlue, 
-                             nsIWebBrowser* aWebBrowser)
-{
-	  m_pBrowserFrameGlue = pBrowserFrameGlue;
-	  
-	  SetWebBrowser(aWebBrowser);
-
-	  return NS_OK;
-}
-
-//*****************************************************************************
-// CBrowserImpl::nsISupports
-//*****************************************************************************   
-
-NS_IMPL_ADDREF(CBrowserImpl)
-NS_IMPL_RELEASE(CBrowserImpl)
-
-NS_INTERFACE_MAP_BEGIN(CBrowserImpl)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebBrowserChrome)
-   NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
-   NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
-   NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChromeFocus)
-   NS_INTERFACE_MAP_ENTRY(nsIEmbeddingSiteWindow)
-   NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener)
-   NS_INTERFACE_MAP_ENTRY(nsIContextMenuListener)
-   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
-   NS_INTERFACE_MAP_ENTRY(nsISHistoryListener) // de: added 5/11/01
-   NS_INTERFACE_MAP_ENTRY(nsIStreamListener) // de: added 6/29/01
-   NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) // de: added 6/29/01
-   NS_INTERFACE_MAP_ENTRY(nsITooltipListener) // de: added 7/25/01
-   NS_INTERFACE_MAP_ENTRY(nsIURIContentListener) // de: added 8/8/02
-//   NS_INTERFACE_MAP_ENTRY(nsITooltipTextProvider) // de: added 7/26/01
-NS_INTERFACE_MAP_END
-
-//*****************************************************************************
-// CBrowserImpl::nsIInterfaceRequestor
-//*****************************************************************************   
-
-NS_IMETHODIMP CBrowserImpl::GetInterface(const nsIID &aIID, void** aInstancePtr)
-{
-	if(aIID.Equals(NS_GET_IID(nsIDOMWindow)))
-	{
-		if (mWebBrowser)
-			return mWebBrowser->GetContentDOMWindow((nsIDOMWindow **) aInstancePtr);
-		return NS_ERROR_NOT_INITIALIZED;
-	}
-
-	return QueryInterface(aIID, aInstancePtr);
-}
-
-//*****************************************************************************
-// CBrowserImpl::nsIWebBrowserChrome
-//*****************************************************************************   
-
-//Gets called when you mouseover links etc. in a web page
-//
-NS_IMETHODIMP CBrowserImpl::SetStatus(PRUint32 aType, const PRUnichar* aStatus)
-{
-    QAOutput("\n", 1);
-    QAOutput("inside nsIWebBrowserChrome::SetStatus().", 1);
-	FormatAndPrintOutput("SetStatus() type = ", aType, 1);
-	FormatAndPrintOutput("SetStatus() aStatus = ", *aStatus, 1);
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	m_pBrowserFrameGlue->UpdateStatusBarText(aStatus);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::GetWebBrowser(nsIWebBrowser** aWebBrowser)
-{
-   QAOutput("inside nsIWebBrowserChrome::GetWebBrowser().", 1);
-
-   NS_ENSURE_ARG_POINTER(aWebBrowser);
-
-   *aWebBrowser = mWebBrowser;
-   if (!aWebBrowser)
-      QAOutput("aWebBrowser is null", 1);
-
-   NS_IF_ADDREF(*aWebBrowser);
-
-   return NS_OK;
-}
-
-// Currently called from Init(). I'm not sure who else
-// calls this
-//
-NS_IMETHODIMP CBrowserImpl::SetWebBrowser(nsIWebBrowser* aWebBrowser)
-{
-   QAOutput("inside nsIWebBrowserChrome::SetWebBrowser().", 1);
-
-   NS_ENSURE_ARG_POINTER(aWebBrowser);
-
-   if (!aWebBrowser)
-      QAOutput("aWebBrowser is null", 1);
-
-   mWebBrowser = aWebBrowser;
-
-   return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::GetChromeFlags(PRUint32* aChromeMask)
-{
-    QAOutput("inside nsIWebBrowserChrome::GetChromeFlags().", 1);
-
-	*aChromeMask = nsIWebBrowserChrome::CHROME_ALL;
-	FormatAndPrintOutput("GetChromeFlags() chromeMask = ", *aChromeMask, 1);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::SetChromeFlags(PRUint32 aChromeMask)
-{
-    QAOutput("nsIWebBrowserChrome::SetChromeFlags().", 1);
-
-	FormatAndPrintOutput("SetChromeFlags() chromeMask = ", aChromeMask, 1);
-
-	mChromeMask = aChromeMask;
-
-	return NS_OK;
-}
-
-// Gets called in response to create a new browser window. 
-// Ex: In response to a JavaScript Window.Open() call
-//
-//
-/*NS_IMETHODIMP CBrowserImpl::CreateBrowserWindow(PRUint32 chromeMask, PRInt32 aX, PRInt32 aY, PRInt32 aCX, PRInt32 aCY, nsIWebBrowser **aWebBrowser)
-{
-	if(! m_pBrowserFrameGlue)
-	{
-		QAOutput("nsIWebBrowserChrome::CreateBrowserWindow(). Browser Window not created.", 1);
-		return NS_ERROR_FAILURE;
-	}
-
-	if(m_pBrowserFrameGlue->CreateNewBrowserFrame(chromeMask, 
-								aX, aY, aCX, aCY, aWebBrowser))
-	{
-		QAOutput("nsIWebBrowserChrome::CreateBrowserWindow(): Browser Window created.", 1);
-		return NS_OK;
-	}
-	else
-	{
-		QAOutput("nsIWebBrowserChrome::CreateBrowserWindow(): Browser Window not created.", 1);
-	    return NS_ERROR_FAILURE;
-	}
-}
-*/
-
-// Will get called in response to JavaScript window.close()
-//
-NS_IMETHODIMP CBrowserImpl::DestroyBrowserWindow()
-{
-	if(! m_pBrowserFrameGlue)
-	{
-		QAOutput("inside nsIWebBrowserChrome::DestroyBrowserWindow(): Browser Window not destroyed.", 1);
-		return NS_ERROR_FAILURE;
-	}
-
-	m_pBrowserFrameGlue->DestroyBrowserFrame();
-	QAOutput("nsIWebBrowserChrome::DestroyBrowserWindow(): Browser Window destroyed.", 1);
-
-	return NS_OK;
-}
-
-// Gets called in response to set the size of a window
-// Ex: In response to a JavaScript Window.Open() call of
-// the form 
-//
-//		window.open("http://www.mozilla.org", "theWin", "width=200, height=400");
-//
-// First the CreateBrowserWindow() call will be made followed by a 
-// call to this method to resize the window
-//
-NS_IMETHODIMP CBrowserImpl::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY)
-{
-    QAOutput("\n", 1);
-	QAOutput("inside nsIWebBrowserChrome::SizeBrowserTo(): Browser sized.", 1);
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	FormatAndPrintOutput("SizeBrowserTo() x coordinate = ", aCX, 1);
-	FormatAndPrintOutput("SizeBrowserTo() y coordinate = ", aCY, 1);
-
-	m_pBrowserFrameGlue->SetBrowserFrameSize(aCX, aCY);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::ShowAsModal(void)
-{
-	QAOutput("inside nsIWebBrowserChrome::ShowAsModal()", 2);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::IsWindowModal(PRBool *retval)
-{
-  QAOutput("inside nsIWebBrowserChrome::IsWindowModal()", 1);
-
-  // We're not modal
-  *retval = PR_FALSE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::ExitModalEventLoop(nsresult aStatus)
-{
-  QAOutput("inside nsIWebBrowserChrome::ExitModalEventLoop()", 1);
-  RvTestResult(aStatus, "ExitModalEventLoop status test", 1);
-
-  return NS_OK;
-}
-
-//*****************************************************************************
-// CBrowserImpl::nsIWebBrowserChromeFocus
-//*****************************************************************************
-
-NS_IMETHODIMP CBrowserImpl::FocusNextElement()
-{
-	QAOutput("inside nsIWebBrowserChromeFocus::FocusNextElement()", 1);
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::FocusPrevElement()
-{
-	QAOutput("inside nsIWebBrowserChromeFocus::FocusPrevElement()", 1);
-
-    return NS_OK;
-}
-
-//*****************************************************************************
-// CBrowserImpl::nsIEmbeddingSiteWindow
-//*****************************************************************************   
-
-NS_IMETHODIMP CBrowserImpl::SetDimensions(PRUint32 aFlags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy)
-{
-    QAOutput("\n", 1);
-	QAOutput("inside nsIEmbeddingSiteWindow::SetDimensions()", 1);
-
-	FormatAndPrintOutput("SetDimensions() flags = ", aFlags, 1);
-	FormatAndPrintOutput("SetDimensions() x1 coordinate = ", x, 1);
-	FormatAndPrintOutput("SetDimensions() y1 coordinate = ", y, 1);
-	FormatAndPrintOutput("SetDimensions() x2 coordinate = ", cx, 1);
-	FormatAndPrintOutput("SetDimensions() y2 coordinate = ", cy, 1);
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-    if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_POSITION &&
-        (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_INNER || 
-         aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_OUTER))
-    {
-    	m_pBrowserFrameGlue->SetBrowserFramePositionAndSize(x, y, cx, cy, PR_TRUE);
-    }
-    else
-    {
-        if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_POSITION)
-        {
-    	    m_pBrowserFrameGlue->SetBrowserFramePosition(x, y);
-        }
-        if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_INNER || 
-            aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_OUTER)
-        {
-    	    m_pBrowserFrameGlue->SetBrowserFrameSize(cx, cy);
-        }
-    }
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::GetDimensions(PRUint32 aFlags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy)
-{
-    QAOutput("\n", 1);
-	QAOutput("inside nsIEmbeddingSiteWindow::GetDimensions()", 1);
-
-	FormatAndPrintOutput("GetDimensions() flags = ", aFlags, 1);
-	FormatAndPrintOutput("GetDimensions() x1 coordinate = ", *x, 1);
-	FormatAndPrintOutput("GetDimensions() y1 coordinate = ", *y, 1);
-	FormatAndPrintOutput("GetDimensions() x2 coordinate = ", *cx, 1);
-	FormatAndPrintOutput("GetDimensions() y2 coordinate = ", *cy, 1);
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-    
-    if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_POSITION)
-    {
-    	m_pBrowserFrameGlue->GetBrowserFramePosition(x, y);
-    }
-    if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_INNER || 
-        aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_OUTER)
-    {
-    	m_pBrowserFrameGlue->GetBrowserFrameSize(cx, cy);
-    }
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::GetSiteWindow(void** aSiteWindow)
-{
-  QAOutput("inside nsIEmbeddingSiteWindow::GetSiteWindow()", 1);
-
-  if (!aSiteWindow) {
-	QAOutput("GetSiteWindow: Didn't get siteWindow.");
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  *aSiteWindow = 0;
-  if (m_pBrowserFrameGlue) {
-    HWND w = m_pBrowserFrameGlue->GetBrowserFrameNativeWnd();
-    *aSiteWindow = reinterpret_cast<void *>(w);
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::SetFocus()
-{
-    QAOutput("inside nsIEmbeddingSiteWindow::SetFocus()", 1);
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	m_pBrowserFrameGlue->SetFocus();
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::GetTitle(PRUnichar** aTitle)
-{
-    QAOutput("inside nsIEmbeddingSiteWindow::GetTitle()", 1);
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	m_pBrowserFrameGlue->GetBrowserFrameTitle(aTitle);
-	FormatAndPrintOutput("GetTitle() title = ", **aTitle, 1);
-	
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::SetTitle(const PRUnichar* aTitle)
-{
-    QAOutput("inside nsIEmbeddingSiteWindow::SetTitle()", 1);
-	FormatAndPrintOutput("SetTitle() title = ", *aTitle, 1);
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	m_pBrowserFrameGlue->SetBrowserFrameTitle(aTitle);
-	
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::GetVisibility(PRBool *aVisibility)
-{
-    QAOutput("inside nsIEmbeddingSiteWindow::GetVisibility()", 1);
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-    m_pBrowserFrameGlue->GetBrowserFrameVisibility(aVisibility);
-	FormatAndPrintOutput("GetVisibility() boolean = ", *aVisibility, 1);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::SetVisibility(PRBool aVisibility)
-{
-    QAOutput("inside nsIEmbeddingSiteWindow::SetVisibility()", 1);
-	FormatAndPrintOutput("SetVisibility() boolean = ", aVisibility, 1);
-
-    if(! m_pBrowserFrameGlue)
-        return NS_ERROR_FAILURE;
-
-    m_pBrowserFrameGlue->ShowBrowserFrame(aVisibility);
-
-    return NS_OK;
-}
-
-//*****************************************************************************
-// CBrowserImpl::nsIStreamListener 
-// (used for nsIRequest, nsIChannel, and UriContentListener)
-//*****************************************************************************   
-
-NS_IMETHODIMP CBrowserImpl::OnDataAvailable(nsIRequest *request,
-				nsISupports *ctxt, nsIInputStream *input,
-				PRUint32 offset, PRUint32 count)
-{
-	nsCString stringMsg;
-	PRUint32 readLen;
-	QAOutput("\n");
-	QAOutput("##### inside nsIStreamListener::OnDataAvailable(). #####");
-
-	RequestName(request, stringMsg, 1);
-	readLen = count;
-		// from prmem.h: PR_Malloc()
-	char *buf = (char *)PR_Malloc(count);
-	if (!input)
-		QAOutput("We didn't get the nsIInputStream object.", 1);
-	else {
-		// consumer of input stream
-		rv = input->Read(buf, count, &readLen);
-		RvTestResult(rv, "nsIInputStream->Read() consumer", 1);
-	}
-
-	FormatAndPrintOutput("OnDataAvailable() offset = ", offset, 1);
-	FormatAndPrintOutput("OnDataAvailable() count = ", count, 1);
-
-	if (!ctxt)
-		QAOutput("OnDataAvailable():We didn't get the nsISupports object.", 1);
-	else
-		QAOutput("OnDataAvailable():We got the nsISupports object.", 1);
-
-	return NS_OK;
-}
-
-//*****************************************************************************
-// CBrowserImpl::nsIRequestObserver 
-// (used for nsIRequest, nsIChannel, and UriContentListener)
-//*****************************************************************************   
-
-NS_IMETHODIMP CBrowserImpl::OnStartRequest(nsIRequest *request,
-				nsISupports *ctxt)
-{
-	nsCString stringMsg;
-
-	QAOutput("\n");
-	QAOutput("##### BEGIN: nsIRequestObserver::OnStartRequest() #####");
-
-	if (!ctxt)
-		QAOutput("We did NOT get the context object.\n");
-
-	if (ctxt == getSupportObj.sup)
-		QAOutput("Context objects equal each other.\n");
-	else
-		QAOutput("Context objects don't equal each other.\n");
-
-	RequestName(request, stringMsg, 1);
-
-	// these are for nsIChannel tests found in nsichanneltests.cpp (post AsyncOpen() tests)
-	nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
-	nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(channel);
-	CBrowserImpl *aBrowserImpl = new CBrowserImpl();
-	CnsIChannelTests  *channelTests = new CnsIChannelTests(mWebBrowser, aBrowserImpl);
-	CnsIHttpChannelTests *httpChannelTests = new CnsIHttpChannelTests(mWebBrowser, aBrowserImpl);
-	if (channelTests && channel) {
-		QAOutput("\n  Start nsIChannel PostAsyncOpenTests tests:");
-		channelTests->PostAsyncOpenTests(channel, 1);
-	}
-	else if (!channelTests)
-		QAOutput("No object to run PostAsyncOpenTests() for nsIChannel.", 1);
-
-	if (!httpChannelTests)
-		QAOutput("No object to run CallResponseTests() for nsIHttpChannel.", 1);
-	else
-	{
-		QAOutput("\n  Start nsIHttpChannel response tests:");
-		httpChannelTests->CallResponseTests(httpChannel, 1);
-	}
-
-	if (!ctxt)
-		QAOutput("OnStartRequest():We didn't get the nsISupports object.", 1);
-	else
-		QAOutput("OnStartRequest():We got the nsISupports object.", 1);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::OnStopRequest(nsIRequest *request,
-				nsISupports *ctxt, nsresult rv)
-{
-	nsCString stringMsg;
-	QAOutput("\n");
-	RvTestResult(rv, "nsIRequestObserver::OnStopRequest rv input", 1);
-	RequestName(request, stringMsg, 1);
-
-	if (!ctxt)
-		QAOutput("OnStopRequest():We didn't get the nsISupports object.", 1);
-	else
-		QAOutput("OnStopRequest():We got the nsISupports object.", 1);
-
-	RvTestResult(rv, "OnStopRequest() rv test", 1);
-
-	QAOutput("##### END: nsIStreamListener::OnStopRequest() #####");
-		
-	return NS_OK;
-}
-
-//*****************************************************************************   
-//  CBrowserImpl::Tool Tip Listener
-//*****************************************************************************   
-
-NS_IMETHODIMP CBrowserImpl::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords,
-										  const PRUnichar *aTipText)
-{
-    if(! m_pBrowserFrameGlue)
-        return NS_ERROR_FAILURE;
-
-    m_pBrowserFrameGlue->ShowTooltip(aXCoords, aYCoords, aTipText);
-
-	QAOutput("nsITooltipListener->OnShowTooltip()",1);
-	FormatAndPrintOutput("OnShowTooltip() aXCoords = ", aXCoords, 1);
-	FormatAndPrintOutput("OnShowTooltip() aYCoords = ", aYCoords, 1);
-	FormatAndPrintOutput("OnShowTooltip() aTipText = ", *aTipText, 1);	
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::OnHideTooltip() 
-{
-    if(! m_pBrowserFrameGlue)
-        return NS_ERROR_FAILURE;
-
-    m_pBrowserFrameGlue->HideTooltip();
-	QAOutput("nsITooltipListener->OnHideTooltip()",1);
-	return NS_OK;
-}
-
-
-//*****************************************************************************   
-//  CBrowserImpl::UriContentListener
-//*****************************************************************************   
-
-NS_IMETHODIMP CBrowserImpl::OnStartURIOpen(nsIURI *aURI, PRBool *_retval)
-{
-	QAOutput("nsIURIContentListener->OnStartURIOpen()",1);
-
-	GetTheURI(aURI, 1);
-	// set return boolean to false so uriOpen doesn't abort
-	*_retval = PR_FALSE;
-	FormatAndPrintOutput("_retval set to = ", *_retval, 1);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::DoContent(const char *aContentType, PRBool aIsContentPreferred, nsIRequest *aRequest, nsIStreamListener **aContentHandler, PRBool *_retval)
-{
-	nsCString stringMsg;
-
-	QAOutput("nsIURIContentListener->DoContent()",1);
-
-	FormatAndPrintOutput("DoContent() content type = ", *aContentType, 1);
-	FormatAndPrintOutput("DoContent() aIsContentPreferred = ", aIsContentPreferred, 1);
-	RequestName(aRequest, stringMsg);	// nsIRequest::GetName() test
-//	*aContentHandler = nsnull;
-	QueryInterface(NS_GET_IID(nsIStreamListener), (void **) aContentHandler);
-
-	*_retval = PR_FALSE;
-	FormatAndPrintOutput("_retval set to = ", *_retval, 1);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::IsPreferred(const char *aContentType, char **aDesiredContentType, PRBool *_retval)
-{
-	nsCAutoString contentStr;
-
-	QAOutput("nsIURIContentListener->IsPreferred()",1);
-
-	FormatAndPrintOutput("IsPreferred() content type = ", *aContentType, 1);
-	*aDesiredContentType = nsCRT::strdup("text/html");
-	FormatAndPrintOutput("aDesiredContentType set to = ", *aDesiredContentType, 1);
-	*_retval = PR_TRUE;
-	FormatAndPrintOutput("_retval set to = ", *_retval, 1);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::CanHandleContent(const char *aContentType, PRBool aIsContentPreferred, char **aDesiredContentType, PRBool *_retval)
-{
-	QAOutput("nsIURIContentListener->CanHandleContent()",1);
-
-	FormatAndPrintOutput("CanHandleContent() content type = ", *aContentType, 1);
-	FormatAndPrintOutput("CanHandleContent() preferred content type = ", aIsContentPreferred, 1);
-	*aDesiredContentType = nsCRT::strdup("text/html");
-	FormatAndPrintOutput("aDesiredContentType set to = ", *aDesiredContentType, 1);
-	*_retval = PR_TRUE;
-	FormatAndPrintOutput("_retval set to = ", *_retval, 1);
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::GetLoadCookie(nsISupports **aLoadCookie)
-{
-	QAOutput("nsIURIContentListener->GetLoadCookie()",1);
-
-	if (!aLoadCookie)
-		QAOutput("aLoadCookie object is null",1);
-	*aLoadCookie = mLoadCookie;
-	NS_IF_ADDREF(*aLoadCookie);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::SetLoadCookie(nsISupports * aLoadCookie)
-{
-	QAOutput("nsIURIContentListener->SetLoadCookie()",1);
-
-	if (!aLoadCookie)
-		QAOutput("aLoadCookie object is null",1);
-	mLoadCookie = aLoadCookie;
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::GetParentContentListener(nsIURIContentListener **aParentContentListener)
-{
-	QAOutput("nsIURIContentListener->GetParentContentListener()",1);
-
-	if (!aParentContentListener)
-		QAOutput("aParentContentListener object is null",1);
-	*aParentContentListener = mParentContentListener;
-	NS_IF_ADDREF(*aParentContentListener);
-
-//	QueryInterface(NS_GET_IID(nsIURIContentListener), (void **) aParentContentListener);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::SetParentContentListener(nsIURIContentListener * aParentContentListener)
-{
-	QAOutput("nsIURIContentListener->SetParentContentListener()",1);
-
-	if (!aParentContentListener)
-		QAOutput("aParentContentListener object is null",1);
-	mParentContentListener = aParentContentListener;
-
-	return NS_OK;	
-}
diff --git a/embedding/qa/testembed/BrowserImpl.h b/embedding/qa/testembed/BrowserImpl.h
deleted file mode 100644
index e46cf05f105..00000000000
--- a/embedding/qa/testembed/BrowserImpl.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _BROWSERIMPL_H
-#define _BROWSERIMPL_H
-
-#include "IBrowserFrameGlue.h"
-#include "nsIWebBrowserChromeFocus.h"
-#include "nsIContextMenuListener.h"
-#include "nsIDOMNode.h"
-#include "nsISHistoryListener.h"
-//#include "nsIURIContentListener.h"
-
-
-class CBrowserImpl : 
-	 public nsIInterfaceRequestor,
-	 public nsIWebBrowserChrome,
-     public nsIWebBrowserChromeFocus,
-	 public nsIEmbeddingSiteWindow,
-	 public nsIWebProgressListener,
-	 public nsIContextMenuListener,
-	 public nsSupportsWeakReference,
-	 public nsISHistoryListener,		// de: added this 5/11/01   					 
-	 public nsIStreamListener,			// de: added this 6/29/01
-	 public nsITooltipListener,   		// de: added this 7/25/01
-	 public nsIURIContentListener		// de: added this 8/8/02
-{
-public:
-    CBrowserImpl();
-    ~CBrowserImpl();
-    NS_METHOD Init(PBROWSERFRAMEGLUE pBrowserFrameGlue,
-                   nsIWebBrowser* aWebBrowser);
-// de: macros that declare methods for the ifaces implemented
-	// (instead of .h declarations)
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIINTERFACEREQUESTOR
-    NS_DECL_NSIWEBBROWSERCHROME
-    NS_DECL_NSIWEBBROWSERCHROMEFOCUS
-    NS_DECL_NSIEMBEDDINGSITEWINDOW
-    NS_DECL_NSIWEBPROGRESSLISTENER
-    NS_DECL_NSICONTEXTMENULISTENER
-	NS_DECL_NSISHISTORYLISTENER		 // de: added this in 5/11
-	NS_DECL_NSISTREAMLISTENER  		 // de: added this in 6/29
-	NS_DECL_NSIREQUESTOBSERVER		 // de: added this in 6/29
-	NS_DECL_NSITOOLTIPLISTENER		 // de: added this in 7/25
-	NS_DECL_NSIURICONTENTLISTENER
-//	NS_DECL_NSITOOLTIPTEXTPROVIDER   // de: added this in 7/25
-
-protected:
-
-    PBROWSERFRAMEGLUE  m_pBrowserFrameGlue;
-
-    nsCOMPtr<nsIWebBrowser> mWebBrowser;
-	nsCOMPtr<nsISupports> mLoadCookie;						// de: used for nsIURIContentListener
-	nsCOMPtr<nsIURIContentListener> mParentContentListener;	// de: used for nsIURIContentListener
-	PRUint32 mChromeMask;
-};
-
-#endif //_BROWSERIMPL_H
diff --git a/embedding/qa/testembed/BrowserImplCtxMenuLstnr.cpp b/embedding/qa/testembed/BrowserImplCtxMenuLstnr.cpp
deleted file mode 100644
index 65a9a25dade..00000000000
--- a/embedding/qa/testembed/BrowserImplCtxMenuLstnr.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifdef _WINDOWS
-  #include "stdafx.h"
-#endif
-#include "BrowserImpl.h"
-#include "IBrowserFrameGlue.h"
-
-#include "QaUtils.h"
-
-//*****************************************************************************
-// CBrowserImpl::nsIContextMenuListener
-//*****************************************************************************   
-
-NS_IMETHODIMP CBrowserImpl::OnShowContextMenu(PRUint32 aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode)
-{
-	QAOutput("nsIContextMenuListener::OnShowContextMenu()", 1);
-	if(m_pBrowserFrameGlue)
-		m_pBrowserFrameGlue->ShowContextMenu(aContextFlags, aNode);
-
-	return NS_OK;
-}
\ No newline at end of file
diff --git a/embedding/qa/testembed/BrowserImplHistoryLstnr.cpp b/embedding/qa/testembed/BrowserImplHistoryLstnr.cpp
deleted file mode 100644
index b00e74aa0e8..00000000000
--- a/embedding/qa/testembed/BrowserImplHistoryLstnr.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifdef _WINDOWS
-  #include "stdafx.h"
-#endif
-#include "BrowserImpl.h"
-#include "IBrowserFrameGlue.h"
-
-#include "TestEmbed.h"
-#include "BrowserView.h"
-#include "BrowserFrm.h"
-
-#include "QaUtils.h"
-
-//*****************************************************************************
-// CBrowserImpl::nsIHistoryListener Implementation
-//*****************************************************************************   
-//
-// - Implements browser history listener methods. Activated through various events
-//	 (i.e. forward, back, reload)
-//
-//	- Calls methods via the IBrowserFrameGlue interace 
-//	  (available thru' the m_pBrowserFrameGlue member var)
-//	  to do the actual statusbar/progress bar updates. 
-//
-
-class CBrowserView;
-
-
-//*****************************************************************************
-// CBrowserImpl::nsISHistoryListener methods
-//*****************************************************************************   
-
-NS_IMETHODIMP CBrowserImpl::OnHistoryNewEntry(nsIURI *theURI)
-{
-	QAOutput("nsIHistoryListener::OnHistoryNewEntry()", 2);
-    GetTheURI(theURI, 1);
-	return NS_OK;
-}
-
-
-NS_IMETHODIMP CBrowserImpl::OnHistoryGoBack(nsIURI *theURI, PRBool *notify)
-{
-	QAOutput("nsIHistoryListener::OnHistoryGoBack()", 2);
-
-    GetTheURI(theURI, 1);
-	*notify = PR_TRUE;
-	FormatAndPrintOutput("OnHistoryGoBack() notification = ", *notify, 1);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::OnHistoryGoForward(nsIURI *theURI, PRBool *notify)
-{
-	QAOutput("nsIHistoryListener::OnHistoryGoForward()", 2);
-
-	GetTheURI(theURI, 1);
-	*notify = PR_TRUE;
-	FormatAndPrintOutput("OnHistoryGoForward() notification = ", *notify, 1);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::OnHistoryReload(nsIURI *theURI, PRUint32 reloadFlags, PRBool *notify)
-{
-	char flagString[200];
-
-	QAOutput("nsIHistoryListener::OnHistoryReload()", 2);
-
-	GetTheURI(theURI, 1);
-	*notify = PR_TRUE;
-	FormatAndPrintOutput("OnHistoryReload() notification = ", *notify, 1);
-
-	if (reloadFlags == 0x0000)
-		strcpy(flagString, "LOAD_FLAGS_NONE");
-	else if (reloadFlags == 0x0010)
-		strcpy(flagString, "LOAD_FLAGS_IS_REFRESH");
-	else if (reloadFlags == 0x0020)
-		strcpy(flagString, "LOAD_FLAGS_IS_LINK");
-	else if (reloadFlags == 0x0040)
-		strcpy(flagString, "LOAD_FLAGS_BYPASS_HISTORY");
-	else if (reloadFlags == 0x0080)
-		strcpy(flagString, "LOAD_FLAGS_REPLACE_HISTORY");
-	else if (reloadFlags == 0x0100)
-		strcpy(flagString, "LOAD_FLAGS_BYPASS_CACHE");
-	else if (reloadFlags == 0x0200)
-		strcpy(flagString, "LOAD_FLAGS_BYPASS_PROXY");
-	else if (reloadFlags == 0x0400)
-		strcpy(flagString, "LOAD_FLAGS_CHARSET_CHANGE");
-	else if (reloadFlags == (0x0100 | 0x0200))
-		strcpy(flagString, "LOAD_FLAGS_BYPASS_CACHE | LOAD_FLAGS_BYPASS_PROXY");
-
-	FormatAndPrintOutput("OnHistoryReload() flag value = ", reloadFlags, 1);
-	FormatAndPrintOutput("OnHistoryReload() flag string = ", flagString, 2);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::OnHistoryGotoIndex(PRInt32 theIndex, nsIURI *theURI, PRBool *notify)
-{
-	QAOutput("nsIHistoryListener::OnHistoryGotoIndex()", 2);
-
-    GetTheURI(theURI, 1);
-	*notify = PR_TRUE;
-	FormatAndPrintOutput("OnHistoryGotoIndex() notification = ", *notify, 1);
-
-	FormatAndPrintOutput("OnHistoryGotoIndex() index = ", theIndex, 2);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::OnHistoryPurge(PRInt32 theNumEntries, PRBool *notify)
-{
-	QAOutput("nsIHistoryListener::OnHistoryPurge()", 2);
-
-	*notify = PR_TRUE;
-	FormatAndPrintOutput("OnHistoryPurge() notification = ", *notify, 1);
-
-	FormatAndPrintOutput("OnHistoryPurge() theNumEntries = ", theNumEntries, 2);
-
-	return NS_OK;
-}
-
diff --git a/embedding/qa/testembed/BrowserImplPrompt.cpp b/embedding/qa/testembed/BrowserImplPrompt.cpp
deleted file mode 100644
index e64b07cc466..00000000000
--- a/embedding/qa/testembed/BrowserImplPrompt.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File overview.....
-//
-// The nsIPrompt interface is mainly used to convey/get information
-// from a user via Alerts, Prompts etc.
-// 
-
-#ifdef _WINDOWS
-  #include "stdafx.h"
-#endif
-#include "BrowserImpl.h"
-#include "IBrowserFrameGlue.h"
-
-//*****************************************************************************
-// CBrowserImpl::nsIPrompt Implementation
-//*****************************************************************************   
-
-
-// Needed for JavaScript and other cases where a msg needs to be 
-// shown to the user. For ex, when a page has some JS such as
-// "Alert("Hello")" this method will be invoked
-NS_IMETHODIMP
-CBrowserImpl::Alert(const PRUnichar *dialogTitle, const PRUnichar *text)
-{
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-	
-	m_pBrowserFrameGlue->Alert(dialogTitle, text);
-
-	return NS_OK;
-}
-
-// Invoked in the case of a JS confirm() method invocation
-NS_IMETHODIMP
-CBrowserImpl::Confirm(const PRUnichar *dialogTitle, 
-			   const PRUnichar *text, PRBool *retval)
-{
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	m_pBrowserFrameGlue->Confirm(dialogTitle, text, retval);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP
-CBrowserImpl::Prompt(const PRUnichar *dialogTitle, const PRUnichar *text,
-                     PRUnichar **promptText,
-                     const PRUnichar *checkMsg, PRBool *checkValue,
-                     PRBool *_retval)
-{
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	m_pBrowserFrameGlue->Prompt(dialogTitle, text, promptText, checkMsg, checkValue, _retval);
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP
-CBrowserImpl::PromptPassword(const PRUnichar *dialogTitle, const PRUnichar *text,
-                             PRUnichar **password,
-                             const PRUnichar *checkMsg, PRBool *checkValue,
-                             PRBool *_retval)
-{
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	m_pBrowserFrameGlue->PromptPassword(dialogTitle, text, password,
-	                                    checkMsg, checkValue, _retval);
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-CBrowserImpl::PromptUsernameAndPassword(const PRUnichar *dialogTitle, const PRUnichar *text,
-                                        PRUnichar **username, PRUnichar **password,
-                                        const PRUnichar *checkMsg, PRBool *checkValue,
-                                        PRBool *_retval)
-{
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	m_pBrowserFrameGlue->PromptUserNamePassword(dialogTitle, text, 
-							                    username, password,
-							                    checkMsg, checkValue, 
-							                    _retval);
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-CBrowserImpl::AlertCheck(const PRUnichar *dialogTitle, 
-			      const PRUnichar *text, 
-			      const PRUnichar *checkMsg,
-			      PRBool *checkValue)
-{
-	    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-CBrowserImpl::ConfirmCheck(const PRUnichar *dialogTitle,
-				const PRUnichar *text,
-				const PRUnichar *checkMsg, 
-				PRBool *checkValue, PRBool *retval)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-CBrowserImpl::ConfirmEx(const PRUnichar *dialogTitle, const PRUnichar *text,
-                        PRUint32 buttonFlags, const PRUnichar *button0Title,
-                        const PRUnichar *button1Title, const PRUnichar *button2Title,
-                        const PRUnichar *checkMsg, PRBool *checkValue,
-                        PRInt32 *buttonPressed)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-CBrowserImpl::Select(const PRUnichar *dialogTitle,
-			  const PRUnichar *text, PRUint32 count,
-			  const PRUnichar **selectList,
-			  PRInt32 *outSelection, PRBool *retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
diff --git a/embedding/qa/testembed/BrowserImplWebPrgrsLstnr.cpp b/embedding/qa/testembed/BrowserImplWebPrgrsLstnr.cpp
deleted file mode 100644
index 8a8621cde2e..00000000000
--- a/embedding/qa/testembed/BrowserImplWebPrgrsLstnr.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifdef _WINDOWS
-  #include "stdafx.h"
-#endif
-#include "BrowserImpl.h"
-#include "IBrowserFrameGlue.h"
-
-#include "TestEmbed.h"
-#include "BrowserView.h"
-#include "BrowserFrm.h"
-
-#include "QaUtils.h"
-#include "Tests.h"
-
-//*****************************************************************************
-// CBrowserImpl::nsIWebProgressListener Implementation
-//*****************************************************************************   
-//
-// - Implements browser progress update functionality 
-//   while loading a page into the embedded browser
-//
-//	- Calls methods via the IBrowserFrameGlue interace 
-//	  (available thru' the m_pBrowserFrameGlue member var)
-//	  to do the actual statusbar/progress bar updates. 
-//
-
-class CBrowserView;
-
-NS_IMETHODIMP CBrowserImpl::OnProgressChange(nsIWebProgress *progress, nsIRequest *request,
-                                                  PRInt32 curSelfProgress, PRInt32 maxSelfProgress,
-                                                  PRInt32 curTotalProgress, PRInt32 maxTotalProgress)
-{
-	// nsCString
-	nsCString stringMsg;
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	QAOutput("Entering nsIWebProgLstnr::OnProgressChange().");
-
-	PRInt32 nProgress = curTotalProgress;
-	PRInt32 nProgressMax = maxTotalProgress;
-
-	RequestName(request, stringMsg);
-
-	if (nProgressMax == 0)
-		nProgressMax = LONG_MAX;
-
-	FormatAndPrintOutput("OnProgressChange(): curSelfProgress value = ", curSelfProgress, 1); 
-	FormatAndPrintOutput("OnProgressChange(): maxSelfProgress value = ", maxSelfProgress, 1);
-	FormatAndPrintOutput("OnProgressChange(): curTotalProgress value = ", nProgress, 1); 
-	FormatAndPrintOutput("OnProgressChange(): maxTotalProgress value = ", nProgressMax, 1);
-
-	if (curSelfProgress == maxSelfProgress && maxSelfProgress != -1)
-	{
-		QAOutput("nsIWebProgLstnr::OnProgressChange(): Self progress complete!", 1);
-
-		// web progress DOMWindow test
-		WebProgDOMWindowTest(progress, "OnProgressChange()", 1);
-	}
-
-	if (nProgress > nProgressMax && nProgressMax != -1)
-	{
-		nProgress = nProgressMax; // Progress complete
-
-		QAOutput("nsIWebProgLstnr::OnProgressChange(): Progress Update complete!", 1);
-	}
-	WebProgIsDocLoadingTest(progress, "OnProgressChange()", 1);
-	m_pBrowserFrameGlue->UpdateProgress(nProgress, nProgressMax);
-
-	QAOutput("Exiting nsIWebProgLstnr::OnProgressChange().\r\n");
-  
-	return NS_OK;
-}
-
-NS_IMETHODIMP CBrowserImpl::OnStateChange(nsIWebProgress *progress, nsIRequest *request,
-                                          PRUint32 progressStateFlags, nsresult status)
-{
-	char theDocType[100];
-	char theStateType[100];
-	int displayMode = 1;
-	nsCString stringMsg;
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	QAOutput("Entering nsIWebProgLstnr::OnStateChange().");
-
-	RequestName(request, stringMsg);	// nsIRequest::GetName() test
-
-	if (progressStateFlags & STATE_IS_DOCUMENT)		// DOCUMENT
-	{
-		displayMode = 1;
-		strcpy(theDocType, "DOCUMENT");
-		if (progressStateFlags & STATE_START)
-		{ 
-			// Navigation has begun
-			strcpy(theStateType, "STATE_START");
-			displayMode = 2;
-
-			if(m_pBrowserFrameGlue)
-				m_pBrowserFrameGlue->UpdateBusyState(PR_TRUE);
-		}
-
-		else if (progressStateFlags & STATE_REDIRECTING)
-			strcpy(theStateType, "STATE_REDIRECTING");
-
-		else if (progressStateFlags & STATE_TRANSFERRING) {
-			strcpy(theStateType, "STATE_TRANSFERRING");	
-		}
-
-		else if (progressStateFlags & STATE_NEGOTIATING)
-			strcpy(theStateType, "STATE_NEGOTIATING");				
-
-		else if (progressStateFlags & STATE_STOP)
-		{
-			// We've completed the navigation
-
-			strcpy(theStateType, "STATE_STOP");
-			displayMode = 2;
-
-			m_pBrowserFrameGlue->UpdateBusyState(PR_FALSE);
-			m_pBrowserFrameGlue->UpdateProgress(0, 100);       // Clear the prog bar
-			m_pBrowserFrameGlue->UpdateStatusBarText(nsnull);  // Clear the status bar
-
-		// web progress DOMWindow test
-			WebProgDOMWindowTest(progress, "OnStateChange()", 1);
-		}
-
-		onStateChangeString(theStateType, theDocType, stringMsg, status, displayMode);
-
-	}		// end STATE_IS_DOCUMENT
-
-	if (progressStateFlags & STATE_IS_REQUEST)		// REQUEST
-	{
-		displayMode = 1;
-		strcpy(theDocType, "REQUEST");
-		if (progressStateFlags & STATE_START)
-			strcpy(theStateType, "STATE_START");
-		else if (progressStateFlags & STATE_REDIRECTING)
-			strcpy(theStateType, "STATE_REDIRECTING");
-
-		else if (progressStateFlags & STATE_TRANSFERRING)
-			strcpy(theStateType, "STATE_TRANSFERRING");		
-
-		else if (progressStateFlags & STATE_NEGOTIATING)
-			strcpy(theStateType, "STATE_NEGOTIATING");				
-
-		else if (progressStateFlags & STATE_STOP)
-			strcpy(theStateType, "STATE_STOP");
-		
-		onStateChangeString(theStateType, theDocType, stringMsg, status, displayMode);
-	}
-
-	if (progressStateFlags & STATE_IS_NETWORK)		// NETWORK
-	{
-		displayMode = 1;
-		strcpy(theDocType, "NETWORK");
-		if (progressStateFlags & STATE_START)
-			strcpy(theStateType, "STATE_START");
-		else if (progressStateFlags & STATE_REDIRECTING)
-			strcpy(theStateType, "STATE_REDIRECTING");
-
-		else if (progressStateFlags & STATE_TRANSFERRING)
-			strcpy(theStateType, "STATE_TRANSFERRING");		
-
-		else if (progressStateFlags & STATE_NEGOTIATING)
-			strcpy(theStateType, "STATE_NEGOTIATING");				
-
-		else if (progressStateFlags & STATE_STOP)
-			strcpy(theStateType, "STATE_STOP");
-		
-		onStateChangeString(theStateType, theDocType, stringMsg, status, displayMode);
-
-	}
-	if (progressStateFlags & STATE_IS_WINDOW)		// WINDOW
-	{
-		displayMode = 1;
-		strcpy(theDocType, "WINDOW");
-		if (progressStateFlags & STATE_START)
-			strcpy(theStateType, "STATE_START");
-		else if (progressStateFlags & STATE_REDIRECTING)
-			strcpy(theStateType, "STATE_REDIRECTING");
-
-		else if (progressStateFlags & STATE_TRANSFERRING)
-			strcpy(theStateType, "STATE_TRANSFERRING");		
-
-		else if (progressStateFlags & STATE_NEGOTIATING)
-			strcpy(theStateType, "STATE_NEGOTIATING");				
-
-		else if (progressStateFlags & STATE_STOP)
-			strcpy(theStateType, "STATE_STOP");
-		
-		onStateChangeString(theStateType, theDocType, stringMsg, status, displayMode);
-
-	}
-	// web progress isDocumentLoading test
-	WebProgIsDocLoadingTest(progress, "OnStateChange()", 1);
-
-	QAOutput("Exiting nsIWebProgLstnr::OnStateChange().\r\n");
-
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP CBrowserImpl::OnLocationChange(nsIWebProgress* aWebProgress,
-                                                 nsIRequest* aRequest,
-                                                 nsIURI *location)
-{
-	nsCString stringMsg;
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	QAOutput("Entering nsIWebProgLstnr::OnLocationChange().");
-
-	// test nsIURI parameter
-	GetTheURI(location, 1);
- 
-	RequestName(aRequest, stringMsg);  
-
-	PRBool isSubFrameLoad = PR_FALSE; // Is this a subframe load
-	if (aWebProgress) {
-		nsCOMPtr<nsIDOMWindow>  domWindow;
-		nsCOMPtr<nsIDOMWindow>  topDomWindow;
-		aWebProgress->GetDOMWindow(getter_AddRefs(domWindow));
-		if (domWindow) { // Get root domWindow
-			domWindow->GetTop(getter_AddRefs(topDomWindow));
-		}
-		if (domWindow != topDomWindow)
-			isSubFrameLoad = PR_TRUE;
-		WebProgIsDocLoadingTest(aWebProgress, "OnLocationChange()", 1);
-	}
-
-	if (!isSubFrameLoad) // Update urlbar only if it is not a subframe load
-	  m_pBrowserFrameGlue->UpdateCurrentURI(location);
-
-  	QAOutput("Exiting nsIWebProgLstnr::OnLocationChange().\r\n");
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-CBrowserImpl::OnStatusChange(nsIWebProgress* aWebProgress,
-                                 nsIRequest* aRequest,
-                                 nsresult aStatus,
-                                 const PRUnichar* aMessage)
-{
-	nsCString stringMsg;
-
-	if(! m_pBrowserFrameGlue)
-		return NS_ERROR_FAILURE;
-
-	QAOutput("Entering nsIWebProgLstnr::OnStatusChange().");
-
-	RequestName(aRequest, stringMsg);
-
-			// status result test (id number)
-	FormatAndPrintOutput("OnStatusChange(): Status id = ", aStatus, 1);
-
-			// web progress DOMWindow test (typically the host name)
-	WebProgDOMWindowTest(aWebProgress, "OnStatusChange(): web prog DOM window test", 1);
-			// web progress isDocumentLoading test
-	WebProgIsDocLoadingTest(aWebProgress, "OnStatusChange()", 1);
-
-	m_pBrowserFrameGlue->UpdateStatusBarText(aMessage);
-
-	QAOutput("Exiting nsIWebProgLstnr::OnStatusChange().\r\n");
-
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP 
-CBrowserImpl::OnSecurityChange(nsIWebProgress *aWebProgress, 
-                                    nsIRequest *aRequest, 
-                                    PRUint32 state)
-{
-	nsCString stringMsg;
-
-	QAOutput("Entering nsIWebProgLstnr::OnSecurityChange().");
-
-	RequestName(aRequest, stringMsg);
-
-	if (state & STATE_IS_SECURE)
-	{
-		QAOutput("OnSecurityChange():STATE_IS_SECURE. All docs & subdocs are https.");
-		if ((state & 0xFFFF0000) == STATE_SECURE_HIGH)
-			QAOutput("OnSecurityChange(): STATE_SECURE_HIGH state");
-		else if (state & STATE_SECURE_MED)
-			QAOutput("OnSecurityChange(): STATE_SECURE_MED state");
-		else if (state & STATE_SECURE_LOW)
-			QAOutput("OnSecurityChange(): STATE_SECURE_LOW state");
-	}
-	else if (state & STATE_IS_BROKEN)
-		QAOutput("OnSecurityChange():STATE_IS_BROKEN. Mixed: some docs are https.");
-	else if ((state & 0xFFFF) ==  STATE_IS_INSECURE)
-		QAOutput("OnSecurityChange():STATE_IS_INSECURE. Nothing is https.");
-
-				// web progress DOMWindow test
-	WebProgDOMWindowTest(aWebProgress, "OnSecurityChange()", 1);
-				// web progress isDocumentLoading test
-	WebProgIsDocLoadingTest(aWebProgress, "OnSecurityChange()", 1);
-
-	QAOutput("Exiting nsIWebProgLstnr::OnSecurityChange().\r\n");
-
-    return NS_OK;
-}
diff --git a/embedding/qa/testembed/BrowserToolTip.cpp b/embedding/qa/testembed/BrowserToolTip.cpp
deleted file mode 100644
index 64a5762cb19..00000000000
--- a/embedding/qa/testembed/BrowserToolTip.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Adam Lock <adamlock@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "stdafx.h"
-
-#include "BrowserToolTip.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CBrowserToolTip
-
-CBrowserToolTip::CBrowserToolTip()
-{
-}
-
-CBrowserToolTip::~CBrowserToolTip()
-{
-}
-
-BEGIN_MESSAGE_MAP(CBrowserToolTip, CWnd)
-	//{{AFX_MSG_MAP(CBrowserToolTip)
-	ON_WM_PAINT()
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-BOOL CBrowserToolTip::Create(CWnd *pParentWnd)
-{
-    return CWnd::CreateEx(WS_EX_TOOLWINDOW,
-        AfxRegisterWndClass(CS_SAVEBITS, NULL, GetSysColorBrush(COLOR_INFOBK), NULL),
-        _T("ToolTip"), WS_POPUP | WS_BORDER, 0, 0, 1, 1, pParentWnd->GetSafeHwnd(), NULL);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CBrowserToolTip message handlers
-
-void CBrowserToolTip::OnPaint() 
-{
-	CPaintDC dc(this); // device context for painting
-
-    CRect rcClient;
-    GetClientRect(&rcClient);
-
-    // Draw tip text
-    int oldBkMode = dc.SetBkMode(TRANSPARENT);
-    COLORREF oldTextColor = dc.SetTextColor(GetSysColor(COLOR_INFOTEXT));
-    HGDIOBJ oldFont = dc.SelectObject(GetStockObject(DEFAULT_GUI_FONT));
-
-    dc.DrawText(m_szTipText, -1, rcClient, DT_SINGLELINE | DT_VCENTER | DT_CENTER);
-
-    dc.SetBkMode(oldBkMode);
-    dc.SetTextColor(oldTextColor);
-    dc.SelectObject(oldFont);
-}
-
-BOOL CBrowserToolTip::PreCreateWindow(CREATESTRUCT& cs) 
-{
-	return CWnd::PreCreateWindow(cs);
-}
-
-void CBrowserToolTip::SetTipText(const CString &szTipText)
-{
-    m_szTipText = szTipText;
-}
-
-void CBrowserToolTip::Show(CWnd *pOverWnd, long left, long top)
-{
-    // Calculate the client window size
-    CRect rcNewClient(0,0,0,0);
-    CDC *pdc = GetDC();
-    HGDIOBJ oldFont = pdc->SelectObject(GetStockObject(DEFAULT_GUI_FONT));
-    rcNewClient.bottom = pdc->DrawText(m_szTipText, -1, rcNewClient,
-        DT_SINGLELINE | DT_VCENTER | DT_CENTER | DT_CALCRECT);
-    pdc->SelectObject(oldFont);
-    ReleaseDC(pdc);
-    rcNewClient.right += 8;
-    rcNewClient.bottom += 8;
-    
-    // Adjust the tooltip to new size
-    AdjustWindowRectEx(rcNewClient, GetWindowLong(m_hWnd, GWL_STYLE), FALSE, GetWindowLong(m_hWnd, GWL_EXSTYLE));
-
-    // Adjust the left, top position of the tooltip
-    CPoint ptTip(left, top);
-    pOverWnd->ClientToScreen(&ptTip);
-
-    // Make sure tip is below cursor
-    POINT ptCursor;
-    GetCursorPos(&ptCursor);
-    long cyCursor = GetSystemMetrics(SM_CYCURSOR);
-    if (ptTip.y < ptCursor.y + cyCursor)
-        ptTip.y = ptCursor.y + cyCursor;
-
-    // Make sure tip is fully visible
-    RECT rcScreen;
-    GetDesktopWindow()->GetClientRect(&rcScreen);
-    if (ptTip.x < 0)
-        ptTip.x = 0;
-    else if (ptTip.x + rcNewClient.Width() > rcScreen.right)
-        ptTip.x = rcScreen.right - rcNewClient.Width();
-    if (ptTip.y < 0)
-        ptTip.y = 0;
-    else if (ptTip.y + rcNewClient.Height() > rcScreen.bottom)
-        ptTip.y = rcScreen.bottom - rcNewClient.Height();
-
-    // Position and show the tip
-    SetWindowPos(&CWnd::wndTop, ptTip.x, ptTip.y, rcNewClient.Width(), rcNewClient.Height(),
-        SWP_NOACTIVATE | SWP_SHOWWINDOW);
-}
-
-void CBrowserToolTip::Hide()
-{
-    ShowWindow(SW_HIDE);
-}
diff --git a/embedding/qa/testembed/BrowserToolTip.h b/embedding/qa/testembed/BrowserToolTip.h
deleted file mode 100644
index 5059974d320..00000000000
--- a/embedding/qa/testembed/BrowserToolTip.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Adam Lock <adamlock@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#if !defined(AFX_BROWSERTOOLTIP_H__13240069_1816_403C_A79D_306FD710B75A__INCLUDED_)
-#define AFX_BROWSERTOOLTIP_H__13240069_1816_403C_A79D_306FD710B75A__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// BrowserToolTip.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// CBrowserToolTip window
-
-class CBrowserToolTip : public CWnd
-{
-// Construction
-public:
-	CBrowserToolTip();
-
-// Attributes
-public:
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CBrowserToolTip)
-	protected:
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
-	//}}AFX_VIRTUAL
-
-	CString m_szTipText;
-// Implementation
-public:
-	virtual ~CBrowserToolTip();
-
-    BOOL Create(CWnd *pParentWnd);
-	void SetTipText(const CString &szTipText);
-    void Show(CWnd *pOverWnd, long left, long top);
-    void Hide();
-
-
-	// Generated message map functions
-protected:
-	//{{AFX_MSG(CBrowserToolTip)
-	afx_msg void OnPaint();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BROWSERTOOLTIP_H__13240069_1816_403C_A79D_306FD710B75A__INCLUDED_)
\ No newline at end of file
diff --git a/embedding/qa/testembed/BrowserView.cpp b/embedding/qa/testembed/BrowserView.cpp
deleted file mode 100644
index efb3353374f..00000000000
--- a/embedding/qa/testembed/BrowserView.cpp
+++ /dev/null
@@ -1,1066 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// When the CBrowserFrm creates this View:
-//   - CreateBrowser() is called in OnCreate() to create the
-//	   mozilla embeddable browser
-//
-// OnSize() method handles the window resizes and calls the approriate
-// interface method to resize the embedded browser properly
-//
-// Command handlers to handle browser navigation - OnNavBack(), 
-// OnNavForward() etc
-//
-// DestroyBrowser() called for cleaning up during object destruction
-//
-// Some important coding notes....
-//
-// 1. Make sure we do not have the CS_HREDRAW|CS_VREDRAW in the call
-//	  to AfxRegisterWndClass() inside of PreCreateWindow() below
-//	  If these flags are present then you'll see screen flicker when 
-//	  you resize the frame window
-//
-// Next suggested file to look at : BrowserImpl.cpp
-//
-
-#include "stdafx.h"
-#include "TestEmbed.h"
-#include "BrowserView.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "Dialogs.h"
-#include "ProfileMgr.h"
-#include "ProfilesDlg.h"
-#include "UrlDialog.h"
-#include "Tests.h"
-//#include "nsiRequest.h"
-#include "QaUtils.h"
-
-// Print Includes
-#include "PrintProgressDialog.h"
-//#include "PrintSetupDialog.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-// Register message for FindDialog communication
-static UINT WM_FINDMSG = ::RegisterWindowMessage(FINDMSGSTRING);
-
-BEGIN_MESSAGE_MAP(CBrowserView, CWnd)
-	//{{AFX_MSG_MAP(CBrowserView)
-	ON_WM_CREATE()
-	ON_WM_DESTROY()
-	ON_WM_SIZE()
-	ON_CBN_SELENDOK(ID_URL_BAR, OnUrlSelectedInUrlBar)
-	ON_COMMAND(IDOK, OnNewUrlEnteredInUrlBar)
-	ON_COMMAND(ID_FILE_OPEN, OnFileOpen)
-	ON_COMMAND(ID_FILE_SAVE_AS, OnFileSaveAs)
-	ON_COMMAND(ID_VIEW_SOURCE, OnViewSource)
-	ON_COMMAND(ID_VIEW_INFO, OnViewInfo)
-	ON_COMMAND(ID_NAV_BACK, OnNavBack)
-	ON_COMMAND(ID_NAV_FORWARD, OnNavForward)
-	ON_COMMAND(ID_NAV_HOME, OnNavHome)
-	ON_COMMAND(ID_NAV_RELOAD, OnNavReload)
-	ON_COMMAND(ID_NAV_STOP, OnNavStop)
-	ON_COMMAND(ID_EDIT_CUT, OnCut)
-	ON_COMMAND(ID_EDIT_COPY, OnCopy)
-	ON_COMMAND(ID_EDIT_PASTE, OnPaste)
-    ON_COMMAND(ID_EDIT_UNDO, OnUndoUrlBarEditOp)
-	ON_COMMAND(ID_EDIT_SELECT_ALL, OnSelectAll)
-	ON_COMMAND(ID_EDIT_SELECT_NONE, OnSelectNone)
-	ON_COMMAND(ID_COPY_LINK_LOCATION, OnCopyLinkLocation)
-	ON_COMMAND(ID_OPEN_LINK_IN_NEW_WINDOW, OnOpenLinkInNewWindow)
-	ON_COMMAND(ID_VIEW_IMAGE, OnViewImageInNewWindow)
-	ON_COMMAND(ID_SAVE_LINK_AS, OnSaveLinkAs)
-	ON_COMMAND(ID_SAVE_IMAGE_AS, OnSaveImageAs)
-	ON_COMMAND(ID_EDIT_FIND, OnShowFindDlg)
-	ON_COMMAND(ID_FILE_PRINT, OnFilePrint)
-	ON_UPDATE_COMMAND_UI(ID_FILE_PRINT, OnUpdateFilePrint)
-	ON_REGISTERED_MESSAGE(WM_FINDMSG, OnFindMsg)
-
-	// Menu/Toolbar UI update handlers
-	ON_UPDATE_COMMAND_UI(ID_NAV_BACK, OnUpdateNavBack)
-	ON_UPDATE_COMMAND_UI(ID_NAV_FORWARD, OnUpdateNavForward)
-	ON_UPDATE_COMMAND_UI(ID_NAV_STOP, OnUpdateNavStop)
-	ON_UPDATE_COMMAND_UI(ID_EDIT_CUT, OnUpdateCut)
-	ON_UPDATE_COMMAND_UI(ID_EDIT_COPY, OnUpdateCopy)
-	ON_UPDATE_COMMAND_UI(ID_EDIT_PASTE, OnUpdatePaste)
-
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-CBrowserView::CBrowserView()
-{
-	mWebBrowser = nsnull;
-	mBaseWindow = nsnull;
-	mWebNav = nsnull;
-
-	mpBrowserImpl = nsnull;
-	mpBrowserFrame = nsnull;
-	mpBrowserFrameGlue = nsnull;
-
-	mbDocumentLoading = PR_FALSE;
-
-	m_pFindDlg = NULL;
-  m_pPrintProgressDlg = NULL;
-
-  m_bUrlBarClipOp = FALSE;
-  m_bCurrentlyPrinting = FALSE;
-
-  char *theUrl = "http://www.aol.com/";
-}
-
-CBrowserView::~CBrowserView()
-{
-}
-
-// This is a good place to create the embeddable browser
-// instance
-//
-int CBrowserView::OnCreate(LPCREATESTRUCT lpCreateStruct)
-{
-	CreateBrowser();
-
-	return 0;
-}
-
-void CBrowserView::OnDestroy()
-{
-	DestroyBrowser();
-}
-
-// Create an instance of the Mozilla embeddable browser
-//
-HRESULT CBrowserView::CreateBrowser() 
-{	   
-	// Create web shell
-	nsresult rv;
-	mWebBrowser = do_CreateInstance(NS_WEBBROWSER_CONTRACTID, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-
-	// Save off the nsIWebNavigation interface pointer 
-	// in the mWebNav member variable which we'll use 
-	// later for web page navigation
-	//
-	rv = NS_OK;
-	mWebNav = do_QueryInterface(mWebBrowser, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-
-//	mSessionHistory = do_GetInterface(mWebBrowser, &rv); // de: added 5/11
-
-	// Create the CBrowserImpl object - this is the object
-	// which implements the interfaces which are required
-	// by an app embedding mozilla i.e. these are the interfaces
-	// thru' which the *embedded* browser communicates with the
-	// *embedding* app
-	//
-	// The CBrowserImpl object will be passed in to the 
-	// SetContainerWindow() call below
-	//
-	// Also note that we're passing the BrowserFrameGlue pointer 
-	// and also the mWebBrowser interface pointer via CBrowserImpl::Init()
-	// of CBrowserImpl object. 
-	// These pointers will be saved by the CBrowserImpl object.
-	// The CBrowserImpl object uses the BrowserFrameGlue pointer to 
-	// call the methods on that interface to update the status/progress bars
-	// etc.
-	mpBrowserImpl = new CBrowserImpl();
-	if(mpBrowserImpl == nsnull)
-		return NS_ERROR_OUT_OF_MEMORY;
-
-	// Pass along the mpBrowserFrameGlue pointer to the BrowserImpl object
-	// This is the interface thru' which the XP BrowserImpl code communicates
-	// with the platform specific code to update status bars etc.
-	mpBrowserImpl->Init(mpBrowserFrameGlue, mWebBrowser);
-	mpBrowserImpl->AddRef();
-
-    mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(mpBrowserImpl));
-
-	rv = NS_OK;
-    nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(mWebBrowser, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-    dsti->SetItemType(nsIDocShellTreeItem::typeContentWrapper);
-
-    // Create the real webbrowser window
-  
-	// Note that we're passing the m_hWnd in the call below to InitWindow()
-	// (CBrowserView inherits the m_hWnd from CWnd)
-	// This m_hWnd will be used as the parent window by the embeddable browser
-	//
-	rv = NS_OK;
-	mBaseWindow = do_QueryInterface(mWebBrowser, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-
-	// Get the view's ClientRect which to be passed in to the InitWindow()
-	// call below
-	RECT rcLocation;
-	GetClientRect(&rcLocation);
-	if(IsRectEmpty(&rcLocation))
-	{
-		rcLocation.bottom++;
-		rcLocation.top++;
-	}
-
-	rv = mBaseWindow->InitWindow(nsNativeWidget(m_hWnd), nsnull,
-		0, 0, rcLocation.right - rcLocation.left, rcLocation.bottom - rcLocation.top);
-	rv = mBaseWindow->Create();
-
-    // Register the BrowserImpl object to receive progress messages
-	// These callbacks will be used to update the status/progress bars
-
-/*		// from WinEmbed.cpp
-	nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(this));
-    nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
-    (void)mWebBrowser->AddWebBrowserListener(thisListener, 
-       NS_GET_IID(nsIWebProgressListener));
-
-    // The window has been created. Now register for history notifications
-    rv = mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsISHistoryListener));
-*/
-
-	// Finally, show the web browser window
-	mBaseWindow->SetVisibility(PR_TRUE);
-
-	qaTests = new CTests(mWebBrowser, mBaseWindow, mWebNav, mpBrowserImpl);
-	//nsiRequest = new CNsIRequest(mWebBrowser,mpBrowserImpl);
-	return S_OK;
-}
-
-HRESULT CBrowserView::DestroyBrowser() 
-{	   
-	if(mBaseWindow)
-	{
-		mBaseWindow->Destroy();
-        mBaseWindow = nsnull;
-	}
-
-	if(mpBrowserImpl)
-	{
-		mpBrowserImpl->Release();
-		mpBrowserImpl = nsnull;
-	}
-/*
-	nsWeakPtr weakling(
-    do_GetWeakReference(static_cast<nsIWebProgressListener*>(mpBrowserImpl)));
-	nsresult rv;
-    rv = mWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener));
-	if (NS_FAILED(rv))
-	{
-		QAOutput("Web Progress Listener not removed.");
-	}
-	else
-	{
-		QAOutput("Web Progress Listener removed.");
-	}
-*/
-	return NS_OK;
-}
-
-BOOL CBrowserView::PreCreateWindow(CREATESTRUCT& cs) 
-{
-	if (!CWnd::PreCreateWindow(cs))
-		return FALSE;
-
-	cs.dwExStyle |= WS_EX_CLIENTEDGE;
-	cs.style &= ~WS_BORDER;
-	cs.lpszClass = AfxRegisterWndClass(CS_DBLCLKS, 
-		::LoadCursor(NULL, IDC_ARROW), HBRUSH(COLOR_WINDOW+1), NULL);
-
-	return TRUE;
-}
-
-// Adjust the size of the embedded browser
-// in response to any container size changes
-//
-void CBrowserView::OnSize( UINT nType, int cx, int cy)
-{
-    mBaseWindow->SetPositionAndSize(0, 0, cx, cy, PR_TRUE);    
-}
-
-// Called by this object's creator i.e. the CBrowserFrame object
-// to pass its pointer to us
-//
-void CBrowserView::SetBrowserFrame(CBrowserFrame* pBrowserFrame)
-{
-	mpBrowserFrame = pBrowserFrame;
-}
-
-void CBrowserView::SetBrowserFrameGlue(PBROWSERFRAMEGLUE pBrowserFrameGlue)
-{
-	mpBrowserFrameGlue = pBrowserFrameGlue;
-}
-
-// A new URL was entered in the URL bar
-// Get the URL's text from the Urlbar's (ComboBox's) EditControl 
-// and navigate to that URL
-//
-void CBrowserView::OnNewUrlEnteredInUrlBar()
-{
-	// Get the currently entered URL
-	CString strUrl;
-	mpBrowserFrame->m_wndUrlBar.GetEnteredURL(strUrl);
-
-    if(IsViewSourceUrl(strUrl))
-        OpenViewSourceWindow(strUrl.GetBuffer(0));
-    else
-	    // Navigate to that URL
-	    OpenURL(strUrl.GetBuffer(0));	
-
-	// Add what was just entered into the UrlBar
-	mpBrowserFrame->m_wndUrlBar.AddURLToList(strUrl);
-}
-
-// A URL has  been selected from the UrlBar's dropdown list
-//
-void CBrowserView::OnUrlSelectedInUrlBar()
-{
-	CString strUrl;
-	
-	mpBrowserFrame->m_wndUrlBar.GetSelectedURL(strUrl);
-
-    if(IsViewSourceUrl(strUrl))
-        OpenViewSourceWindow(strUrl.GetBuffer(0));
-    else
-    	OpenURL(strUrl.GetBuffer(0));
-}
-
-BOOL CBrowserView::IsViewSourceUrl(CString& strUrl)
-{
-    return (strUrl.Find("view-source:", 0) != -1) ? TRUE : FALSE;
-}
-
-BOOL CBrowserView::OpenViewSourceWindow(const char* pUrl)
-{
-	// Create a new browser frame in which we'll show the document source
-	// Note that we're getting rid of the toolbars etc. by specifying
-	// the appropriate chromeFlags
-	PRUint32 chromeFlags =  nsIWebBrowserChrome::CHROME_WINDOW_BORDERS |
-							nsIWebBrowserChrome::CHROME_TITLEBAR |
-							nsIWebBrowserChrome::CHROME_WINDOW_RESIZE;
-	CBrowserFrame* pFrm = CreateNewBrowserFrame(chromeFlags);
-	if(!pFrm)
-		return FALSE;
-
-	// Finally, load this URI into the newly created frame
-	pFrm->m_wndBrowserView.OpenURL(pUrl);
-
-    pFrm->BringWindowToTop();
-
-    return TRUE;
-}
-
-void CBrowserView::OnViewSource() 
-{
-	if(! mWebNav)
-		return;
-
-	// Get the URI object whose source we want to view.
-    nsresult rv = NS_OK;
-	nsCOMPtr<nsIURI> currentURI;
-	rv = mWebNav->GetCurrentURI(getter_AddRefs(currentURI));
-	if(NS_FAILED(rv) || !currentURI)
-		return;
-
-	// Get the uri string associated with the nsIURI object
-	nsXPIDLCString uriString;
-	rv = currentURI->GetSpec(uriString);
-	if(NS_FAILED(rv))
-		return;
-
-    // Build the view-source: url
-    nsCAutoString viewSrcUrl;
-    viewSrcUrl.Append("view-source:");
-    viewSrcUrl.Append(uriString);
-
-    OpenViewSourceWindow(viewSrcUrl.get());
-}
-
-void CBrowserView::OnViewInfo() 
-{
-	AfxMessageBox("To Be Done...");
-}
-
-void CBrowserView::OnNavBack() 
-{
-	if(mWebNav)
-	{
-		mWebNav->GoBack();
-	}
-}
-
-void CBrowserView::OnUpdateNavBack(CCmdUI* pCmdUI)
-{
-	PRBool canGoBack = PR_FALSE;
-
-    if (mWebNav)
-        mWebNav->GetCanGoBack(&canGoBack);
-
-	pCmdUI->Enable(canGoBack);
-}
-
-void CBrowserView::OnNavForward() 
-{
-	if(mWebNav)
-	{
-		mWebNav->GoForward();
-	}
-}
-
-void CBrowserView::OnUpdateNavForward(CCmdUI* pCmdUI)
-{
-	PRBool canGoFwd = PR_FALSE;
-
-    if (mWebNav)
-        mWebNav->GetCanGoForward(&canGoFwd);
-
-	pCmdUI->Enable(canGoFwd);
-}
-
-void CBrowserView::OnNavHome() 
-{
-    // Get the currently configured HomePage URL
-    CString strHomeURL;
- 	CTestEmbedApp *pApp = (CTestEmbedApp *)AfxGetApp();
-	if(pApp)
-      pApp->GetHomePage(strHomeURL);
-
-    if(strHomeURL.GetLength() > 0)
-        OpenURL(strHomeURL);	
-}
-
-void CBrowserView::OnNavReload() 
-{
-	if(mWebNav)
-		mWebNav->Reload(nsIWebNavigation::LOAD_FLAGS_NONE);
-}
-
-void CBrowserView::OnNavStop() 
-{	
-	if(mWebNav)
-		mWebNav->Stop(nsIWebNavigation::STOP_ALL);
-}
-
-void CBrowserView::OnUpdateNavStop(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable(mbDocumentLoading);
-}
-
-void CBrowserView::OnCut()
-{
-    if(m_bUrlBarClipOp)
-    {
-        // We need to operate on the URLBar selection
-        mpBrowserFrame->CutUrlBarSelToClipboard();
-        m_bUrlBarClipOp = FALSE;
-    }
-    else
-    {
-	    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-
-	    if(clipCmds)
-		    clipCmds->CutSelection();
-    }
-}
-
-void CBrowserView::OnUpdateCut(CCmdUI* pCmdUI)
-{
-	PRBool canCutSelection = PR_FALSE;
-
-	nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-	if (clipCmds)
-        clipCmds->CanCutSelection(&canCutSelection);
-
-    if(!canCutSelection)
-    {
-        // Check to see if the Cut cmd is to cut the URL 
-        // selection in the UrlBar
-        if(mpBrowserFrame->CanCutUrlBarSelection())
-        {
-            canCutSelection = TRUE;
-            m_bUrlBarClipOp = TRUE;
-        }
-    }
-
-	pCmdUI->Enable(canCutSelection);
-}
-
-void CBrowserView::OnCopy()
-{
-    if(m_bUrlBarClipOp)
-    {
-        // We need to operate on the URLBar selection
-        mpBrowserFrame->CopyUrlBarSelToClipboard();
-        m_bUrlBarClipOp = FALSE;
-    }
-    else
-    {
-        // We need to operate on the web page content
-	    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-
-	    if(clipCmds)
-		    clipCmds->CopySelection();
-    }
-}
-
-void CBrowserView::OnUpdateCopy(CCmdUI* pCmdUI)
-{
-	PRBool canCopySelection = PR_FALSE;
-
-	nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-    if (clipCmds)
-        clipCmds->CanCopySelection(&canCopySelection);
-
-    if(!canCopySelection)
-    {
-        // Check to see if the Copy cmd is to copy the URL 
-        // selection in the UrlBar
-        if(mpBrowserFrame->CanCopyUrlBarSelection())
-        {
-            canCopySelection = TRUE;
-            m_bUrlBarClipOp = TRUE;
-        }
-    }
-
-	pCmdUI->Enable(canCopySelection);
-}
-
-void CBrowserView::OnPaste()
-{
-    if(m_bUrlBarClipOp)
-    {
-        mpBrowserFrame->PasteFromClipboardToUrlBar();
-        m_bUrlBarClipOp = FALSE;
-    }
-    else
-    {
-	    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-
-	    if(clipCmds)
-		    clipCmds->Paste();
-    }    
-}
-
-void CBrowserView::OnUndoUrlBarEditOp()
-{
-    if(mpBrowserFrame->CanUndoUrlBarEditOp())
-        mpBrowserFrame->UndoUrlBarEditOp();
-}
-
-void CBrowserView::OnUpdatePaste(CCmdUI* pCmdUI)
-{
-	PRBool canPaste = PR_FALSE;
-
-	nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-    if (clipCmds)
-        clipCmds->CanPaste(&canPaste);
-
-    if(!canPaste)
-    {
-        if(mpBrowserFrame->CanPasteToUrlBar())
-        {
-            canPaste = TRUE;
-            m_bUrlBarClipOp = TRUE;
-        }
-    }
-
-	pCmdUI->Enable(canPaste);
-}
-
-void CBrowserView::OnSelectAll()
-{
-	nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-
-	if(clipCmds)
-		clipCmds->SelectAll();
-}
-
-void CBrowserView::OnSelectNone()
-{
-	nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-
-	if(clipCmds)
-		clipCmds->SelectNone();
-}
-
-void CBrowserView::OnFileOpen()
-{
-	char *lpszFilter =
-        "HTML Files Only (*.htm;*.html)|*.htm;*.html|"
-        "All Files (*.*)|*.*||";
-
-	CFileDialog cf(TRUE, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
-					lpszFilter, this);
-	if(cf.DoModal() == IDOK)
-	{
-		CString strFullPath = cf.GetPathName(); // Will be like: c:\tmp\junk.htm
-		OpenURL(strFullPath);
-	}
-}
-
-void CBrowserView::GetBrowserWindowTitle(nsCString& title)
-{
-	nsXPIDLString idlStrTitle;
-	if(mBaseWindow)
-		mBaseWindow->GetTitle(getter_Copies(idlStrTitle));
-
-	title.AssignWithConversion(idlStrTitle);
-
-	// Sanitize the title of all illegal characters
-    title.CompressWhitespace();     // Remove whitespace from the ends
-    title.StripChars("\\*|:\"><?"); // Strip illegal characters
-    title.ReplaceChar('.', L'_');   // Dots become underscores
-    title.ReplaceChar('/', L'-');   // Forward slashes become hyphens
-}
-
-void CBrowserView::OnFileSaveAs()
-{
-	nsCString fileName;
-
-	GetBrowserWindowTitle(fileName); // Suggest the window title as the filename
-
-	char *lpszFilter =
-        "Web Page, HTML Only (*.htm;*.html)|*.htm;*.html|"
-        "Web Page, Complete (*.htm;*.html)|*.htm;*.html|" 
-        "Text File (*.txt)|*.txt||";
-
-	CFileDialog cf(FALSE, "htm", fileName.get(), OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
-					lpszFilter, this);
-
-	if(cf.DoModal() == IDOK)
-	{
-		CString strFullPath = cf.GetPathName(); // Will be like: c:\tmp\junk.htm
-		char *pStrFullPath = strFullPath.GetBuffer(0); // Get char * for later use
-		
-		CString strDataPath; 
-		char *pStrDataPath = NULL;
-		if(cf.m_ofn.nFilterIndex == 2) 
-		{
-			// cf.m_ofn.nFilterIndex == 2 indicates
-			// user want to save the complete document including
-			// all frames, images, scripts, stylesheets etc.
-
-			int idxPeriod = strFullPath.ReverseFind('.');
-			strDataPath = strFullPath.Mid(0, idxPeriod);
-			strDataPath += "_files";
-
-			// At this stage strDataPath will be of the form
-			// c:\tmp\junk_files - assuming we're saving to a file
-			// named junk.htm
-			// Any images etc in the doc will be saved to a dir
-			// with the name c:\tmp\junk_files
-
-			pStrDataPath = strDataPath.GetBuffer(0); //Get char * for later use
-		}
-
-        // Save the file
-        nsCOMPtr<nsIWebBrowserPersist> persist(do_QueryInterface(mWebBrowser));
-//		if(persist)
-//			persist->SaveDocument(nsnull, pStrFullPath, pStrDataPath);
-	}
-}
-
-void CBrowserView::OpenURL(const char* pUrl)
-{
-    OpenURL(NS_ConvertASCIItoUTF16(pUrl).get());
-}
-
-void CBrowserView::OpenURL(const PRUnichar* pUrl)
-{
-    if(mWebNav)
-        mWebNav->LoadURI(pUrl,                              // URI string
-                         nsIWebNavigation::LOAD_FLAGS_NONE, // Load flags
-                         nsnull,                            // Refering URI
-                         nsnull,                            // Post data
-                         nsnull);                           // Headers stream
-}
-
-CBrowserFrame* CBrowserView::CreateNewBrowserFrame(PRUint32 chromeMask, 
-									PRInt32 x, PRInt32 y, 
-									PRInt32 cx, PRInt32 cy,
-									PRBool bShowWindow)
-{
-	CTestEmbedApp *pApp = (CTestEmbedApp *)AfxGetApp();
-	if(!pApp)
-		return NULL;
-
-	return pApp->CreateNewBrowserFrame(chromeMask, x, y, cx, cy, bShowWindow);
-}
-
-void CBrowserView::OpenURLInNewWindow(const PRUnichar* pUrl)
-{
-	if(!pUrl)
-		return;
-
-	CBrowserFrame* pFrm = CreateNewBrowserFrame();
-	if(!pFrm)
-		return;
-
-	// Load the URL into it...
-
-	// Note that OpenURL() is overloaded - one takes a "char *"
-	// and the other a "PRUniChar *". We're using the "PRUnichar *"
-	// version here
-
-	pFrm->m_wndBrowserView.OpenURL(pUrl);
-}
-
-void CBrowserView::LoadHomePage()
-{
-	OnNavHome();
-}
-
-void CBrowserView::OnCopyLinkLocation()
-{
-	if(! mCtxMenuLinkUrl.Length())
-		return;
-
-	if (! OpenClipboard())
-		return;
-
-	HGLOBAL hClipData = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, mCtxMenuLinkUrl.Length() + 1);
-	if(! hClipData)
-		return;
-
-	char *pszClipData = (char*)::GlobalLock(hClipData);
-	if(!pszClipData)
-		return;
-
-	nsFixedCString clipDataStr(pszClipData, mCtxMenuLinkUrl.Length() + 1);
-	LossyCopyUTF16toASCII(mCtxMenuLinkUrl, clipDataStr);
-	NS_ASSERTION(clipDataStr.get() == pszClipData, "buffer too small");
-
-	GlobalUnlock(hClipData);
-
-	EmptyClipboard();
-	SetClipboardData(CF_TEXT, hClipData);
-	CloseClipboard();
-}
-
-void CBrowserView::OnOpenLinkInNewWindow()
-{
-	if(mCtxMenuLinkUrl.Length())
-		OpenURLInNewWindow(mCtxMenuLinkUrl.get());
-}
-
-void CBrowserView::OnViewImageInNewWindow()
-{
-	if(mCtxMenuImgSrc.Length())
-		OpenURLInNewWindow(mCtxMenuImgSrc.get());
-}
-
-void CBrowserView::OnSaveLinkAs()
-{
-	if(! mCtxMenuLinkUrl.Length())
-		return;
-
-	// Try to get the file name part from the URL
-	// To do that we first construct an obj which supports 
-	// nsIRUI interface. Makes it easy to extract portions
-	// of a URL like the filename, scheme etc. + We'll also
-	// use it while saving this link to a file
-	nsresult rv   = NS_OK;
-	nsCOMPtr<nsIURI> linkURI;
-	rv = NS_NewURI(getter_AddRefs(linkURI), mCtxMenuLinkUrl);
-	if (NS_FAILED(rv)) 
-		return;
-
-	// Get the "path" portion (see nsIURI.h for more info
-	// on various parts of a URI)
-	nsCAutoString fileName;
-	linkURI->GetPath(fileName);
-
-	// The path may have the "/" char in it - strip those
-	fileName.StripChars("\\/");
-
-	// Now, use this file name in a File Save As dlg...
-
-	char *lpszFilter =
-        "HTML Files (*.htm;*.html)|*.htm;*.html|"
-		"Text Files (*.txt)|*.txt|" 
-	    "All Files (*.*)|*.*||";
-
-	const char *pFileName = fileName.Length() ? fileName.get() : NULL;
-
-	CFileDialog cf(FALSE, "htm", pFileName, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
-		lpszFilter, this);
-	if(cf.DoModal() == IDOK)
-	{
-		CString strFullPath = cf.GetPathName();
-
-        nsCOMPtr<nsIWebBrowserPersist> persist(do_QueryInterface(mWebBrowser));
-//		if(persist)
-//			persist->SaveURI(linkURI, nsnull, strFullPath.GetBuffer(0));
-	}
-}
-
-void CBrowserView::OnSaveImageAs()
-{
-	if(! mCtxMenuImgSrc.Length())
-		return;
-
-	// Try to get the file name part from the URL
-	// To do that we first construct an obj which supports 
-	// nsIRUI interface. Makes it easy to extract portions
-	// of a URL like the filename, scheme etc. + We'll also
-	// use it while saving this link to a file
-	nsresult rv   = NS_OK;
-	nsCOMPtr<nsIURI> linkURI;
-	rv = NS_NewURI(getter_AddRefs(linkURI), mCtxMenuImgSrc);
-	if (NS_FAILED(rv)) 
-		return;
-
-	// Get the "path" portion (see nsIURI.h for more info
-	// on various parts of a URI)
-	nsCAutoString path;
-	linkURI->GetPath(path);
-
-	// The path may have the "/" char in it - strip those
-	nsCAutoString fileName(path);
-	fileName.StripChars("\\/");
-
-	// Now, use this file name in a File Save As dlg...
-
-	char *lpszFilter = "All Files (*.*)|*.*||";
-	const char *pFileName = fileName.Length() ? fileName.get() : NULL;
-
-	CFileDialog cf(FALSE, NULL, pFileName, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
-		lpszFilter, this);
-	if(cf.DoModal() == IDOK)
-	{
-		CString strFullPath = cf.GetPathName();
-
-        nsCOMPtr<nsIWebBrowserPersist> persist(do_QueryInterface(mWebBrowser));
-//		if(persist)
-//			persist->SaveURI(linkURI, nsnull, strFullPath.GetBuffer(0));
-	}
-}
-
-void CBrowserView::OnShowFindDlg() 
-{
-	// When the the user chooses the Find menu item
-	// and if a Find dlg. is already being shown
-	// just set focus to the existing dlg instead of
-	// creating a new one
-	if(m_pFindDlg)
-	{
-		m_pFindDlg->SetFocus();
-		return;
-	}
-
-	CString csSearchStr;
-	PRBool bMatchCase = PR_FALSE;
-	PRBool bMatchWholeWord = PR_FALSE;
-	PRBool bWrapAround = PR_FALSE;
-	PRBool bSearchBackwards = PR_FALSE;
-
-	// See if we can get and initialize the dlg box with
-	// the values/settings the user specified in the previous search
-	nsCOMPtr<nsIWebBrowserFind> finder(do_GetInterface(mWebBrowser));
-	if(finder)
-	{
-		nsXPIDLString stringBuf;
-		finder->GetSearchString(getter_Copies(stringBuf));
-		csSearchStr = stringBuf.get();
-
-		finder->GetMatchCase(&bMatchCase);
-		finder->GetEntireWord(&bMatchWholeWord);
-		finder->GetWrapFind(&bWrapAround);
-		finder->GetFindBackwards(&bSearchBackwards);		
-	}
-
-	m_pFindDlg = new CFindDialog(csSearchStr, bMatchCase, bMatchWholeWord,
-							bWrapAround, bSearchBackwards, this);
-	m_pFindDlg->Create(TRUE, NULL, NULL, 0, this);
-}
-
-// This will be called whenever the user pushes the Find
-// button in the Find dialog box
-// This method gets bound to the WM_FINDMSG windows msg via the 
-//
-//	   ON_REGISTERED_MESSAGE(WM_FINDMSG, OnFindMsg) 
-//
-//	message map entry.
-//
-// WM_FINDMSG (which is registered towards the beginning of this file)
-// is the message via which the FindDialog communicates with this view
-//
-LRESULT CBrowserView::OnFindMsg(WPARAM wParam, LPARAM lParam)
-{
-	nsCOMPtr<nsIWebBrowserFind> finder(do_GetInterface(mWebBrowser));
-	if(!finder)
-		return NULL;
-
-	// Get the pointer to the current Find dialog box
-	CFindDialog* dlg = (CFindDialog *) CFindReplaceDialog::GetNotifier(lParam);
-	if(!dlg) 
-		return NULL;
-
-	// Has the user decided to terminate the dialog box?
-	if(dlg->IsTerminating())
-		return NULL;
-
-	if(dlg->FindNext())
-	{
-		nsString searchString;
-		searchString.AssignWithConversion(dlg->GetFindString().GetBuffer(0));
-		finder->SetSearchString(searchString.get());
-	
-		finder->SetMatchCase(dlg->MatchCase() ? PR_TRUE : PR_FALSE);
-		finder->SetEntireWord(dlg->MatchWholeWord() ? PR_TRUE : PR_FALSE);
-		finder->SetWrapFind(dlg->WrapAround() ? PR_TRUE : PR_FALSE);
-		finder->SetFindBackwards(dlg->SearchBackwards() ? PR_TRUE : PR_FALSE);
-
-		PRBool didFind;
-		nsresult rv = finder->FindNext(&didFind);
-		
-		return (NS_SUCCEEDED(rv) && didFind);
-	}
-
-    return 0;
-}
-
-void CBrowserView::OnFilePrint()
-{
-  nsresult rv;
-  nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
-  if (NS_SUCCEEDED(rv)) 
-  {
-    prefs->SetBoolPref("print.show_print_progress", PR_FALSE);
-  }
-  else
-	NS_ASSERTION(PR_FALSE, "Could not get preferences service");
-
-  nsCOMPtr<nsIDOMWindow> domWindow;
-	mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
-  if(domWindow) {
-    nsCOMPtr<nsIWebBrowserPrint> print(do_GetInterface(mWebBrowser));
-	  if(print)
-	  {
-      CPrintProgressDialog  dlg(mWebBrowser, m_PrintSettings);
-
-	    nsCOMPtr<nsIURI> currentURI;
-	    nsresult rv = mWebNav->GetCurrentURI(getter_AddRefs(currentURI));
-      if(NS_SUCCEEDED(rv) || currentURI) 
-      {
-	    nsCAutoString path;
-	    currentURI->GetPath(path);
-        dlg.SetURI(path.get());
-      }
-      m_bCurrentlyPrinting = TRUE;
-      dlg.DoModal();
-      m_bCurrentlyPrinting = FALSE;
-    }
-  }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CBrowserView::OnUpdateFilePrint(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable(!m_bCurrentlyPrinting);
-}
-
-
-
-// Called from the busy state related methods in the 
-// BrowserFrameGlue object
-//
-// When aBusy is TRUE it means that browser is busy loading a URL
-// When aBusy is FALSE, it's done loading
-// We use this to update our STOP tool bar button
-//
-// We basically note this state into a member variable
-// The actual toolbar state will be updated in response to the
-// ON_UPDATE_COMMAND_UI method - OnUpdateNavStop() being called
-//
-void CBrowserView::UpdateBusyState(PRBool aBusy)
-{
-	mbDocumentLoading = aBusy;
-}
-
-void CBrowserView::SetCtxMenuLinkUrl(nsAutoString& strLinkUrl)
-{
-	mCtxMenuLinkUrl = strLinkUrl;
-}
-
-void CBrowserView::SetCtxMenuImageSrc(nsAutoString& strImgSrc)
-{
-	mCtxMenuImgSrc = strImgSrc;
-}
-
-void CBrowserView::Activate(UINT nState, CWnd* pWndOther, BOOL bMinimized) 
-{
-	nsCOMPtr<nsIWebBrowserFocus> focus(do_GetInterface(mWebBrowser));
-	if(!focus)
-		return;
-    
-    switch(nState) {
-        case WA_ACTIVE:
-        case WA_CLICKACTIVE:
-            focus->Activate();
-            break;
-        case WA_INACTIVE:
-            focus->Deactivate();
-            break;
-        default:
-            break;
-    }
-}
-
-BOOL CBrowserView::OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo) 
-{
-   // Since CTests has all the test menu handlers try and route it to it first
-   // We do not need to do this if all the menu handlers were in CBrowserView itself
-
-   if ((qaTests != NULL) && qaTests->OnCmdMsg(nID, nCode, pExtra, pHandlerInfo))
-      return TRUE;
-   //if ((nsiRequest != NULL) && nsiRequest->OnCmdMsg(nID, nCode, pExtra, pHandlerInfo))
-   //   return TRUE;
-
-   return CWnd::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo);
-}
-
diff --git a/embedding/qa/testembed/BrowserView.cpp.mod b/embedding/qa/testembed/BrowserView.cpp.mod
deleted file mode 100644
index a2579ecfe36..00000000000
--- a/embedding/qa/testembed/BrowserView.cpp.mod
+++ /dev/null
@@ -1,1625 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *   Chak Nanga <chak@netscape.com> 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// File Overview....
-//
-// When the CBrowserFrm creates this View:
-//   - CreateBrowser() is called in OnCreate() to create the
-//	   mozilla embeddable browser
-//
-// OnSize() method handles the window resizes and calls the approriate
-// interface method to resize the embedded browser properly
-//
-// Command handlers to handle browser navigation - OnNavBack(), 
-// OnNavForward() etc
-//
-// DestroyBrowser() called for cleaning up during object destruction
-//
-// Some important coding notes....
-//
-// 1. Make sure we do not have the CS_HREDRAW|CS_VREDRAW in the call
-//	  to AfxRegisterWndClass() inside of PreCreateWindow() below
-//	  If these flags are present then you'll see screen flicker when 
-//	  you resize the frame window
-//
-// Next suggested file to look at : BrowserImpl.cpp
-//
-
-#include "stdafx.h"
-#include "MfcEmbed.h"
-#include "BrowserView.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "Dialogs.h"
-#include "UrlDialog.h"
-#include "ProfileMgr.h"
-#include "ProfilesDlg.h"
-
-// Print Includes
-#include "PrintProgressDialog.h"
-
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-// Register message for FindDialog communication
-static UINT WM_FINDMSG = ::RegisterWindowMessage(FINDMSGSTRING);
-
-BEGIN_MESSAGE_MAP(CBrowserView, CWnd)
-	//{{AFX_MSG_MAP(CBrowserView)
-	ON_WM_CREATE()
-	ON_WM_DESTROY()
-	ON_WM_SIZE()
-	ON_CBN_SELENDOK(ID_URL_BAR, OnUrlSelectedInUrlBar)
-	ON_COMMAND(IDOK, OnNewUrlEnteredInUrlBar)
-	ON_COMMAND(ID_FILE_OPEN, OnFileOpen)
-	ON_COMMAND(ID_FILE_SAVE_AS, OnFileSaveAs)
-	ON_COMMAND(ID_VIEW_SOURCE, OnViewSource)
-	ON_COMMAND(ID_VIEW_INFO, OnViewInfo)
-	ON_COMMAND(ID_NAV_BACK, OnNavBack)
-	ON_COMMAND(ID_NAV_FORWARD, OnNavForward)
-	ON_COMMAND(ID_NAV_HOME, OnNavHome)
-	ON_COMMAND(ID_NAV_RELOAD, OnNavReload)
-	ON_COMMAND(ID_NAV_STOP, OnNavStop)
-	ON_COMMAND(ID_EDIT_CUT, OnCut)
-	ON_COMMAND(ID_EDIT_COPY, OnCopy)
-	ON_COMMAND(ID_EDIT_PASTE, OnPaste)
-    ON_COMMAND(ID_EDIT_UNDO, OnUndoUrlBarEditOp)
-	ON_COMMAND(ID_EDIT_SELECT_ALL, OnSelectAll)
-	ON_COMMAND(ID_EDIT_SELECT_NONE, OnSelectNone)
-	ON_COMMAND(ID_COPY_LINK_LOCATION, OnCopyLinkLocation)
-	ON_COMMAND(ID_OPEN_LINK_IN_NEW_WINDOW, OnOpenLinkInNewWindow)
-	ON_COMMAND(ID_VIEW_IMAGE, OnViewImageInNewWindow)
-	ON_COMMAND(ID_SAVE_LINK_AS, OnSaveLinkAs)
-	ON_COMMAND(ID_SAVE_IMAGE_AS, OnSaveImageAs)
-	ON_COMMAND(ID_EDIT_FIND, OnShowFindDlg)
-	ON_COMMAND(ID_FILE_PRINT, OnFilePrint)
-	ON_UPDATE_COMMAND_UI(ID_FILE_PRINT, OnUpdateFilePrint)
-	ON_REGISTERED_MESSAGE(WM_FINDMSG, OnFindMsg)
-	ON_COMMAND(ID_TESTS_CHANGEURL, OnTestsChangeUrl)
-	ON_COMMAND(ID_TESTS_GLOBALHISTORY, OnTestsGlobalHistory)
-	ON_COMMAND(ID_TOOLS_REMOVEGHPAGE, OnToolsRemoveGHPage)
-	ON_COMMAND(ID_TESTS_CREATEFILE, OnTestsCreateFile)
-	ON_UPDATE_COMMAND_UI(ID_NAV_BACK, OnUpdateNavBack)
-	ON_UPDATE_COMMAND_UI(ID_NAV_FORWARD, OnUpdateNavForward)
-	ON_UPDATE_COMMAND_UI(ID_NAV_STOP, OnUpdateNavStop)
-	ON_UPDATE_COMMAND_UI(ID_EDIT_CUT, OnUpdateCut)
-	ON_UPDATE_COMMAND_UI(ID_EDIT_COPY, OnUpdateCopy)
-	ON_UPDATE_COMMAND_UI(ID_EDIT_PASTE, OnUpdatePaste)
-	ON_COMMAND(ID_INTERFACES_NSIFILE, OnInterfacesNsifile)
-	ON_COMMAND(ID_TESTS_CREATEPROFILE, OnTestsCreateprofile)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY, OnInterfacesNsishistory)
-	ON_COMMAND(ID_VERIFYBUGS_70228, OnVerifybugs70228)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-CBrowserView::CBrowserView()
-{
-	mWebBrowser = nsnull;
-	mBaseWindow = nsnull;
-	mWebNav = nsnull;
-
-	mpBrowserImpl = nsnull;
-	mpBrowserFrame = nsnull;
-	mpBrowserFrameGlue = nsnull;
-
-	mbDocumentLoading = PR_FALSE;
-
-	m_pFindDlg = NULL;
-  m_pPrintProgressDlg = NULL;
-
-  m_bUrlBarClipOp = FALSE;
-  m_bCurrentlyPrinting = FALSE;
-
-  char *theUrl = "http://www.aol.com/";
-}
-
-CBrowserView::~CBrowserView()
-{
-}
-
-// This is a good place to create the embeddable browser
-// instance
-//
-int CBrowserView::OnCreate(LPCREATESTRUCT lpCreateStruct)
-{
-	CreateBrowser();
-
-	return 0;
-}
-
-void CBrowserView::OnDestroy()
-{
-	DestroyBrowser();
-}
-
-// Create an instance of the Mozilla embeddable browser
-//
-HRESULT CBrowserView::CreateBrowser() 
-{	   
-	// Create web shell
-	nsresult rv;
-	mWebBrowser = do_CreateInstance(NS_WEBBROWSER_CONTRACTID, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-
-	// Save off the nsIWebNavigation interface pointer 
-	// in the mWebNav member variable which we'll use 
-	// later for web page navigation
-	//
-	rv = NS_OK;
-	mWebNav = do_QueryInterface(mWebBrowser, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-
-//	mSessionHistory = do_GetInterface(mWebBrowser, &rv); // de: added 5/11
-
-	// Create the CBrowserImpl object - this is the object
-	// which implements the interfaces which are required
-	// by an app embedding mozilla i.e. these are the interfaces
-	// thru' which the *embedded* browser communicates with the
-	// *embedding* app
-	//
-	// The CBrowserImpl object will be passed in to the 
-	// SetContainerWindow() call below
-	//
-	// Also note that we're passing the BrowserFrameGlue pointer 
-	// and also the mWebBrowser interface pointer via CBrowserImpl::Init()
-	// of CBrowserImpl object. 
-	// These pointers will be saved by the CBrowserImpl object.
-	// The CBrowserImpl object uses the BrowserFrameGlue pointer to 
-	// call the methods on that interface to update the status/progress bars
-	// etc.
-	mpBrowserImpl = new CBrowserImpl();
-	if(mpBrowserImpl == nsnull)
-		return NS_ERROR_OUT_OF_MEMORY;
-
-	// Pass along the mpBrowserFrameGlue pointer to the BrowserImpl object
-	// This is the interface thru' which the XP BrowserImpl code communicates
-	// with the platform specific code to update status bars etc.
-	mpBrowserImpl->Init(mpBrowserFrameGlue, mWebBrowser);
-	mpBrowserImpl->AddRef();
-
-    mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(mpBrowserImpl));
-
-	rv = NS_OK;
-    nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(mWebBrowser, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-    dsti->SetItemType(nsIDocShellTreeItem::typeContentWrapper);
-
-    // Create the real webbrowser window
-  
-	// Note that we're passing the m_hWnd in the call below to InitWindow()
-	// (CBrowserView inherits the m_hWnd from CWnd)
-	// This m_hWnd will be used as the parent window by the embeddable browser
-	//
-	rv = NS_OK;
-	mBaseWindow = do_QueryInterface(mWebBrowser, &rv);
-	if(NS_FAILED(rv))
-		return rv;
-
-	// Get the view's ClientRect which to be passed in to the InitWindow()
-	// call below
-	RECT rcLocation;
-	GetClientRect(&rcLocation);
-	if(IsRectEmpty(&rcLocation))
-	{
-		rcLocation.bottom++;
-		rcLocation.top++;
-	}
-
-	rv = mBaseWindow->InitWindow(nsNativeWidget(m_hWnd), nsnull,
-		0, 0, rcLocation.right - rcLocation.left, rcLocation.bottom - rcLocation.top);
-	rv = mBaseWindow->Create();
-
-    // Register the BrowserImpl object to receive progress messages
-	// These callbacks will be used to update the status/progress bars
-    nsWeakPtr weakling(
-        do_GetWeakReference(static_cast<nsIWebProgressListener*>(mpBrowserImpl)));
-    rv = mWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener));
-	
-	if (NS_FAILED(rv))
-	{
-		AfxMessageBox("Web Progress Listener not added.");
-		WriteToOutputFile("Web Progress Listener not added.\r\n");
-	}
-	else
-	{
-		AfxMessageBox("Web Progress Listener added.");
-		WriteToOutputFile("Web Progress Listener added.\r\n");
-	}
-
-	// Finally, show the web browser window
-	mBaseWindow->SetVisibility(PR_TRUE);
-
-	return S_OK;
-}
-
-HRESULT CBrowserView::DestroyBrowser() 
-{	   
-	if(mBaseWindow)
-	{
-		mBaseWindow->Destroy();
-        mBaseWindow = nsnull;
-	}
-
-	if(mpBrowserImpl)
-	{
-		mpBrowserImpl->Release();
-		mpBrowserImpl = nsnull;
-	}
-
-	nsWeakPtr weakling(
-    do_GetWeakReference(static_cast<nsIWebProgressListener*>(mpBrowserImpl)));
-	nsresult rv;
-    rv = mWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener));
-	if (NS_FAILED(rv))
-	{
-		AfxMessageBox("Web Progress Listener not removed.");
-		WriteToOutputFile("Web Progress Listener not removed.\r\n");
-	}
-	else
-	{
-		AfxMessageBox("Web Progress Listener removed.");
-		WriteToOutputFile("Web Progress Listener removed.\r\n");
-	}
-
-	return NS_OK;
-}
-
-BOOL CBrowserView::PreCreateWindow(CREATESTRUCT& cs) 
-{
-	if (!CWnd::PreCreateWindow(cs))
-		return FALSE;
-
-	cs.dwExStyle |= WS_EX_CLIENTEDGE;
-	cs.style &= ~WS_BORDER;
-	cs.lpszClass = AfxRegisterWndClass(CS_DBLCLKS, 
-		::LoadCursor(NULL, IDC_ARROW), HBRUSH(COLOR_WINDOW+1), NULL);
-
-	return TRUE;
-}
-
-// Adjust the size of the embedded browser
-// in response to any container size changes
-//
-void CBrowserView::OnSize( UINT nType, int cx, int cy)
-{
-    mBaseWindow->SetPositionAndSize(0, 0, cx, cy, PR_TRUE);    
-}
-
-// Called by this object's creator i.e. the CBrowserFrame object
-// to pass its pointer to us
-//
-void CBrowserView::SetBrowserFrame(CBrowserFrame* pBrowserFrame)
-{
-	mpBrowserFrame = pBrowserFrame;
-}
-
-void CBrowserView::SetBrowserFrameGlue(PBROWSERFRAMEGLUE pBrowserFrameGlue)
-{
-	mpBrowserFrameGlue = pBrowserFrameGlue;
-}
-
-// A new URL was entered in the URL bar
-// Get the URL's text from the Urlbar's (ComboBox's) EditControl 
-// and navigate to that URL
-//
-void CBrowserView::OnNewUrlEnteredInUrlBar()
-{
-	// Get the currently entered URL
-	CString strUrl;
-	mpBrowserFrame->m_wndUrlBar.GetEnteredURL(strUrl);
-
-    if(IsViewSourceUrl(strUrl))
-        OpenViewSourceWindow(strUrl.GetBuffer(0));
-    else
-	    // Navigate to that URL
-	    OpenURL(strUrl.GetBuffer(0));	
-
-	// Add what was just entered into the UrlBar
-	mpBrowserFrame->m_wndUrlBar.AddURLToList(strUrl);
-}
-
-// A URL has  been selected from the UrlBar's dropdown list
-//
-void CBrowserView::OnUrlSelectedInUrlBar()
-{
-	CString strUrl;
-	
-	mpBrowserFrame->m_wndUrlBar.GetSelectedURL(strUrl);
-
-    if(IsViewSourceUrl(strUrl))
-        OpenViewSourceWindow(strUrl.GetBuffer(0));
-    else
-    	OpenURL(strUrl.GetBuffer(0));
-}
-
-BOOL CBrowserView::IsViewSourceUrl(CString& strUrl)
-{
-    return (strUrl.Find("view-source:", 0) != -1) ? TRUE : FALSE;
-}
-
-BOOL CBrowserView::OpenViewSourceWindow(const char* pUrl)
-{
-	// Create a new browser frame in which we'll show the document source
-	// Note that we're getting rid of the toolbars etc. by specifying
-	// the appropriate chromeFlags
-	PRUint32 chromeFlags =  nsIWebBrowserChrome::CHROME_WINDOW_BORDERS |
-							nsIWebBrowserChrome::CHROME_TITLEBAR |
-							nsIWebBrowserChrome::CHROME_WINDOW_RESIZE;
-	CBrowserFrame* pFrm = CreateNewBrowserFrame(chromeFlags);
-	if(!pFrm)
-		return FALSE;
-
-	// Finally, load this URI into the newly created frame
-	pFrm->m_wndBrowserView.OpenURL(pUrl);
-
-    pFrm->BringWindowToTop();
-
-    return TRUE;
-}
-
-void CBrowserView::OnViewSource() 
-{
-	if(! mWebNav)
-		return;
-
-	// Get the URI object whose source we want to view.
-    nsresult rv = NS_OK;
-	nsCOMPtr<nsIURI> currentURI;
-	rv = mWebNav->GetCurrentURI(getter_AddRefs(currentURI));
-	if(NS_FAILED(rv) || !currentURI)
-		return;
-
-	// Get the uri string associated with the nsIURI object
-	nsXPIDLCString uriString;
-	rv = currentURI->GetSpec(getter_Copies(uriString));
-	if(NS_FAILED(rv))
-		return;
-
-    // Build the view-source: url
-    nsCAutoString viewSrcUrl;
-    viewSrcUrl.Append("view-source:");
-    viewSrcUrl.Append(uriString);
-
-    OpenViewSourceWindow(viewSrcUrl.get());
-}
-
-void CBrowserView::OnViewInfo() 
-{
-	AfxMessageBox("To Be Done...");
-}
-
-void CBrowserView::OnNavBack() 
-{
-	if(mWebNav)
-		mWebNav->GoBack();
-}
-
-void CBrowserView::OnUpdateNavBack(CCmdUI* pCmdUI)
-{
-	PRBool canGoBack = PR_FALSE;
-
-    if (mWebNav)
-        mWebNav->GetCanGoBack(&canGoBack);
-
-	pCmdUI->Enable(canGoBack);
-}
-
-void CBrowserView::OnNavForward() 
-{
-	if(mWebNav)
-		mWebNav->GoForward();
-}
-
-void CBrowserView::OnUpdateNavForward(CCmdUI* pCmdUI)
-{
-	PRBool canGoFwd = PR_FALSE;
-
-    if (mWebNav)
-        mWebNav->GetCanGoForward(&canGoFwd);
-
-	pCmdUI->Enable(canGoFwd);
-}
-
-void CBrowserView::OnNavHome() 
-{
-    // Get the currently configured HomePage URL
-    CString strHomeURL;
- 	CMfcEmbedApp *pApp = (CMfcEmbedApp *)AfxGetApp();
-	if(pApp)
-      pApp->GetHomePage(strHomeURL);
-
-    if(strHomeURL.GetLength() > 0)
-        OpenURL(strHomeURL);	
-}
-
-void CBrowserView::OnNavReload() 
-{
-	if(mWebNav)
-		mWebNav->Reload(nsIWebNavigation::LOAD_FLAGS_NONE);
-}
-
-void CBrowserView::OnNavStop() 
-{	
-	if(mWebNav)
-		mWebNav->Stop();
-}
-
-void CBrowserView::OnUpdateNavStop(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable(mbDocumentLoading);
-}
-
-void CBrowserView::OnCut()
-{
-    if(m_bUrlBarClipOp)
-    {
-        // We need to operate on the URLBar selection
-        mpBrowserFrame->CutUrlBarSelToClipboard();
-        m_bUrlBarClipOp = FALSE;
-    }
-    else
-    {
-	    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-
-	    if(clipCmds)
-		    clipCmds->CutSelection();
-    }
-}
-
-void CBrowserView::OnUpdateCut(CCmdUI* pCmdUI)
-{
-	PRBool canCutSelection = PR_FALSE;
-
-	nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-	if (clipCmds)
-        clipCmds->CanCutSelection(&canCutSelection);
-
-    if(!canCutSelection)
-    {
-        // Check to see if the Cut cmd is to cut the URL 
-        // selection in the UrlBar
-        if(mpBrowserFrame->CanCutUrlBarSelection())
-        {
-            canCutSelection = TRUE;
-            m_bUrlBarClipOp = TRUE;
-        }
-    }
-
-	pCmdUI->Enable(canCutSelection);
-}
-
-void CBrowserView::OnCopy()
-{
-    if(m_bUrlBarClipOp)
-    {
-        // We need to operate on the URLBar selection
-        mpBrowserFrame->CopyUrlBarSelToClipboard();
-        m_bUrlBarClipOp = FALSE;
-    }
-    else
-    {
-        // We need to operate on the web page content
-	    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-
-	    if(clipCmds)
-		    clipCmds->CopySelection();
-    }
-}
-
-void CBrowserView::OnUpdateCopy(CCmdUI* pCmdUI)
-{
-	PRBool canCopySelection = PR_FALSE;
-
-	nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-    if (clipCmds)
-        clipCmds->CanCopySelection(&canCopySelection);
-
-    if(!canCopySelection)
-    {
-        // Check to see if the Copy cmd is to copy the URL 
-        // selection in the UrlBar
-        if(mpBrowserFrame->CanCopyUrlBarSelection())
-        {
-            canCopySelection = TRUE;
-            m_bUrlBarClipOp = TRUE;
-        }
-    }
-
-	pCmdUI->Enable(canCopySelection);
-}
-
-void CBrowserView::OnPaste()
-{
-    if(m_bUrlBarClipOp)
-    {
-        mpBrowserFrame->PasteFromClipboardToUrlBar();
-        m_bUrlBarClipOp = FALSE;
-    }
-    else
-    {
-	    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-
-	    if(clipCmds)
-		    clipCmds->Paste();
-    }    
-}
-
-void CBrowserView::OnUndoUrlBarEditOp()
-{
-    if(mpBrowserFrame->CanUndoUrlBarEditOp())
-        mpBrowserFrame->UndoUrlBarEditOp();
-}
-
-void CBrowserView::OnUpdatePaste(CCmdUI* pCmdUI)
-{
-	PRBool canPaste = PR_FALSE;
-
-	nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-    if (clipCmds)
-        clipCmds->CanPaste(&canPaste);
-
-    if(!canPaste)
-    {
-        if(mpBrowserFrame->CanPasteToUrlBar())
-        {
-            canPaste = TRUE;
-            m_bUrlBarClipOp = TRUE;
-        }
-    }
-
-	pCmdUI->Enable(canPaste);
-}
-
-void CBrowserView::OnSelectAll()
-{
-	nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-
-	if(clipCmds)
-		clipCmds->SelectAll();
-}
-
-void CBrowserView::OnSelectNone()
-{
-	nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(mWebBrowser);
-
-	if(clipCmds)
-		clipCmds->SelectNone();
-}
-
-void CBrowserView::OnFileOpen()
-{
-	char *lpszFilter =
-        "HTML Files Only (*.htm;*.html)|*.htm;*.html|"
-        "All Files (*.*)|*.*||";
-
-	CFileDialog cf(TRUE, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
-					lpszFilter, this);
-	if(cf.DoModal() == IDOK)
-	{
-		CString strFullPath = cf.GetPathName(); // Will be like: c:\tmp\junk.htm
-		OpenURL(strFullPath);
-	}
-}
-
-void CBrowserView::GetBrowserWindowTitle(nsCString& title)
-{
-	nsXPIDLString idlStrTitle;
-	if(mBaseWindow)
-		mBaseWindow->GetTitle(getter_Copies(idlStrTitle));
-
-	title.AssignWithConversion(idlStrTitle);
-
-	// Sanitize the title of all illegal characters
-    title.CompressWhitespace();     // Remove whitespace from the ends
-    title.StripChars("\\*|:\"><?"); // Strip illegal characters
-    title.ReplaceChar('.', L'_');   // Dots become underscores
-    title.ReplaceChar('/', L'-');   // Forward slashes become hyphens
-}
-
-void CBrowserView::OnFileSaveAs()
-{
-	nsCString fileName;
-
-	GetBrowserWindowTitle(fileName); // Suggest the window title as the filename
-
-	char *lpszFilter =
-        "Web Page, HTML Only (*.htm;*.html)|*.htm;*.html|"
-        "Web Page, Complete (*.htm;*.html)|*.htm;*.html|" 
-        "Text File (*.txt)|*.txt||";
-
-	CFileDialog cf(FALSE, "htm", (const char *)fileName, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
-					lpszFilter, this);
-
-	if(cf.DoModal() == IDOK)
-	{
-		CString strFullPath = cf.GetPathName(); // Will be like: c:\tmp\junk.htm
-		char *pStrFullPath = strFullPath.GetBuffer(0); // Get char * for later use
-		
-		CString strDataPath; 
-		char *pStrDataPath = NULL;
-		if(cf.m_ofn.nFilterIndex == 2) 
-		{
-			// cf.m_ofn.nFilterIndex == 2 indicates
-			// user want to save the complete document including
-			// all frames, images, scripts, stylesheets etc.
-
-			int idxPeriod = strFullPath.ReverseFind('.');
-			strDataPath = strFullPath.Mid(0, idxPeriod);
-			strDataPath += "_files";
-
-			// At this stage strDataPath will be of the form
-			// c:\tmp\junk_files - assuming we're saving to a file
-			// named junk.htm
-			// Any images etc in the doc will be saved to a dir
-			// with the name c:\tmp\junk_files
-
-			pStrDataPath = strDataPath.GetBuffer(0); //Get char * for later use
-		}
-
-        // Save the file
-        nsCOMPtr<nsIWebBrowserPersist> persist(do_QueryInterface(mWebBrowser));
-		if(persist)
-			persist->SaveDocument(nsnull, pStrFullPath, pStrDataPath);
-	}
-}
-
-void CBrowserView::OpenURL(const char* pUrl)
-{
-    if(mWebNav)
-        mWebNav->LoadURI(NS_ConvertASCIItoUTF16(pUrl).get(), nsIWebNavigation::LOAD_FLAGS_NONE);
-}
-
-void CBrowserView::OpenURL(const PRUnichar* pUrl)
-{
-    if(mWebNav)
-        mWebNav->LoadURI(pUrl, nsIWebNavigation::LOAD_FLAGS_NONE);
-}
-
-CBrowserFrame* CBrowserView::CreateNewBrowserFrame(PRUint32 chromeMask, 
-									PRInt32 x, PRInt32 y, 
-									PRInt32 cx, PRInt32 cy,
-									PRBool bShowWindow)
-{
-	CMfcEmbedApp *pApp = (CMfcEmbedApp *)AfxGetApp();
-	if(!pApp)
-		return NULL;
-
-	return pApp->CreateNewBrowserFrame(chromeMask, x, y, cx, cy, bShowWindow);
-}
-
-void CBrowserView::OpenURLInNewWindow(const PRUnichar* pUrl)
-{
-	if(!pUrl)
-		return;
-
-	CBrowserFrame* pFrm = CreateNewBrowserFrame();
-	if(!pFrm)
-		return;
-
-	// Load the URL into it...
-
-	// Note that OpenURL() is overloaded - one takes a "char *"
-	// and the other a "PRUniChar *". We're using the "PRUnichar *"
-	// version here
-
-	pFrm->m_wndBrowserView.OpenURL(pUrl);
-}
-
-void CBrowserView::LoadHomePage()
-{
-	OnNavHome();
-}
-
-void CBrowserView::OnCopyLinkLocation()
-{
-	if(! mCtxMenuLinkUrl.Length())
-		return;
-
-	if (! OpenClipboard())
-		return;
-
-	HGLOBAL hClipData = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, mCtxMenuLinkUrl.Length() + 1);
-	if(! hClipData)
-		return;
-
-	char *pszClipData = (char*)::GlobalLock(hClipData);
-	if(!pszClipData)
-		return;
-
-	nsFixedCString clipDataStr(pszClipData, mCtxMenuLinkUrl.Length() + 1);
-	LossyCopyUTF16toASCII(mCtxMenuLinkUrl, clipDataStr);
-	NS_ASSERTION(clipDataStr.get() == pszClipData, "buffer too small");
-
-	GlobalUnlock(hClipData);
-
-	EmptyClipboard();
-	SetClipboardData(CF_TEXT, hClipData);
-	CloseClipboard();
-}
-
-void CBrowserView::OnOpenLinkInNewWindow()
-{
-	if(mCtxMenuLinkUrl.Length())
-		OpenURLInNewWindow(mCtxMenuLinkUrl.get());
-}
-
-void CBrowserView::OnViewImageInNewWindow()
-{
-	if(mCtxMenuImgSrc.Length())
-		OpenURLInNewWindow(mCtxMenuImgSrc.get());
-}
-
-void CBrowserView::OnSaveLinkAs()
-{
-	if(! mCtxMenuLinkUrl.Length())
-		return;
-
-	// Try to get the file name part from the URL
-	// To do that we first construct an obj which supports 
-	// nsIRUI interface. Makes it easy to extract portions
-	// of a URL like the filename, scheme etc. + We'll also
-	// use it while saving this link to a file
-	nsresult rv   = NS_OK;
-	nsCOMPtr<nsIURI> linkURI;
-	rv = NS_NewURI(getter_AddRefs(linkURI), mCtxMenuLinkUrl);
-	if (NS_FAILED(rv)) 
-		return;
-
-	// Get the "path" portion (see nsIURI.h for more info
-	// on various parts of a URI)
-	nsXPIDLCString path;
-	linkURI->GetPath(getter_Copies(path));
-
-	// The path may have the "/" char in it - strip those
-	nsCAutoString fileName(path);
-	fileName.StripChars("\\/");
-
-	// Now, use this file name in a File Save As dlg...
-
-	char *lpszFilter =
-        "HTML Files (*.htm;*.html)|*.htm;*.html|"
-		"Text Files (*.txt)|*.txt|" 
-	    "All Files (*.*)|*.*||";
-
-	const char *pFileName = fileName.Length() ? fileName.get() : NULL;
-
-	CFileDialog cf(FALSE, "htm", pFileName, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
-		lpszFilter, this);
-	if(cf.DoModal() == IDOK)
-	{
-		CString strFullPath = cf.GetPathName();
-
-        nsCOMPtr<nsIWebBrowserPersist> persist(do_QueryInterface(mWebBrowser));
-		if(persist)
-			persist->SaveURI(linkURI, nsnull, strFullPath.GetBuffer(0));
-	}
-}
-
-void CBrowserView::OnSaveImageAs()
-{
-	if(! mCtxMenuImgSrc.Length())
-		return;
-
-	// Try to get the file name part from the URL
-	// To do that we first construct an obj which supports 
-	// nsIRUI interface. Makes it easy to extract portions
-	// of a URL like the filename, scheme etc. + We'll also
-	// use it while saving this link to a file
-	nsresult rv   = NS_OK;
-	nsCOMPtr<nsIURI> linkURI;
-	rv = NS_NewURI(getter_AddRefs(linkURI), mCtxMenuImgSrc);
-	if (NS_FAILED(rv)) 
-		return;
-
-	// Get the "path" portion (see nsIURI.h for more info
-	// on various parts of a URI)
-	nsXPIDLCString path;
-	linkURI->GetPath(getter_Copies(path));
-
-	// The path may have the "/" char in it - strip those
-	nsCAutoString fileName(path);
-	fileName.StripChars("\\/");
-
-	// Now, use this file name in a File Save As dlg...
-
-	char *lpszFilter = "All Files (*.*)|*.*||";
-	const char *pFileName = fileName.Length() ? fileName.get() : NULL;
-
-	CFileDialog cf(FALSE, NULL, pFileName, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
-		lpszFilter, this);
-	if(cf.DoModal() == IDOK)
-	{
-		CString strFullPath = cf.GetPathName();
-
-        nsCOMPtr<nsIWebBrowserPersist> persist(do_QueryInterface(mWebBrowser));
-		if(persist)
-			persist->SaveURI(linkURI, nsnull, strFullPath.GetBuffer(0));
-	}
-}
-
-void CBrowserView::OnShowFindDlg() 
-{
-	// When the the user chooses the Find menu item
-	// and if a Find dlg. is already being shown
-	// just set focus to the existing dlg instead of
-	// creating a new one
-	if(m_pFindDlg)
-	{
-		m_pFindDlg->SetFocus();
-		return;
-	}
-
-	CString csSearchStr;
-	PRBool bMatchCase = PR_FALSE;
-	PRBool bMatchWholeWord = PR_FALSE;
-	PRBool bWrapAround = PR_FALSE;
-	PRBool bSearchBackwards = PR_FALSE;
-
-	// See if we can get and initialize the dlg box with
-	// the values/settings the user specified in the previous search
-	nsCOMPtr<nsIWebBrowserFind> finder(do_GetInterface(mWebBrowser));
-	if(finder)
-	{
-		nsXPIDLString stringBuf;
-		finder->GetSearchString(getter_Copies(stringBuf));
-		csSearchStr = stringBuf.get();
-
-		finder->GetMatchCase(&bMatchCase);
-		finder->GetEntireWord(&bMatchWholeWord);
-		finder->GetWrapFind(&bWrapAround);
-		finder->GetFindBackwards(&bSearchBackwards);		
-	}
-
-	m_pFindDlg = new CFindDialog(csSearchStr, bMatchCase, bMatchWholeWord,
-							bWrapAround, bSearchBackwards, this);
-	m_pFindDlg->Create(TRUE, NULL, NULL, 0, this);
-}
-
-// This will be called whenever the user pushes the Find
-// button in the Find dialog box
-// This method gets bound to the WM_FINDMSG windows msg via the 
-//
-//	   ON_REGISTERED_MESSAGE(WM_FINDMSG, OnFindMsg) 
-//
-//	message map entry.
-//
-// WM_FINDMSG (which is registered towards the beginning of this file)
-// is the message via which the FindDialog communicates with this view
-//
-LRESULT CBrowserView::OnFindMsg(WPARAM wParam, LPARAM lParam)
-{
-	nsCOMPtr<nsIWebBrowserFind> finder(do_GetInterface(mWebBrowser));
-	if(!finder)
-		return NULL;
-
-	// Get the pointer to the current Find dialog box
-	CFindDialog* dlg = (CFindDialog *) CFindReplaceDialog::GetNotifier(lParam);
-	if(!dlg) 
-		return NULL;
-
-	// Has the user decided to terminate the dialog box?
-	if(dlg->IsTerminating())
-		return NULL;
-
-	if(dlg->FindNext())
-	{
-		nsString searchString;
-		searchString.AssignWithConversion(dlg->GetFindString().GetBuffer(0));
-		finder->SetSearchString(searchString.get());
-	
-		finder->SetMatchCase(dlg->MatchCase() ? PR_TRUE : PR_FALSE);
-		finder->SetEntireWord(dlg->MatchWholeWord() ? PR_TRUE : PR_FALSE);
-		finder->SetWrapFind(dlg->WrapAround() ? PR_TRUE : PR_FALSE);
-		finder->SetFindBackwards(dlg->SearchBackwards() ? PR_TRUE : PR_FALSE);
-
-		PRBool didFind;
-		nsresult rv = finder->FindNext(&didFind);
-		
-		return (NS_SUCCEEDED(rv) && didFind);
-	}
-
-    return 0;
-}
-
-void CBrowserView::OnFilePrint()
-{
-  nsCOMPtr<nsIDOMWindow> domWindow;
-	mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
-  if(domWindow) {
-	  nsCOMPtr<nsIWebBrowserPrint> print(do_GetInterface(mWebBrowser));
-	  if(print)
-	  {
-      CPrintProgressDialog  dlg(mWebBrowser, domWindow);
-
-	    nsCOMPtr<nsIURI> currentURI;
-	    nsresult rv = mWebNav->GetCurrentURI(getter_AddRefs(currentURI));
-      if(NS_SUCCEEDED(rv) || currentURI) 
-      {
-	      nsXPIDLCString path;
-	      currentURI->GetPath(getter_Copies(path));
-        dlg.SetURI(path.get());
-      }
-      m_bCurrentlyPrinting = TRUE;
-      dlg.DoModal();
-      m_bCurrentlyPrinting = FALSE;
-    }
-  }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CBrowserView::OnUpdateFilePrint(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable(!m_bCurrentlyPrinting);
-}
-
-
-
-// Called from the busy state related methods in the 
-// BrowserFrameGlue object
-//
-// When aBusy is TRUE it means that browser is busy loading a URL
-// When aBusy is FALSE, it's done loading
-// We use this to update our STOP tool bar button
-//
-// We basically note this state into a member variable
-// The actual toolbar state will be updated in response to the
-// ON_UPDATE_COMMAND_UI method - OnUpdateNavStop() being called
-//
-void CBrowserView::UpdateBusyState(PRBool aBusy)
-{
-	mbDocumentLoading = aBusy;
-}
-
-void CBrowserView::SetCtxMenuLinkUrl(nsAutoString& strLinkUrl)
-{
-	mCtxMenuLinkUrl = strLinkUrl;
-}
-
-void CBrowserView::SetCtxMenuImageSrc(nsAutoString& strImgSrc)
-{
-	mCtxMenuImgSrc = strImgSrc;
-}
-
-void CBrowserView::Activate(UINT nState, CWnd* pWndOther, BOOL bMinimized) 
-{
-	nsCOMPtr<nsIWebBrowserFocus> focus(do_GetInterface(mWebBrowser));
-	if(!focus)
-		return;
-    
-    switch(nState) {
-        case WA_ACTIVE:
-        case WA_CLICKACTIVE:
-            focus->Activate();
-            break;
-        case WA_INACTIVE:
-            focus->Deactivate();
-            break;
-        default:
-            break;
-    }
-}
-
-// de: Start QA test cases here
-// *********************************************************
-// *********************************************************
-
-void CBrowserView::OnTestsChangeUrl() 
-{
-	char *theUrl = "http://www.aol.com/";
-	CUrlDialog myDialog;
-	nsresult rv;
-
-//	nsCOMPtr<nsIURI> pURI;
-
-	if (!mWebNav)
-	{
-		AfxMessageBox("Web navigation object not found. Change URL test not performed.");
-		WriteToOutputFile("Web navigation object not found. Change URL test not performed.\r\n");
-		return;
-	}
-
-	if (myDialog.DoModal() == IDOK)
-	{
-		AfxMessageBox("Begin Change URL test.");
-		WriteToOutputFile("Begin Change URL test.\r\n");
-		strcpy(theUrl, myDialog.m_urlfield);
-		mWebNav->LoadURI(NS_ConvertASCIItoUTF16(theUrl).get(), 
-						nsIWebNavigation::LOAD_FLAGS_NONE);
-		WriteToOutputFile("\r\nLoadURI() method is called.");
-		WriteToOutputFile("theUrl = ");
-		WriteToOutputFile(theUrl);
-
-/*
-		char *uriSpec;
-		// GetcurrentURI() declared in nsIP3PUI.idl
-		// used with webNav obj in nsP3PObserverHTML.cpp, line 239
-		// this will be used as an indep routine to verify the URI load
-		rv = mWebNav->GetCurrentURI( getter_AddRefs( pURI ) );
-		if(NS_FAILED(rv) || !pURI)
-			AfxMessageBox("Bad result for GetCurrentURI().");
-
-		rv = pURI->GetSpec(&uriSpec);;
-		if (NS_FAILED(rv))
-			AfxMessageBox("Bad result for GetSpec().");
-
-		AfxMessageBox("Start URL validation test().");
-		if (strcmp(uriSpec, theUrl) == 0)
-		{
-			WriteToOutputFile("Url loaded successfully. Test Passed.");	
-		}
-		else
-		{
-			WriteToOutputFile("Url didn't load successfully. Test Failed.");
-		}
-*/
-		AfxMessageBox("End Change URL test.");
-		WriteToOutputFile("End Change URL test.\r\n");
-	}
-	else
-	{
-		AfxMessageBox("Change URL test not executed.");
-		WriteToOutputFile("Change URL test not executed.\r\n");
-	}
-}
-
-// *********************************************************
-
-void CBrowserView::OnTestsGlobalHistory() 
-{
-	// create instance of myHistory object. Call's XPCOM
-	// service manager to pass the contract ID.
-
-	char *theUrl = "http://www.bogussite.com/";
-	CUrlDialog myDialog;
-
-	PRBool theRetVal = PR_FALSE;
-	nsresult rv;
-
-	nsCOMPtr<nsIGlobalHistory> myHistory(do_GetService(NS_GLOBALHISTORY_CONTRACTID));
-
-	if (!myHistory)
-	{
-		WriteToOutputFile("Couldn't find history object. No GH tests performed.\r\n");
-		AfxMessageBox("Couldn't find history object. No GH tests performed.");
-		return;
-	}
-
-	if (myDialog.DoModal() == IDOK)
-	{
-		AfxMessageBox("Begin IsVisited() and AddPage() tests.");
-		WriteToOutputFile("Begin IsVisited() and AddPage() tests.\r\n");
-
-		strcpy(theUrl, myDialog.m_urlfield);
-
-		WriteToOutputFile("theUrl = ");
-		WriteToOutputFile(theUrl);
-
-		// see if url is already in the GH file (pre-AddPage() test)
-		myHistory->IsVisited(theUrl, &theRetVal);
-
-		if (theRetVal)
-		{
-			WriteToOutputFile("URL has been visited. Won't execute AddPage().\r\n");
-			AfxMessageBox("URL has been visited. Won't execute AddPage().");
-		}
-		else
-		{
-			WriteToOutputFile("URL hasn't been visited. Will execute AddPage().\r\n");
-			AfxMessageBox("URL hasn't been visited. Will execute AddPage().");
-			// adds a url to the global history file
-			rv = myHistory->AddPage(theUrl);
-
-			// prints addPage() results to output file
-			if (NS_FAILED(rv))
-			{
-				WriteToOutputFile("Invalid results for AddPage(). Url not added. Test failed.\r\n");
-				return;
-			}
-			else
-			{
-				WriteToOutputFile("Valid results for AddPage(). Url added. Test passed.\r\n");
-			}
-
-			// checks if url was visited (post-AddPage() test)
- 			myHistory->IsVisited(theUrl, &theRetVal);
-
-			if (theRetVal)
-			{
-				WriteToOutputFile("URL is visited; post-AddPage() test. IsVisited() test passed.\r\n");
-			}
-			else
-			{
-				WriteToOutputFile("URL isn't visited; post-AddPage() test. IsVisited() test failed.\r\n");
-			}
-		}
-		AfxMessageBox("End IsVisited() and AddPage() tests.");
-		WriteToOutputFile("End IsVisited() and AddPage() tests.\r\n");
-	}
-	else
-	{
-		AfxMessageBox("IsVisited() and AddPage() tests not executed.");
-		WriteToOutputFile("IsVisited() and AddPage() tests not executed.\r\n");
-	}
-}
-
-
-
-// *********************************************************
-
-void CBrowserView::OnTestsCreateFile() 
-{
-   nsresult rv;
-   PRBool exists;
-   nsCOMPtr<nsILocalFile> theTestFile(do_GetService(NS_LOCAL_FILE_CONTRACTID));
-
-    if (!theTestFile)
-	{
-		WriteToOutputFile("File object doesn't exist. No File tests performed.\r\n");
-		AfxMessageBox("File object doesn't exist. No File tests performed.");
-		return;
-	}
-
-
-	AfxMessageBox("Start Create File test.");
-	WriteToOutputFile("\r\nStart Create File test.\r\n");
-
-	rv = theTestFile->InitWithPath("c:\\temp\\theFile.txt");
-	rv = theTestFile->Exists(&exists);
-
-	WriteToOutputFile("File doesn't exist. We'll create it.\r\n");
-	rv = theTestFile->Create(nsIFile::NORMAL_FILE_TYPE, 0777);
-	if (NS_FAILED(rv))
-	{
-		AfxMessageBox("We failed to create the file (theFile.txt).");
-		WriteToOutputFile("Create() test Failed.\r\n");
-	}
-	else
-	{
-		AfxMessageBox("We created the file (theFile.txt).");
-		WriteToOutputFile("Create() test Passed.\r\n");
-	}
-}
-
-// *********************************************************
-
-void CBrowserView::OnTestsCreateprofile() 
-{
-    CProfilesDlg    myDialog;
-    nsresult        rv;
-
-	if (myDialog.DoModal() == IDOK)
-    {       
-//      NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
-		nsCOMPtr<nsIProfile> theProfServ(do_GetService(NS_PROFILE_CONTRACTID));
-		if (!theProfServ)
-		{
-		   WriteToOutputFile("Didn't get profile service. No profile tests performed.\r\n");
-		   AfxMessageBox("Didn't get profile service. No profile tests performed.");
-		   return;
-		}
-
-        if (theProfServ)
-		{
-		   AfxMessageBox("Start Profile switch test.");
-		   WriteToOutputFile("Start Profile switch test.\r\n");
-
-		   AfxMessageBox("Retrieved profile service.");
-           rv = theProfServ->SetCurrentProfile(myDialog.m_SelectedProfile.get());
-		   if (NS_SUCCEEDED(rv))
-		      AfxMessageBox("SetCurrentProfile() passed. Profile switched.");
-		   else
-			  AfxMessageBox("SetCurrentProfile() didn't pass.Profile not switched.");
-
-		   AfxMessageBox("End Profile switch test.");
-		   WriteToOutputFile("End Profile switch test.\r\n");
-		}
-    }
-	else
-	{
-	   AfxMessageBox("Profile switch test not executed.");
-	   WriteToOutputFile("Profile switch test not executed.\r\n");
-	}	
-}
-
-// *********************************************************
-// *********************************************************
-//					TOOLS to help us
-
-
-void CBrowserView::OnToolsRemoveGHPage() 
-{
-	char *theUrl = "http://www.bogussite.com/";
-	CUrlDialog myDialog;
-	PRBool theRetVal = PR_FALSE;
-	nsresult rv;
-	nsCOMPtr<nsIGlobalHistory> myGHistory(do_GetService(NS_GLOBALHISTORY_CONTRACTID));
-	if (!myGHistory)
-	{
-		WriteToOutputFile("Could not get the global history object.\r\n");
-		AfxMessageBox("Could not get the global history object.");
-		return;
-	}
-	nsCOMPtr<nsIBrowserHistory> myHistory = do_QueryInterface(myGHistory, &rv);
-	if(NS_FAILED(rv)) {
-		WriteToOutputFile("Could not get the history object.\r\n");
-		AfxMessageBox("Could not get the global history object.");
-		return;
-	}
-//	nsCOMPtr<nsIBrowserHistory> myHistory(do_GetInterface(myGHistory));
-
-
-	if (myDialog.DoModal() == IDOK)
-	{
-		WriteToOutputFile("Begin URL removal from the GH file.\r\n");
-		AfxMessageBox("Begin URL removal from the GH file.");
-		strcpy(theUrl, myDialog.m_urlfield);
-
-		myGHistory->IsVisited(theUrl, &theRetVal);
-		if (theRetVal)
-		{
-			rv = myHistory->RemovePage(theUrl);
-			if (NS_SUCCEEDED(rv))
-			{
-				WriteToOutputFile("\r\nThe URL was removed from the GH file.\r\n");
-				AfxMessageBox("The URL was removed from the GH file.");
-			}
-			else
-			{
-				WriteToOutputFile("\r\nThe URL wasn't removed from the GH file.\r\n");
-				AfxMessageBox("The URL wasn't removed from the GH file.");
-			}
-		}
-		else
-		{
-			WriteToOutputFile("The URL wasn't in the GH file.\r\n");
-		}
-		WriteToOutputFile("End URL removal from the GH file.\r\n");
-		AfxMessageBox("End URL removal from the GH file.");
-	}
-	else
-	{
-		WriteToOutputFile("URL removal from the GH file not executed.\r\n");
-		AfxMessageBox("URL removal from the GH file not executed.");
-	}
-}
-
-// ***********************************************************************
-// ************************** Interface Tests ****************************
-// ***********************************************************************
-
-// nsIFile:
-
-void CBrowserView::OnInterfacesNsifile() 
-{
-   nsCOMPtr<nsILocalFile> theTestFile(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
-   nsCOMPtr<nsILocalFile> theFileOpDir(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
-
-   nsresult rv;
-   PRBool exists;
-
-    if (!theTestFile)
- 	{
-		WriteToOutputFile("File object doesn't exist. No File tests performed.\r\n");
-		AfxMessageBox("File object doesn't exist. No File tests performed.");
-		return;
-	}
-	if (!theFileOpDir)
- 	{
-		WriteToOutputFile("Dir object doesn't exist. No File tests performed.\r\n");
-		AfxMessageBox("File object doesn't exist. No File tests performed.");
-		return;
-	}
-
-	AfxMessageBox("Begin nsIFile tests.");
-	WriteToOutputFile("\r\nBegin testing nsIFile InitWithPath(), AppendRelativePath(), \
-						Create(), and Exists() methods.\r\n");
-
-	rv = theTestFile->InitWithPath("c:\\temp\\");
-	if (NS_FAILED(rv))
-	{
-		AfxMessageBox("We failed to initialize file path.");
-		WriteToOutputFile("InitWithPath() test Failed.");
-	}
-	else
-	{
-		AfxMessageBox("We initialized file path.");
-		WriteToOutputFile("InitWithPath() test Passed.");
-	}
-
-	rv = theTestFile->AppendRelativePath("myFile.txt");
-	if (NS_FAILED(rv))
-	{
-		AfxMessageBox("We failed to append the file.");
-		WriteToOutputFile("AppendRelativePath() test Failed.");
-	}
-	else
-	{
-		AfxMessageBox("We appended the file.");
-		WriteToOutputFile("AppendRelativePath() test Passed.");
-	}
-
-	rv = theTestFile->Exists(&exists);
-	if (!exists)
-	{
-		AfxMessageBox("File doesn't exist. We'll try creating it.");
-		WriteToOutputFile("File doesn't exist. We'll try creating it.\r\n");
-		rv = theTestFile->Create(nsIFile::NORMAL_FILE_TYPE, 0777);
-		if (NS_FAILED(rv))
-		{
-			AfxMessageBox("We failed to create the file (myFile.txt).");
-			WriteToOutputFile("Create() test Failed.");
-		}
-		else
-		{
-			AfxMessageBox("We created the file (myFile.txt).");
-			WriteToOutputFile("Create() test Passed.");
-		}
-	}
-	else
-	{
-		AfxMessageBox("File already exists (myFile.txt). We won't create it.");
-		WriteToOutputFile("File already exists (myFile.txt). We won't create it.");
-	}
-
-
-	rv = theTestFile->Exists(&exists);
-	if (!exists)
-	{
-		AfxMessageBox("File (myFile.txt) doesn't exist.");
-		WriteToOutputFile("Exists() test Failed.");
-	}
-	else
-	{
-		AfxMessageBox("File (myFile.txt) exists.");
-		WriteToOutputFile("Exists() test Passed.");
-	}
-
-	// FILE COPY test
-
-	AfxMessageBox("Start File Copy test.");
-	WriteToOutputFile("Start File Copy test.");
-
-	rv = theFileOpDir->InitWithPath("c:\\temp\\");
-	if (NS_FAILED(rv))
-	{
-		AfxMessageBox("The target dir wasn't found.");
-		WriteToOutputFile("The target dir wasn't found.");
-	}
-	else
-	{
-		AfxMessageBox("The target dir was found.");
-		WriteToOutputFile("The target dir was found.");
-	}
-	rv = theTestFile->InitWithPath("c:\\temp\\myFile.txt");
-	if (NS_FAILED(rv))
-		AfxMessageBox("The path wasn't found.");
-	else
-		AfxMessageBox("The path was found.");
-	rv = theTestFile->CopyTo(theFileOpDir, "myFile2.txt");
-	if (NS_FAILED(rv))
-		AfxMessageBox("rv CopyTo() test failed.");
-	else
-		AfxMessageBox("rv CopyTo() test succeeded.");
-
-	rv = theTestFile->InitWithPath("c:\\temp\\myFile2.txt");
-	rv = theTestFile->Exists(&exists);
-	if (!exists)
-	{
-		AfxMessageBox("File didn't copy.");
-		WriteToOutputFile("CopyTo() test Failed.");
-	}
-	else
-	{
-		AfxMessageBox("File copied.");
-		WriteToOutputFile("CopyTo() test Passed.");
-	}	
-
-		// FILE MOVE test
-
-	AfxMessageBox("Start File Move test.");
-	WriteToOutputFile("Start File Move test.");
-
-	rv = theFileOpDir->InitWithPath("c:\\Program Files\\");
-	if (NS_FAILED(rv))
-	{
-		AfxMessageBox("The target dir wasn't found.");
-		WriteToOutputFile("The target dir wasn't found.");
-	}
-
-	rv = theTestFile->InitWithPath("c:\\temp\\myFile2.txt");
-	if (NS_FAILED(rv))
-		AfxMessageBox("The path wasn't found.");
-
-	rv = theTestFile->MoveTo(theFileOpDir, "myFile2.txt");
-	if (NS_FAILED(rv))
-		AfxMessageBox("rv MoveTo() test failed.");
-	else
-		AfxMessageBox("rv MoveTo() test succeeded.");
-	rv = theTestFile->InitWithPath("c:\\Program Files\\myFile2.txt");
-	rv = theTestFile->Exists(&exists);
-	if (!exists)
-	{
-		AfxMessageBox("File wasn't moved.");
-		WriteToOutputFile("MoveTo() test Failed.");
-	}
-	else
-	{
-		AfxMessageBox("File was moved.");
-		WriteToOutputFile("MoveTo() test Passed.");
-	}	
-
-	AfxMessageBox("End nsIFile tests.");
-	WriteToOutputFile("\r\nEnd testing nsIFile InitWithPath(), AppendRelativePath(), \
-						Create(), and Exists() methods.\r\n");
-	
-}
-
-// nsISHistory:
-
-void CBrowserView::OnInterfacesNsishistory() 
-{
-   nsresult rv;
-   boolean modifyIndex;
-   long numEntries = 0;
-
-   nsCOMPtr<nsISHistory> theSessionHistory(do_CreateInstance(NS_SHISTORY_CONTRACTID));
-   nsCOMPtr<nsIHistoryEntry> theHistoryEntry(do_CreateInstance(NS_HISTORYENTRY_CONTRACTID));
-   // do_QueryInterface
-   // NS_HISTORYENTRY_CONTRACTID
-
-  
-   if (!theSessionHistory)
-   {
-	   AfxMessageBox("theSessionHistory object wasn't created. No tests performed.");
-	   return;
-   }
-   if (!theHistoryEntry)
-   {
-	   AfxMessageBox("NSISHistory Listener not added.");
-	   return;
-   }
-
-   // addSHistoryListener test
-	nsWeakPtr weakling(
-        do_GetWeakReference(static_cast<nsISHistoryListener*>(mpBrowserImpl)));
-	rv = mWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsISHistoryListener));
-
-	if (NS_FAILED(rv))
-	{
-		AfxMessageBox("NSISHistory Listener not added.");
-		WriteToOutputFile("NSISHistory Listener not added.\r\n");
-	}
-	else
-	{
-		AfxMessageBox("NSISHistory Listener added.");
-		WriteToOutputFile("NSISHistory Listener added.\r\n");
-	}
-
-/*
-   // getEntryAtIndex() test
-    theHistoryEntry = theSessionHistory->GetEntryAtIndex(index, modifyIndex);
-    if (!theHistoryEntry)
-    {
-		AfxMessageBox("We got the History Entry.");	
-	}
-	else
-	{
-		AfxMessageBox("We didn't get the History Entry.");
-	}
-
-*/
-
-///*
-   // PurgeHistory() test
-   rv = theSessionHistory->PurgeHistory(numEntries);
-   if (NS_FAILED(rv))
-	   AfxMessageBox("Purge History test failed.");
-   else
-	   AfxMessageBox("Purge History test succeeded.");
-//*/
-
-      // RemoveSHistoryListener test
-/*
-       nsWeakPtr weakling(
-       do_GetWeakReference(static_cast<nsISHistoryListener*>(mpBrowserImpl)));
-	   rv = theSessionHistory->RemoveSHistoryListener(weakling);
-*/
-}
-
-
-// ***************** Local Methods ******************
-
-void CBrowserView::WriteToOutputFile(char *pLine) 
-{ 
-    CStdioFile myFile; 
-    CFileException e; 
-    CString strFileName = "c:\\temp\\MFCoutfile"; 
-
-    if(! myFile.Open( strFileName, CStdioFile::modeCreate | CStdioFile::modeWrite
-								| CStdioFile::modeNoTruncate, &e ) ) 
-    { 
-        CString failCause = "Unable to open file. Reason : "; 
-        failCause += e.m_cause; 
-        AfxMessageBox(failCause); 
-    } 
-    else 
-    { 
-		myFile.SeekToEnd();
-        CString strLine = pLine; 
-        strLine += "\r\n"; 
-
-        myFile.WriteString(strLine); 
-
-        myFile.Close(); 
-    } 
-} 
-
-
-// ***************** Bug Verifications ******************
-
-void CBrowserView::OnVerifybugs70228() 
-{
-/*
-	nsCOMPtr<nsIHelperAppLauncherDialog> 
-			myHALD(do_GetService(NS_IHELPERAPPLAUNCHERDLG_CONTRACTID));
-	if (!myHALD)
-		AfxMessageBox("Object not created. It's NOT a service!");
-	else
-		AfxMessageBox("Object is created. But should it?! It's NOT a service!");
-
-	nsCOMPtr<nsIHelperAppLauncherDialog> 
-			myHALD(do_CreateInstance(NS_IHELPERAPPLAUNCHERDLG_CONTRACTID));
-	if (!myHALD)
-		AfxMessageBox("Object not created. It should be. It's a component!");
-	else
-		AfxMessageBox("Object is created. It's a component!");	
-*/
-/*
-nsCOMPtr<nsIHelperAppLauncher> 
-			myHAL(do_CreateInstance(NS_IHELPERAPPLAUNCHERDLG_CONTRACTID));
-
-	rv = myHALD->show(myHal, mySupp);
-*/	
-}
diff --git a/embedding/qa/testembed/BrowserView.h b/embedding/qa/testembed/BrowserView.h
deleted file mode 100644
index 76560b7bde0..00000000000
--- a/embedding/qa/testembed/BrowserView.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// BrowserView.h : interface of the CBrowserView class
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _BROWSERVIEW_H
-#define _BROWSERVIEW_H
-
-#if _MSC_VER > 1000
-	#pragma once
-#endif
-
-#include "IBrowserFrameGlue.h"
-#include "nsIPrintSettings.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CBrowserView window
-
-class CBrowserFrame;
-class CBrowserImpl;
-class CFindDialog;
-class CPrintProgressDialog;
-
-class CTests;
-//class CNsIRequest;
-class CBrowserView : public CWnd
-{
-public:
-	CBrowserView();
-	virtual ~CBrowserView();
-
-	// Some helper methods
-	HRESULT CreateBrowser();
-	HRESULT DestroyBrowser();
-	void OpenURL(const char* pUrl);
-	void OpenURL(const PRUnichar* pUrl);
-	CBrowserFrame* CreateNewBrowserFrame(PRUint32 chromeMask = nsIWebBrowserChrome::CHROME_ALL, 
-							PRInt32 x = -1, PRInt32 y = -1, 
-							PRInt32 cx = -1, PRInt32 cy = -1,
-							PRBool bShowWindow = PR_TRUE);
-	void OpenURLInNewWindow(const PRUnichar* pUrl);
-	void LoadHomePage();
-
-	void GetBrowserWindowTitle(nsCString& title);
-	
-	// Called by the CBrowserFrame after it creates the view
-	// Essentially a back pointer to the BrowserFrame
-	void SetBrowserFrame(CBrowserFrame* pBrowserFrame);
-	CBrowserFrame* mpBrowserFrame;
-
-	// Called by the CBrowserFrame after it creates the view
-	// The view passes this on to the embedded Browser's Impl
-	// obj
-	void SetBrowserFrameGlue(PBROWSERFRAMEGLUE pBrowserFrameGlue);
-	PBROWSERFRAMEGLUE mpBrowserFrameGlue;
-
-	// Pointer to the object which implements
-	// the inerfaces required by Mozilla embedders
-	//
-	CBrowserImpl* mpBrowserImpl;
-
-    CTests *qaTests ;
-	//CNsIRequest *nsiRequest;
-
-	// Mozilla interfaces
-	//
-	nsCOMPtr<nsIWebBrowser> mWebBrowser;
-	nsCOMPtr<nsIBaseWindow> mBaseWindow;
-	nsCOMPtr<nsIWebNavigation> mWebNav;	
-
-	//nsCOMPtr<nsISHistory> mSessionHistory; // de: added in 5/11/01
-
-	void UpdateBusyState(PRBool aBusy);
-	PRBool mbDocumentLoading;
-
-	void SetCtxMenuLinkUrl(nsAutoString& strLinkUrl);
-	nsAutoString mCtxMenuLinkUrl;
-
-	void SetCtxMenuImageSrc(nsAutoString& strImgSrc);
-	nsAutoString mCtxMenuImgSrc;
-
-	inline void ClearFindDialog() { m_pFindDlg = NULL; }
-	CFindDialog* m_pFindDlg;
-  CPrintProgressDialog* m_pPrintProgressDlg;
-    // When set to TRUE...
-    // indicates that the clipboard operation needs to be 
-    // performed on the UrlBar rather than on
-    // the web page content
-    //
-    BOOL m_bUrlBarClipOp;
-
-    // indicates whether we are currently printing
-    BOOL m_bCurrentlyPrinting;
-
-    void Activate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
-
-    BOOL OpenViewSourceWindow(const char* pUrl);
-    BOOL IsViewSourceUrl(CString& strUrl);
-
-	// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CBrowserView)
-
-		
-	// de: qa methods
-	static void WriteToOutputFile(char * strInput);
-	static char *theUrl;
-	static void RvTestResult(nsresult rv, char *pLine, int displayMethod=1);
-	static void QAOutput(char *pLine, int displayMethod=1);
-
-	public:
-	virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
-	protected:
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
-	//}}AFX_VIRTUAL
-
-
-	// Generated message map functions
-protected:
-	nsCOMPtr<nsIPrintSettings> m_PrintSettings;
-
-	//{{AFX_MSG(CBrowserView)
-	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
-	afx_msg void OnDestroy();
-	afx_msg void OnSize( UINT, int, int );
-	afx_msg void OnUrlSelectedInUrlBar();
-	afx_msg void OnNewUrlEnteredInUrlBar();
-	afx_msg void OnFileOpen();
-	afx_msg void OnFileSaveAs();
-	afx_msg void OnViewSource();
-	afx_msg void OnViewInfo();
-	afx_msg void OnNavBack();
-	afx_msg void OnNavForward();
-	afx_msg void OnNavHome();
-	afx_msg void OnNavReload();
-	afx_msg void OnNavStop();
-	afx_msg void OnCut();
-	afx_msg void OnCopy();
-	afx_msg void OnPaste();
-    afx_msg void OnUndoUrlBarEditOp();
-	afx_msg void OnSelectAll();
-	afx_msg void OnSelectNone();
-	afx_msg void OnCopyLinkLocation();
-	afx_msg void OnOpenLinkInNewWindow();
-	afx_msg void OnViewImageInNewWindow();
-	afx_msg void OnSaveLinkAs();
-	afx_msg void OnSaveImageAs();
-	afx_msg void OnShowFindDlg();
-	afx_msg void OnFilePrint();
-	afx_msg void OnUpdateFilePrint(CCmdUI* pCmdUI);
-	afx_msg LRESULT OnFindMsg(WPARAM wParam, LPARAM lParam);
-	afx_msg void OnUpdateNavBack(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateNavForward(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateNavStop(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateCut(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateCopy(CCmdUI* pCmdUI);
-	afx_msg void OnUpdatePaste(CCmdUI* pCmdUI);
-
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-#endif //_BROWSERVIEW_H
diff --git a/embedding/qa/testembed/Dialogs.cpp b/embedding/qa/testembed/Dialogs.cpp
deleted file mode 100644
index 0e2edef04b8..00000000000
--- a/embedding/qa/testembed/Dialogs.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "stdafx.h"
-#include "Dialogs.h"
-#include "BrowserView.h"
-
-// File overview....
-//
-// contains Find dialog box code
-//
-
-//--------------------------------------------------------------------------//
-//				CFindDialog Stuff
-//--------------------------------------------------------------------------//
-
-CFindDialog::CFindDialog(CString& csSearchStr, PRBool bMatchCase,
-				PRBool bMatchWholeWord, PRBool bWrapAround,
-				PRBool bSearchBackwards, CBrowserView* pOwner)
-				: CFindReplaceDialog()
-{
-	// Save these initial settings off in member vars
-	// We'll use these to initialize the controls
-	// in InitDialog()
-	m_csSearchStr = csSearchStr;
-	m_bMatchCase = bMatchCase;
-	m_bMatchWholeWord = bMatchWholeWord;
-	m_bWrapAround = bWrapAround;
-	m_bSearchBackwards = bSearchBackwards;
-	m_pOwner = pOwner;
-
-	// Set up to load our customized Find dialog template
-	// rather than the default one MFC provides
-	m_fr.Flags |= FR_ENABLETEMPLATE;
-	m_fr.hInstance = AfxGetInstanceHandle();
-	m_fr.lpTemplateName = MAKEINTRESOURCE(IDD_FINDDLG);
-}
-
-BOOL CFindDialog::OnInitDialog() 
-{
-	CFindReplaceDialog::OnInitDialog();
-
-	CEdit* pEdit = (CEdit *)GetDlgItem(IDC_FIND_EDIT);
-	if(pEdit)
-		pEdit->SetWindowText(m_csSearchStr);
-
-	CButton* pChk = (CButton *)GetDlgItem(IDC_MATCH_CASE);
-	if(pChk)
-		pChk->SetCheck(m_bMatchCase);
-
-	pChk = (CButton *)GetDlgItem(IDC_MATCH_WHOLE_WORD);
-	if(pChk)
-		pChk->SetCheck(m_bMatchWholeWord);
-
-	pChk = (CButton *)GetDlgItem(IDC_WRAP_AROUND);	
-	if(pChk)
-		pChk->SetCheck(m_bWrapAround);
-
-	pChk = (CButton *)GetDlgItem(IDC_SEARCH_BACKWARDS);
-	if(pChk)
-		pChk->SetCheck(m_bSearchBackwards);
-
-	return TRUE; 
-}
-
-void CFindDialog::PostNcDestroy()	
-{
-	// Let the owner know we're gone
-	if(m_pOwner != NULL)	
-		m_pOwner->ClearFindDialog();
-
-	CFindReplaceDialog::PostNcDestroy();
-}
-
-BOOL CFindDialog::WrapAround()
-{
-	CButton* pChk = (CButton *)GetDlgItem(IDC_WRAP_AROUND);
-
-	return pChk ? pChk->GetCheck() : FALSE;
-}
-
-BOOL CFindDialog::SearchBackwards()
-{
-	CButton* pChk = (CButton *)GetDlgItem(IDC_SEARCH_BACKWARDS);
-
-	return pChk ? pChk->GetCheck() : FALSE;
-}
diff --git a/embedding/qa/testembed/Dialogs.h b/embedding/qa/testembed/Dialogs.h
deleted file mode 100644
index e507bce6627..00000000000
--- a/embedding/qa/testembed/Dialogs.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _DIALOGS_H_
-#define _DIALOGS_H_
-
-#include "resource.h"
-
-class CBrowserView;
-
-class CFindDialog : public CFindReplaceDialog	
-{
-public:
-	CFindDialog(CString& csSearchStr, PRBool bMatchCase,
-				PRBool bMatchWholeWord, PRBool bWrapAround,
-				PRBool bSearchBackwards, CBrowserView* pOwner);
-	BOOL WrapAround();
-	BOOL SearchBackwards();
-
-private:
-	CString m_csSearchStr;
-	PRBool m_bMatchCase;
-	PRBool m_bMatchWholeWord;
-	PRBool m_bWrapAround;
-	PRBool m_bSearchBackwards;
-	CBrowserView* m_pOwner;
-
-protected:
-	virtual BOOL OnInitDialog();
-	virtual void PostNcDestroy();
-};
-
-#endif //_DIALOG_H_
diff --git a/embedding/qa/testembed/DomWindow.cpp b/embedding/qa/testembed/DomWindow.cpp
deleted file mode 100644
index 0448c327296..00000000000
--- a/embedding/qa/testembed/DomWindow.cpp
+++ /dev/null
@@ -1,509 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// Test cases for the nsIDOMWindow Interface
-
-
-#include "stdafx.h"
-#include "QaUtils.h"
-#include <stdio.h>
-#include "domWindow.h"
-#include "resource.h"
-
-
-CDomWindow::CDomWindow(nsIWebBrowser* mWebBrowser)
-{
-	qaWebBrowser = mWebBrowser ;
-}
-
-CDomWindow::~CDomWindow()
-{
-
-}
-
-
-void CDomWindow::OnStartTests(UINT nMenuID)
-{
-	// Calls  all or indivdual test cases on the basis of the 
-	// option selected from menu.
-
-	switch(nMenuID)
-	{
-	case ID_INTERFACES_NSIDOMWINDOW_RUNALLTESTS :
-		RunAllTests();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_GETDOMDOCUMENT :
-		GetDocument();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_GETPARENT : 
-		GetParent();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_GETSCROLLBARS :
-		GetScrollbars();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_GETFRAMES :
-		GetFrames();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_GETNAME :
-		//GetName();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_GETTEXTZOOM : 
-		GetTextZoom();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_SETTEXTZOOM : 
-		SetTextZoom();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_GETSCSOLLX : 
-		GetScrollX();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_GETSCROLLY :
-		GetScrollY();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_SCROLLTO :
-		ScrollTo();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_SCROLLBY :
-		ScrollBy();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_GETSELECTION :
-		GetSelection();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_SCROLLBYLINES :
-		ScrollByLines();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_SCROLLBYPAGES :
-		ScrollByPages();
-		break;
-	case ID_INTERFACES_NSIDOMWINDOW_SIZETOCONTENT :
-		SizeToContent();
-		break;
-	default :
-		AfxMessageBox("Not added menu handler for this menu item");
-		break;
-	}
-}
-void CDomWindow::RunAllTests()
-{
-	PRInt32 scrollX = 0 ;
-	PRInt32 scrollY = 0;
-	PRInt32 bVisible =0;
-	float fTextZoom = 0.0;
-
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	//nsCOMPtr<nsIDOMWindow> oDomWindowTop;
-	//nsCOMPtr<nsIDOMWindow> oDomWindowParent;
-
-	nsCOMPtr<nsIDOMBarProp> oDomBarProp;
-	nsCOMPtr<nsIDOMWindowCollection> oDomWindowCol;
-	nsCOMPtr<nsIDOMDocument> oDomDocument;
-	nsCOMPtr<nsISelection> oSelection;
-	
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 1);
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-
-/*	rv = oDomWindow->GetTop(getter_AddRefs(oDomWindowTop));
-    RvTestResult(rv, "nsIDOMWindow::GetTop()' rv test", 1);
-	if (!oDomWindowTop)
-	{
-		AfxMessageBox("Cannot create Dom Window Top Object");
-		return;
-	}
-
-	rv = oDomWindow->GetParent(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIDOMWindow::GetParent()' rv test", 1);
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Parent Object");
-		return;
-	}
-
-*/
-
-	rv = oDomWindow->GetScrollbars(getter_AddRefs(oDomBarProp));
-    RvTestResult(rv, "nsIDOMWindow::GetScrollbars()' rv test", 1);
-	if (!oDomBarProp)
-	{
-		AfxMessageBox("Cannot create Dom Window Scroll Bar Object");
-		return;
-	}
-
-	rv = oDomWindow->GetFrames(getter_AddRefs(oDomWindowCol));
-    RvTestResult(rv, "nsIDOMWindow::GetFrames()' rv test", 1);
-	if (!oDomWindowCol)
-	{
-		AfxMessageBox("Cannot create Dom Window Collection Object");
-		return;
-	}
-
-	rv = oDomWindow->GetDocument(getter_AddRefs(oDomDocument));
-    RvTestResult(rv, "nsIDOMWindow::GetDocument()' rv test", 1);
-	if (!oDomDocument)
-	{
-		AfxMessageBox("Cannot create Dom Document Object");
-		return;
-	}
-
-	rv = oDomWindow->GetSelection(getter_AddRefs(oSelection));
-    RvTestResult(rv, "nsIDOMWindow::GetSelection()' rv test", 1);
-	if (!oSelection)
-	{
-		AfxMessageBox("Cannot get the  Selection Object");
-		return;
-	}
-
-	//  nsIDOMBarProp's only attribute
-	//rv = oDomBarProp->GetVisible(&bVisible);
-
-
-	rv = oDomWindow->GetTextZoom(&fTextZoom);
-	    RvTestResult(rv, "nsIDOMWindow::GetTextZoom()' rv test", 1);
-
-	rv = oDomWindow->SetTextZoom(12.0);
-	//fTextZoom = 4.0 ;
-	rv = oDomWindow->SetTextZoom(fTextZoom);
-	    RvTestResult(rv, "nsIDOMWindow::SetTextZoom()' rv test", 1);
-
-	rv = oDomWindow->GetScrollX(&scrollX);
-	   RvTestResult(rv, "nsIDOMWindow::GetScrollX()' rv test", 1);
-
-	rv = oDomWindow->GetScrollY(&scrollY);
-	   RvTestResult(rv, "nsIDOMWindow::GetScrollY()' rv test", 1);
-
-	rv = oDomWindow->ScrollTo(100,100);
-	   RvTestResult(rv, "nsIDOMWindow::ScrollTo()' rv test", 1);
-
-
-	rv = oDomWindow->ScrollBy(5, 5);
-	   RvTestResult(rv, "nsIDOMWindow::ScrollBy()' rv test", 1);
-
-	rv = oDomWindow->ScrollByLines(5);
-	   RvTestResult(rv, "nsIDOMWindow::ScrollByLines()' rv test", 1);
-
-	rv = oDomWindow->ScrollByPages(1);
-	   RvTestResult(rv, "nsIDOMWindow::ScrollByPages()' rv test", 1);
-
-	//rv = oDomWindow->SizeToContent();
-	//   RvTestResult(rv, "nsIDOMWindow::SizeToContent()' rv test", 1);
-
-}
-
-void CDomWindow::GetTop()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	nsCOMPtr<nsIDOMWindow> oDomWindowTop;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-
-    rv = oDomWindow->GetTop(getter_AddRefs(oDomWindowTop));
-    RvTestResult(rv, "nsIDOMWindow::GetTop()' rv test", 1);
-	if (!oDomWindowTop)
-	{
-		AfxMessageBox("Cannot create Dom Window Top Object");
-		return;
-	}
-}
-
-void CDomWindow::GetParent()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	nsCOMPtr<nsIDOMWindow> oDomWindowParent;
-
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-
-	rv = oDomWindow->GetParent(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIDOMWindow::GetParent()' rv test", 0);
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Parent Object");
-		return;
-	}
-
-}
-
-
-void CDomWindow::GetScrollbars()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	nsCOMPtr<nsIDOMBarProp> oDomBarProp;
-
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-
-	rv = oDomWindow->GetScrollbars(getter_AddRefs(oDomBarProp));
-    RvTestResult(rv, "nsIDOMWindow::GetScrollbars()' rv test", 0);
-	if (!oDomBarProp)
-	{
-		AfxMessageBox("Cannot create Dom Window Scroll Bar Object");
-		return;
-	}
-
-}
-
-void CDomWindow::GetFrames()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	nsCOMPtr<nsIDOMWindowCollection> oDomWindowCol;
-
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-	rv = oDomWindow->GetFrames(getter_AddRefs(oDomWindowCol));
-    RvTestResult(rv, "nsIDOMWindow::GetFrames()' rv test", 0);
-	if (!oDomWindowCol)
-	{
-		AfxMessageBox("Cannot create Dom Window Collection Object");
-		return;
-	}
-}
-
-void CDomWindow::GetDocument()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	nsCOMPtr<nsIDOMDocument> oDomDocument;
-
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-
-	rv = oDomWindow->GetDocument(getter_AddRefs(oDomDocument));
-    RvTestResult(rv, "nsIDOMWindow::GetDocument()' rv test",0);
-	if (!oDomDocument)
-	{
-		AfxMessageBox("Cannot create Dom Document Object");
-		return;
-	}
-}
-
-void CDomWindow::GetSelection()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	nsCOMPtr<nsISelection> oSelection;
-
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test",0);
-
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-
-	rv = oDomWindow->GetSelection(getter_AddRefs(oSelection));
-    RvTestResult(rv, "nsIDOMWindow::GetSelection()' rv test", 0);
-	if (!oSelection)
-	{
-		AfxMessageBox("Cannot get the  Selection Object");
-		return;
-	}
-}
-
-void CDomWindow::GetTextZoom()
-{
-	float fTextZoom = 0.0 ;
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-	rv = oDomWindow->GetTextZoom(&fTextZoom);
-	RvTestResult(rv, "nsIDOMWindow::GetTextZoom()' rv test", 0);
-}
-
-void CDomWindow::SetTextZoom()
-{
-	float fTextZoom = 0.0 ;
-
-	fTextZoom = 12.0;
-	rv = GetDOMOWindowObject()->SetTextZoom(fTextZoom);
-	RvTestResult(rv, "nsIDOMWindow::SetTextZoom()' rv test", 0);
-}
-
-void CDomWindow::GetScrollX()
-{
-	PRInt32 scrollX = 0 ;
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-	rv = oDomWindow->GetScrollX(&scrollX);
-	RvTestResult(rv, "nsIDOMWindow::GetScrollX()' rv test", 0);
-}
-
-void CDomWindow::GetScrollY()
-{	
-	PRInt32 scrollY = 0 ;
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-	rv = oDomWindow->GetScrollY(&scrollY);
-	RvTestResult(rv, "nsIDOMWindow::GetScrollY()' rv test", 0);
-}
-
-void CDomWindow::ScrollTo()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-	rv = oDomWindow->ScrollTo(100,100);
-    RvTestResult(rv, "nsIDOMWindow::ScrollTo()' rv test", 0);
-}
-
-
-void CDomWindow::ScrollBy()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-	rv = oDomWindow->ScrollBy(5, 5);
-	RvTestResult(rv, "nsIDOMWindow::ScrollBy()' rv test", 0);
-}
-
-void CDomWindow::ScrollByLines()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-	rv = oDomWindow->ScrollByLines(5);
-    RvTestResult(rv, "nsIDOMWindow::ScrollByLines()' rv test",0);
-
-}
-
-void CDomWindow::ScrollByPages()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-	rv = oDomWindow->ScrollByPages(1);
-	RvTestResult(rv, "nsIDOMWindow::ScrollByPages()' rv test", 0);
-}
-
-void CDomWindow::SizeToContent()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-    RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-
-	if (!oDomWindow)
-	{
-		AfxMessageBox("Cannot create Dom Window Object");
-		return;
-	}
-	rv = oDomWindow->SizeToContent();
-	RvTestResult(rv, "nsIDOMWindow::SizeToContent()' rv test", 0);
-}
-
-
-nsIDOMWindow* CDomWindow::GetDOMOWindowObject()
-{
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-	if (!oDomWindow)
-		AfxMessageBox("Cannot create Dom Window Object");
-	return oDomWindow;
-
-}
diff --git a/embedding/qa/testembed/DomWindow.h b/embedding/qa/testembed/DomWindow.h
deleted file mode 100644
index 8acf20d16c0..00000000000
--- a/embedding/qa/testembed/DomWindow.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// 
-// Header file for nsIDOMWindow interface test cases
-
-class CDomWindow
-{
-public:
-	CDomWindow(nsIWebBrowser* mWebBrowser);
-private:
-
-public:
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser ;
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests();
-	void GetContentDOMWindow();
-	void GetTop();
-	void GetParent();
-	void GetScrollbars();
-	void GetFrames();
-	void GetDocument();
-	void GetSelection();
-	void GetTextZoom();
-	void SetTextZoom();
-	void GetScrollX();
-	void GetScrollY();
-	void ScrollTo();
-	void ScrollBy();
-	void ScrollByLines();
-	void ScrollByPages();
-	void SizeToContent();
-	nsIDOMWindow* GetDOMOWindowObject();
-public:
-	virtual ~CDomWindow();
-
-protected:
-};
\ No newline at end of file
diff --git a/embedding/qa/testembed/IBrowserFrameGlue.h b/embedding/qa/testembed/IBrowserFrameGlue.h
deleted file mode 100644
index 051042441ff..00000000000
--- a/embedding/qa/testembed/IBrowserFrameGlue.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// This interface acts as a glue between the required/optional 
-// Gecko embedding interfaces and the actual platform specific
-// way of doing things - such as updating a statusbar etc.
-//
-// For ex, in the mfcembed sample the required interfaces such as 
-// IWebBrowserChrome etc. are implemented in a XP way in the
-// BrowserImp*.cpp files. However, when they get called to update the
-// statusbar etc. they call on this interface to get the actual job
-// done. During the BrowserFrame creation some object must implement
-// this interface and pass the pointer to it via the Init() member of
-// the CBrowserImpl class
-
-#ifndef _IBROWSERFRAMEGLUE_H
-#define _IBROWSERFRAMEGLUE_H
-
-struct IBrowserFrameGlue {
-	// Progress Related Methods
-	virtual void UpdateStatusBarText(const PRUnichar *aMessage) = 0;
-	virtual void UpdateProgress(PRInt32 aCurrent, PRInt32 aMax) = 0;
-	virtual void UpdateBusyState(PRBool aBusy) = 0;
-	virtual void UpdateCurrentURI(nsIURI *aLocation) = 0;
-
-	// BrowserFrame Related Methods
-	virtual PRBool CreateNewBrowserFrame(PRUint32 chromeMask, 
-							PRInt32 x, PRInt32 y, 
-							PRInt32 cx, PRInt32 cy,
-							nsIWebBrowser ** aWebBrowser) = 0;
-	virtual void DestroyBrowserFrame() = 0;
-	virtual void GetBrowserFrameTitle(PRUnichar **aTitle) = 0;
-	virtual void SetBrowserFrameTitle(const PRUnichar *aTitle) = 0;
-	virtual void GetBrowserFramePosition(PRInt32 *aX, PRInt32 *aY) = 0;
-	virtual void SetBrowserFramePosition(PRInt32 aX, PRInt32 aY) = 0;
-	virtual void GetBrowserFrameSize(PRInt32 *aCX, PRInt32 *aCY) = 0;
-	virtual void SetBrowserFrameSize(PRInt32 aCX, PRInt32 aCY) = 0;
-	virtual void GetBrowserFramePositionAndSize(PRInt32 *aX, PRInt32 *aY, PRInt32 *aCX, PRInt32 *aCY) = 0;
-	virtual void SetBrowserFramePositionAndSize(PRInt32 aX, PRInt32 aY, PRInt32 aCX, PRInt32 aCY, PRBool fRepaint) = 0;
-	virtual void ShowBrowserFrame(PRBool aShow) = 0;
-	virtual void SetFocus() = 0;
-	virtual void FocusAvailable(PRBool *aFocusAvail) = 0;
-	virtual void GetBrowserFrameVisibility(PRBool *aVisible) = 0;
-
-	// ContextMenu Related Methods
-	virtual void ShowContextMenu(PRUint32 aContextFlags, nsIDOMNode *aNode) = 0;
-
-    // Tooltip methods
-    virtual void ShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText) = 0;
-    virtual void HideTooltip() = 0;
-
-	virtual HWND GetBrowserFrameNativeWnd() = 0;
-};
-
-#define	NS_DECL_BROWSERFRAMEGLUE	\
-	public:	\
-		virtual void UpdateStatusBarText(const PRUnichar *aMessage);	\
-		virtual void UpdateProgress(PRInt32 aCurrent, PRInt32 aMax);	\
-		virtual void UpdateBusyState(PRBool aBusy);						\
-		virtual void UpdateCurrentURI(nsIURI *aLocation);				\
-		virtual PRBool CreateNewBrowserFrame(PRUint32 chromeMask, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy, nsIWebBrowser** aWebBrowser);	\
-		virtual void DestroyBrowserFrame();							\
-		virtual void GetBrowserFrameTitle(PRUnichar **aTitle);	\
-		virtual void SetBrowserFrameTitle(const PRUnichar *aTitle);	\
-		virtual void GetBrowserFramePosition(PRInt32 *aX, PRInt32 *aY);	\
-		virtual void SetBrowserFramePosition(PRInt32 aX, PRInt32 aY);	\
-		virtual void GetBrowserFrameSize(PRInt32 *aCX, PRInt32 *aCY);	\
-		virtual void SetBrowserFrameSize(PRInt32 aCX, PRInt32 aCY);		\
-		virtual void GetBrowserFramePositionAndSize(PRInt32 *aX, PRInt32 *aY, PRInt32 *aCX, PRInt32 *aCY);	\
-		virtual void SetBrowserFramePositionAndSize(PRInt32 aX, PRInt32 aY, PRInt32 aCX, PRInt32 aCY, PRBool fRepaint);	\
-		virtual void ShowBrowserFrame(PRBool aShow);					\
-		virtual void SetFocus();										\
-		virtual void FocusAvailable(PRBool *aFocusAvail);				\
-		virtual void GetBrowserFrameVisibility(PRBool *aVisible);		\
-		virtual void ShowContextMenu(PRUint32 aContextFlags, nsIDOMNode *aNode); \
-        virtual void ShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText); \
-        virtual void HideTooltip(); \
-		virtual HWND GetBrowserFrameNativeWnd();		
-typedef IBrowserFrameGlue *PBROWSERFRAMEGLUE;
-
-#endif //_IBROWSERFRAMEGLUE_H
diff --git a/embedding/qa/testembed/Makefile.in b/embedding/qa/testembed/Makefile.in
deleted file mode 100644
index eec606992cf..00000000000
--- a/embedding/qa/testembed/Makefile.in
+++ /dev/null
@@ -1,167 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Ashish Bhatt <ashishbhatt@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PROGRAM		= testembed$(BIN_SUFFIX)
-RESFILE		= testembed.res
-MOZILLA_INTERNAL_API = 1
-
-MODULE = testEmbed
-
-REQUIRES = \
-	xpcom_obsolete \
-	xpcom \
-	string \
-	necko \
-	webbrwsr \
-	webBrowser_core \
-	widget \
-	docshell \
-	dom \
-	uriloader \
-	embed_base \
-	webshell \
-	shistory \
-	appcomps \
-	pref \
-	profile \
-	find \
-	gfx \
-	windowwatcher \
-	layout \
-	history \
-	exthandler \
-	content \
-	webbrowserpersist \
-	xpinstall \
-	composer \
-	commandhandler \
-	editor \
-	$(NULL)
-
-CPPSRCS		= \
-	    nsihttpchanneltests.cpp \
-	    nsichanneltests.cpp \
-	    TestEmbed.cpp     \
-	    BrowserFrm.cpp   \
-	    BrowserFrameGlue.cpp   \
-		BrowserToolTip.cpp \
-	    BrowserView.cpp \
-	    BrowserImpl.cpp \
-	    BrowserImplWebPrgrsLstnr.cpp \
-	    BrowserImplHistoryLstnr.cpp \
-	    BrowserImplCtxMenuLstnr.cpp \
-	    Dialogs.cpp       \
-	    ProfileMgr.cpp \
-	    ProfilesDlg.cpp \
-	    winEmbedFileLocProvider.cpp \
-	    MostRecentUrls.cpp \
-	    PrintProgressDialog.cpp       \
-	    Preferences.cpp \
-	    StdAfx.cpp       \
-	    UrlDialog.cpp       \
-	    QaUtils.cpp \
-	    Tests.cpp \
-	    nsirequest.cpp \
-	    nsiHistory.cpp \
-	    nsIWebNav.cpp \
-	    nsiDirServ.cpp \
-	    DomWindow.cpp \
-	    Selection.cpp \
-	    nsProfile.cpp \
-	    nsIclipboardcmd.cpp \
-	    nsIObserServ.cpp \
-	    nsIFile.cpp \
-	    nsIWebBrow.cpp \
-		nsIWebProg.cpp \
-		nsIWebBrowFind.cpp \
-		QaFindDlg.cpp \
-		WebProgDlg.cpp \
-		nsIEditSession.cpp \
-		nsICommandMgr.cpp \
-		nsICmdParams.cpp \
-		$(NULL)
-
-EXTRA_DSO_LIBS	= embed_base_s gkgfx testEmbedComponents
-
-LIBS		= \
-		$(EXTRA_DSO_LIBS) \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
-		$(NULL)
-
-OS_LIBS		+= \
-		ole32.lib \
-		comdlg32.lib \
-		shell32.lib \
-		version.lib \
-		$(NULL)
-
-LOCAL_INCLUDES	= -I$(srcdir)/components
-
-#
-# Control the default heap size.
-# This is the heap returned by GetProcessHeap().
-# As we use the CRT heap, the default size is too large and wastes VM.
-#
-# The default heap size is 1MB on Win32.
-# The heap will grow if need be.
-#
-# Set it to 256k.  See bug 127069.
-#
-
-LDFLAGS += /HEAP:0x40000
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS	+= /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" -DMOZILLA_VERSION=\"$(MOZILLA_VERSION)\"
-LDFLAGS		+= -SUBSYSTEM:windows
-
-libs:: testembed.htm
-	$(INSTALL) $^ $(DIST)/bin
-
-install:: testembed.htm
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
-
-
-
diff --git a/embedding/qa/testembed/MostRecentUrls.cpp b/embedding/qa/testembed/MostRecentUrls.cpp
deleted file mode 100644
index e960096dbc2..00000000000
--- a/embedding/qa/testembed/MostRecentUrls.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Rod Spears <rods@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//
-// CMostRecentUrls object is responsible for keeping track of the
-// 16 most recently used URLs. It stores this list in a file named
-// "urls.txt" on a per profile basis in the user's profile directory
-//
-// The constructor loads the URL list
-// The destructor saves the URL list
-//
-
-#include "StdAfx.h"
-#include "nsIFile.h"
-#include "nsILocalFile.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "MostRecentUrls.h"
-
-//--------------------------------------------------------
-//-- CMostRecentUrls
-//--------------------------------------------------------
-CMostRecentUrls::CMostRecentUrls() :
-        mNumURLs(0)
-{
-	for (int i=0;i<MAX_URLS;i++) {
-		mURLs[i] = NULL;
-	}
-
-	FILE * fd = GetFD("r");
-	if (fd) {
-		char line[512];
-		while (fgets(line, 512, fd)) {
-			if (strlen(line) > 1) {
-				line[strlen(line)-1] = 0;
-				mURLs[mNumURLs++] = _strdup(line);
-			}
-		}
-		fclose(fd);
-	}
-
-}
-
-FILE * CMostRecentUrls::GetFD(const char * aMode) 
-{
-    FILE * fd = nsnull;
-    nsCOMPtr<nsIFile> file;
-    nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(file));
-    if (NS_SUCCEEDED(rv)) {
-        nsCOMPtr<nsILocalFile> local_file(do_QueryInterface(file));
-        local_file->AppendNative(NS_LITERAL_CSTRING("urls.txt"));
-        local_file->OpenANSIFileDesc(aMode, &fd);
-    }
-
-    return fd;
-}
-
-CMostRecentUrls::~CMostRecentUrls() 
-{
-    FILE * fd = GetFD("w");
-    if (fd) {
-        for (int i=0;i<MAX_URLS;i++) {
-            if(mURLs[i])
-                fprintf(fd, "%s\n", mURLs[i]);
-        }
-    fclose(fd);
-    }
-
-    for (int i=0;i<MAX_URLS;i++) {
-        if(mURLs[i])
-          free(mURLs[i]);
-    }
-}
-
-char * CMostRecentUrls::GetURL(int aInx)
-{
-    if (aInx < mNumURLs) {
-        return mURLs[aInx];
-    }
-
-    return NULL;
-}
-
-void CMostRecentUrls::AddURL(const char * aURL)
-{
-	TCHAR szTemp[512];
-	strcpy(szTemp, aURL);
-
-	// check to see if an existing url matches the one passed in
-	int i = 0;
-	for (; i<MAX_URLS-1; i++)
-	{
-        if(mURLs[i])
-        {
-            if(strcmpi(mURLs[i], szTemp) == 0)
-                break; 
-        }
-	}
-
-    // if there was a match "i" will point to matching url entry
-    // if not i will be MAX_URLS-1
-
-    // move all url entries before this one down
-	for (; i>0; i--)
-	{
-        if(mURLs[i])
-          free(mURLs[i]);
-
-        if(mURLs[i-1])  
-            mURLs[i] = _strdup(mURLs[i-1]);
-	}
-
-	// place this url at the top
-    if(mURLs[0])
-        free(mURLs[0]);
-    mURLs[0] = _strdup(szTemp);
-}
diff --git a/embedding/qa/testembed/MostRecentUrls.h b/embedding/qa/testembed/MostRecentUrls.h
deleted file mode 100644
index efb06d97016..00000000000
--- a/embedding/qa/testembed/MostRecentUrls.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Rod Spears <rods@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-class CMostRecentUrls {
-public:
-    enum _maxUrls {
-        MAX_URLS = 16
-    };
-
-    CMostRecentUrls();
-    virtual ~CMostRecentUrls();
-
-    char * GetURL(int aInx);
-    void AddURL(const char * aURL);
-    inline int GetNumURLs() { return mNumURLs; }
-    FILE * CMostRecentUrls::GetFD(const char * aMode);
-
-protected:
-    char * mURLs[MAX_URLS];
-    int    mNumURLs;
-};
diff --git a/embedding/qa/testembed/Preferences.cpp b/embedding/qa/testembed/Preferences.cpp
deleted file mode 100644
index 9d54230c0b8..00000000000
--- a/embedding/qa/testembed/Preferences.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "stdafx.h"
-#include "Preferences.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////
-// CPreferences
-
-IMPLEMENT_DYNAMIC(CPreferences, CPropertySheet)
-
-CPreferences::CPreferences(LPCTSTR pszCaption, CWnd* pParentWnd, UINT iSelectPage)
-	:CPropertySheet(pszCaption, pParentWnd, iSelectPage)
-{
-    AddPage(&m_startupPage);
-}
-
-CPreferences::~CPreferences()
-{
-}
-
-BEGIN_MESSAGE_MAP(CPreferences, CPropertySheet)
-	//{{AFX_MSG_MAP(CPreferences)
-		// NOTE - the ClassWizard will add and remove mapping macros here.
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-BOOL CPreferences::OnInitDialog() 
-{
-	BOOL bResult = CPropertySheet::OnInitDialog();
-	
-    // Hide the Apply button
-    CWnd* pApplyButton = GetDlgItem(ID_APPLY_NOW);
-    ASSERT(pApplyButton);
-    pApplyButton->ShowWindow(SW_HIDE);
-
-	return bResult;
-}
-
-
-/////////////////////////////////////////////////////////////////
-// CStartupPrefsPage property page
-
-IMPLEMENT_DYNCREATE(CStartupPrefsPage, CPropertyPage)
-
-CStartupPrefsPage::CStartupPrefsPage() : CPropertyPage(CStartupPrefsPage::IDD)
-{
-	//{{AFX_DATA_INIT(CStartupPrefsPage)
-	m_strHomePage = _T("");
-	m_iStartupPage = -1;
-	//}}AFX_DATA_INIT
-}
-
-CStartupPrefsPage::~CStartupPrefsPage()
-{
-}
-
-void CStartupPrefsPage::DoDataExchange(CDataExchange* pDX)
-{
-	CPropertyPage::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CStartupPrefsPage)
-	DDX_Control(pDX, IDC_EDIT_HOMEPAGE, m_HomePage);
-	DDX_Text(pDX, IDC_EDIT_HOMEPAGE, m_strHomePage);
-	DDX_Radio(pDX, IDC_RADIO_BLANK_PAGE, m_iStartupPage);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(CStartupPrefsPage, CPropertyPage)
-	//{{AFX_MSG_MAP(CStartupPrefsPage)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
diff --git a/embedding/qa/testembed/Preferences.h b/embedding/qa/testembed/Preferences.h
deleted file mode 100644
index ef886008040..00000000000
--- a/embedding/qa/testembed/Preferences.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _PREFERENCES_H_
-#define _PREFERENCES_H_
-
-#include "resource.h"
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-/////////////////////////////////////////////////////////////////////////////
-// CStartupPrefsPage dialog
-
-class CStartupPrefsPage : public CPropertyPage
-{
-	DECLARE_DYNCREATE(CStartupPrefsPage)
-
-// Construction
-public:
-	CStartupPrefsPage();
-	~CStartupPrefsPage();
-
-// Dialog Data
-	//{{AFX_DATA(CStartupPrefsPage)
-	enum { IDD = IDD_PREFS_START_PAGE };
-	CEdit	m_HomePage;
-	CString	m_strHomePage;
-	int		m_iStartupPage;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generate virtual function overrides
-	//{{AFX_VIRTUAL(CStartupPrefsPage)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	// Generated message map functions
-	//{{AFX_MSG(CStartupPrefsPage)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// CPreferences
-
-class CPreferences : public CPropertySheet
-{
-	DECLARE_DYNAMIC(CPreferences)
-
-// Construction
-public:
-	CPreferences(LPCTSTR pszCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0);
-
-// Attributes
-public:
-    CStartupPrefsPage m_startupPage;
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CPreferences)
-	public:
-	virtual BOOL OnInitDialog();
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CPreferences();
-
-	// Generated message map functions
-protected:
-	//{{AFX_MSG(CPreferences)
-		// NOTE - the ClassWizard will add and remove member functions here.
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // _PREFERENCES_H_
diff --git a/embedding/qa/testembed/PrintProgressDialog.cpp b/embedding/qa/testembed/PrintProgressDialog.cpp
deleted file mode 100644
index bcc60910eed..00000000000
--- a/embedding/qa/testembed/PrintProgressDialog.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-// PrintProgressDialog.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "testembed.h"
-#include "PrintProgressDialog.h"
-#include "BrowserView.h"
-#include "nsIWebBrowser.h"
-#include "nsIWebBrowserPrint.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CPrintProgressDialog dialog
-
-class CDlgPrintListener : public nsIWebProgressListener
-{
-// Construction
-public:
-	CDlgPrintListener(CPrintProgressDialog* aDlg); 
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIWEBPROGRESSLISTENER
-
-  void ClearDlg() { m_PrintDlg = NULL; } // weak reference
-
-// Implementation
-protected:
-	CPrintProgressDialog* m_PrintDlg;
-};
-
-NS_IMPL_ADDREF(CDlgPrintListener)
-NS_IMPL_RELEASE(CDlgPrintListener)
-
-NS_INTERFACE_MAP_BEGIN(CDlgPrintListener)
-    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebProgressListener)
-    NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener)
-NS_INTERFACE_MAP_END
-
-
-CDlgPrintListener::CDlgPrintListener(CPrintProgressDialog* aDlg) :
-  m_PrintDlg(aDlg)
-{
-  //NS_ADDREF_THIS();
-}
-
-/* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aStateFlags, in nsresult aStatus); */
-NS_IMETHODIMP 
-CDlgPrintListener::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 aStateFlags, nsresult aStatus)
-{
-  if (m_PrintDlg) {
-    if (aStateFlags == (nsIWebProgressListener::STATE_START|nsIWebProgressListener::STATE_IS_DOCUMENT)) {
-      return m_PrintDlg->OnStartPrinting();
-
-    } else if (aStateFlags == (nsIWebProgressListener::STATE_STOP|nsIWebProgressListener::STATE_IS_DOCUMENT)) {
-      return m_PrintDlg->OnEndPrinting(aStatus);
-    }
-  }
-  return NS_OK;
-}
-
-/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */
-NS_IMETHODIMP 
-CDlgPrintListener::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress, PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress)
-{
-  if (m_PrintDlg) {
-    return m_PrintDlg->OnProgressPrinting(aCurSelfProgress, aMaxSelfProgress);
-  }
-  return NS_OK;
-}
-
-/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location); */
-NS_IMETHODIMP 
-CDlgPrintListener::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location)
-{
-    return NS_OK;
-}
-
-/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */
-NS_IMETHODIMP 
-CDlgPrintListener::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const PRUnichar *aMessage)
-{
-    return NS_OK;
-}
-
-/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */
-NS_IMETHODIMP 
-CDlgPrintListener::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 state)
-{
-    return NS_OK;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CPrintProgressDialog dialog
-
-
-CPrintProgressDialog::CPrintProgressDialog(nsIWebBrowser* aWebBrowser,
-                                           nsIPrintSettings* aPrintSettings,
-                                           CWnd* pParent /*=NULL*/)
-	: CDialog(CPrintProgressDialog::IDD, pParent),
-  m_WebBrowser(aWebBrowser),
-  m_PrintListener(nsnull),
-  m_PrintSettings(aPrintSettings),
-  m_InModalMode(PR_FALSE)
-{
-	//{{AFX_DATA_INIT(CPrintProgressDialog)
-		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-CPrintProgressDialog::~CPrintProgressDialog()
-{
-  CDlgPrintListener * pl = (CDlgPrintListener*)m_PrintListener.get();
-  if (pl) {
-    pl->ClearDlg();
-  }
-}
-
-
-void CPrintProgressDialog::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CPrintProgressDialog)
-		// NOTE: the ClassWizard will add DDX and DDV calls here
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(CPrintProgressDialog, CDialog)
-	//{{AFX_MSG_MAP(CPrintProgressDialog)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CPrintProgressDialog message handlers
-static void GetLocalRect(CWnd * aWnd, CRect& aRect, CWnd * aParent)
-{
-  CRect wr;
-  aParent->GetWindowRect(wr);
-
-  CRect cr;
-  aParent->GetClientRect(cr);
-
-  aWnd->GetWindowRect(aRect);
-
-  int borderH = wr.Height() - cr.Height();
-  int borderW = (wr.Width() - cr.Width())/2;
-  aRect.top    -= wr.top+borderH-borderW;
-  aRect.left   -= wr.left+borderW;
-  aRect.right  -= wr.left+borderW;
-  aRect.bottom -= wr.top+borderH-borderW;
-
-}
-
-BOOL CPrintProgressDialog::OnInitDialog() 
-{
-	CDialog::OnInitDialog();
-	
-	CRect clientRect;
-	GetClientRect(&clientRect);
-
-	CRect titleRect;
-  GetLocalRect(GetDlgItem(IDC_PPD_DOC_TITLE_STATIC), titleRect, this);
-
-	CRect itemRect;
-  GetLocalRect(GetDlgItem(IDC_PPD_DOC_TXT), itemRect, this);
-
-  CRect progRect;
-  progRect.left   = titleRect.left;
-  progRect.top    = itemRect.top+itemRect.Height()+5;
-  progRect.right  = clientRect.Width()-(2*titleRect.left);
-  progRect.bottom = progRect.top+titleRect.Height();
-
-
-	m_wndProgress.Create (WS_CHILD | WS_VISIBLE, progRect, this, -1);
-	m_wndProgress.SetPos (0);
-	
-	return TRUE;  // return TRUE unless you set the focus to a control
-	              // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-
-int CPrintProgressDialog::DoModal( )
-{
-  PRBool doModal = PR_FALSE;
-  nsCOMPtr<nsIWebBrowserPrint> print(do_GetInterface(m_WebBrowser));
-  if(print) 
-  {
-    m_PrintListener = new CDlgPrintListener(this); // constructor addrefs
-    if (m_PrintListener) {
-      // doModal will be set to false if the print job was cancelled
-      nsIWebProgressListener * wpl = static_cast<nsIWebProgressListener*>(m_PrintListener);
-      doModal = NS_SUCCEEDED(print->Print(m_PrintSettings, wpl)) == PR_TRUE;
-    }
-  }
-
-  if (doModal) {
-    m_InModalMode = PR_TRUE;
-    return CDialog::DoModal();
-  }
-  return 0;
-}
-
-
-/* void OnStartPrinting (); */
-NS_IMETHODIMP 
-CPrintProgressDialog::OnStartPrinting()
-{
-  return NS_OK;
-}
-
-/* void OnProgressPrinting (in PRUint32 aProgress, in PRUint32 aProgressMax); */
-NS_IMETHODIMP 
-CPrintProgressDialog::OnProgressPrinting(PRUint32 aProgress, PRUint32 aProgressMax)
-{
-  if (m_wndProgress.m_hWnd == NULL) return NS_OK;
-
-  // Initialize the progress meter we we get the "zero" progress
-  // which also tells us the max progress
-  if (aProgress == 0) {
-	  CWnd *pWnd = GetDlgItem(IDC_PPD_DOC_TXT);
-	  if(pWnd)
-		  pWnd->SetWindowText(m_URL);
-
-	  m_wndProgress.SetRange(0, aProgressMax);
-    m_wndProgress.SetPos(0);
-  }
-	m_wndProgress.SetPos(aProgress);
-  RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW);
-
-  return NS_OK;
-}
-
-/* void OnEndPrinting (in PRUint32 aStatus); */
-NS_IMETHODIMP 
-CPrintProgressDialog::OnEndPrinting(PRUint32 aStatus)
-{
-  // Here we need to know whether we have gone "modal" 
-  // because we could get notified here if the user cancels
-  // before we ever get a chance to go into the modal loop
-  if (m_InModalMode) {
-    EndDialog(1);
-  }
-  return NS_OK;
-}
-
-void CPrintProgressDialog::OnCancel() 
-{
-  nsCOMPtr<nsIWebBrowserPrint> print(do_GetInterface(m_WebBrowser));
-  if (print) {
-    print->Cancel();
-  }
-
-	CDialog::OnCancel();
-}
-
-void CPrintProgressDialog::SetURI(const char* aTitle)
-{
-  m_URL = _T(aTitle);
-}
diff --git a/embedding/qa/testembed/PrintProgressDialog.h b/embedding/qa/testembed/PrintProgressDialog.h
deleted file mode 100644
index 47d77b1a567..00000000000
--- a/embedding/qa/testembed/PrintProgressDialog.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#if !defined(AFX_PRINTPROGRESSDIALOG_H__1BAF9B13_1875_11D5_9773_000064657374__INCLUDED_)
-#define AFX_PRINTPROGRESSDIALOG_H__1BAF9B13_1875_11D5_9773_000064657374__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// PrintProgressDialog.h : header file
-//
-
-#include "nsIWebProgressListener.h"
-class nsIWebBrowser;
-
-/////////////////////////////////////////////////////////////////////////////
-// CPrintProgressDialog dialog
-
-class CPrintProgressDialog : public CDialog
-{
-// Construction
-public:
-	CPrintProgressDialog(nsIWebBrowser* aWebBrowser, 
-                       nsIPrintSettings* aPrintSettings,
-                       CWnd* pParent = NULL);
-	virtual ~CPrintProgressDialog();
-  virtual int DoModal( );
-
-  // Helper
-  void SetURI(const char* aTitle);
-
-  NS_IMETHOD OnStartPrinting(void);
-  NS_IMETHOD OnProgressPrinting(PRUint32 aProgress, PRUint32 aProgressMax);
-  NS_IMETHOD OnEndPrinting(PRUint32 aStatus);
-
-// Dialog Data
-	//{{AFX_DATA(CPrintProgressDialog)
-	enum { IDD = IDD_PRINT_PROGRESS_DIALOG };
-		// NOTE: the ClassWizard will add data members here
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CPrintProgressDialog)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	CProgressCtrl              m_wndProgress;
-  CString                    m_URL;
-  nsIWebBrowser*             m_WebBrowser;
-  nsCOMPtr<nsIWebProgressListener> m_PrintListener;
-  nsIPrintSettings*          m_PrintSettings;
-  BOOL                       m_InModalMode;
-
-	// Generated message map functions
-	//{{AFX_MSG(CPrintProgressDialog)
-	virtual BOOL OnInitDialog();
-	virtual void OnCancel();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PRINTPROGRESSDIALOG_H__1BAF9B13_1875_11D5_9773_000064657374__INCLUDED_)
diff --git a/embedding/qa/testembed/ProfileMgr.cpp b/embedding/qa/testembed/ProfileMgr.cpp
deleted file mode 100644
index 7157235f793..00000000000
--- a/embedding/qa/testembed/ProfileMgr.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Mozilla browser.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Conrad Carlen <ccarlen@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Local Includes
-#include "stdafx.h"
-#include "Testembed.h"
-#include "ProfileMgr.h"
-#include "ProfilesDlg.h"
-
-// Mozilla Includes
-#include "nsString.h"
-#include "nsXPIDLString.h"
-#include "nsIRegistry.h"
-#include "nsIProfile.h"
-
-// Constants
-#define kRegistryGlobalPrefsSubtreeString (NS_LITERAL_STRING("global-prefs"))
-#define kRegistryShowProfilesAtStartup "start-show-dialog"
-
-//*****************************************************************************
-//***    CProfileMgr: Object Management
-//*****************************************************************************
-
-CProfileMgr::CProfileMgr()
-{
-}
-
-CProfileMgr::~CProfileMgr()
-{
-}
-
-
-//*****************************************************************************
-//***    CProfileMgr: Public Methods
-//*****************************************************************************
-    
-nsresult CProfileMgr::StartUp()
-{
-    nsresult rv;
-         
-    //NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
-    nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID,&rv));
-    if (NS_FAILED(rv)) return rv;
-        
-    PRInt32 profileCount;
-    rv = profileService->GetProfileCount(&profileCount);
-    if (NS_FAILED(rv)) return rv;
-    if (profileCount == 0)
-    {
-        // Make a new default profile
-        NS_NAMED_LITERAL_STRING(newProfileName, "default");
-
-        rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE);
-        if (NS_FAILED(rv)) return rv;
-        rv = profileService->SetCurrentProfile(newProfileName.get());
-        if (NS_FAILED(rv)) return rv;
-    }
-    else
-    {
-        // Use our flag here to chek for whether to show profile mgr UI. Ifc the flag
-        // says don't show it, just start with the last used profile.
-        
-        PRBool showIt;
-        rv = GetShowDialogOnStart(&showIt);
-                        
-        if (NS_FAILED(rv) || (profileCount > 1 && showIt))
-        {
-            DoManageProfilesDialog(TRUE);
-        }
-        else
-        {
-            // GetCurrentProfile returns the profile which was last used but is not nescesarily
-            // active. Call SetCurrentProfile to make it installed and active.
-            
-            nsXPIDLString   currProfileName;
-            rv = profileService->GetCurrentProfile(getter_Copies(currProfileName));
-            if (NS_FAILED(rv)) return rv;
-            rv = profileService->SetCurrentProfile(currProfileName);
-            if (NS_FAILED(rv)) return rv;
-        }    
-    }
-
-    return NS_OK;
-}
-
-nsresult CProfileMgr::DoManageProfilesDialog(PRBool bAtStartUp)
-{
-    CProfilesDlg    dialog;
-    nsresult        rv;
-    PRBool          showIt;
-
-    rv = GetShowDialogOnStart(&showIt);
-    dialog.m_bAtStartUp = bAtStartUp;
-    dialog.m_bAskAtStartUp = NS_SUCCEEDED(rv) ? showIt : TRUE;
-
-    if (dialog.DoModal() == IDOK)
-    {
-        SetShowDialogOnStart(dialog.m_bAskAtStartUp);
-         
-        //NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
-	    nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID,&rv));
-        if (NS_FAILED(rv))
-               rv = profileService->SetCurrentProfile(dialog.m_SelectedProfile.get());
-    }
-    return NS_OK;
-}
-    
- 
-//*****************************************************************************
-//***    CProfileMgr: Protected Methods
-//*****************************************************************************
-     
-nsresult CProfileMgr::GetShowDialogOnStart(PRBool* showIt)
-{
-    nsresult rv = NS_OK;
-        
-    *showIt = PR_TRUE;
-                
-    nsCOMPtr<nsIRegistry> registry(do_CreateInstance(NS_REGISTRY_CONTRACTID, &rv));
-    rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationRegistry);
-    if (NS_FAILED(rv)) return rv;
-
-    nsRegistryKey profilesTreeKey;
-    
-    rv = registry->GetKey(nsIRegistry::Common, 
-                          kRegistryGlobalPrefsSubtreeString.get(), 
-                          &profilesTreeKey);
-
-    if (NS_SUCCEEDED(rv)) 
-    {
-        PRInt32 flagValue;
-        rv = registry->GetInt(profilesTreeKey, 
-                              kRegistryShowProfilesAtStartup, 
-                              &flagValue);
-         
-        if (NS_SUCCEEDED(rv))
-            *showIt = (flagValue != 0);
-    }
-    return rv;        
-}
-
-nsresult CProfileMgr::SetShowDialogOnStart(PRBool showIt)
-{
-    nsresult rv = NS_OK;
-                        
-    nsCOMPtr<nsIRegistry> registry(do_CreateInstance(NS_REGISTRY_CONTRACTID, &rv));
-    rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationRegistry);
-    if (NS_FAILED(rv)) return rv;
-
-    nsRegistryKey profilesTreeKey;
-    
-    rv = registry->GetKey(nsIRegistry::Common, 
-                          kRegistryGlobalPrefsSubtreeString.get(), 
-                          &profilesTreeKey);
-
-    if (NS_FAILED(rv)) 
-    {
-        rv = registry->AddKey(nsIRegistry::Common, 
-                              kRegistryGlobalPrefsSubtreeString.get(), 
-                              &profilesTreeKey);
-    }
-    if (NS_SUCCEEDED(rv))
-    {
-    
-        rv = registry->SetInt(profilesTreeKey, 
-                              kRegistryShowProfilesAtStartup, 
-                              showIt);
-    }
-    
-    return rv;        
-}
-
diff --git a/embedding/qa/testembed/ProfileMgr.h b/embedding/qa/testembed/ProfileMgr.h
deleted file mode 100644
index db1c71441d4..00000000000
--- a/embedding/qa/testembed/ProfileMgr.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Mozilla browser.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Conrad Carlen <ccarlen@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __ProfileMgr__
-#define __ProfileMgr__
-
-// Mozilla Includes
-#include "nsError.h"
- 
-// Forward Declarations
-class nsIRegistry;
-
-//*****************************************************************************
-//***    CProfileMgr
-//*****************************************************************************
-
-class CProfileMgr
-{
-  public:
-                        CProfileMgr();
-    virtual             ~CProfileMgr();
-    
-    virtual nsresult    StartUp();
-    virtual nsresult    DoManageProfilesDialog(PRBool bAtStartUp);
-        // If bAtStartUp is TRUE, a profile must be selected.
-    
-  protected:
-      
-    nsresult            GetShowDialogOnStart(PRBool* showIt);
-    nsresult            SetShowDialogOnStart(PRBool showIt);
-};
-
-
-
-
-#endif
diff --git a/embedding/qa/testembed/ProfilesDlg.cpp b/embedding/qa/testembed/ProfilesDlg.cpp
deleted file mode 100644
index d2c017df11d..00000000000
--- a/embedding/qa/testembed/ProfilesDlg.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-// ProfilesDlg.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include <afxpriv.h>
-#include "Testembed.h"
-#include "ProfilesDlg.h"
-
-// Mozilla
-#include "nsIProfile.h"
-#include "nsIServiceManager.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-// Static Routines
-static void ValidateProfileName(const CString& profileName, CDataExchange* pDX)
-{
-    USES_CONVERSION;
-
-    nsresult rv;
-    PRBool exists = FALSE;
-
-    {
-        //NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
-	    nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID));
-        rv = profileService->ProfileExists(T2W(profileName), &exists);
-    }
-
-    if (NS_SUCCEEDED(rv) && exists)
-    {
-        CString errMsg;
-
-        errMsg.Format(_T("Error: A profile named \"%s\" already exists."), (const char *)profileName);
-        AfxMessageBox( errMsg, MB_ICONEXCLAMATION );
-        errMsg.Empty();
-        pDX->Fail();
-    }
-
-    if (profileName.FindOneOf("\\/") != -1)
-    {
-        AfxMessageBox( _T("Error: A profile name cannot contain the characters \"\\\" or \"/\"."), MB_ICONEXCLAMATION );
-        pDX->Fail();
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CNewProfileDlg dialog
-
-
-CNewProfileDlg::CNewProfileDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(CNewProfileDlg::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(CNewProfileDlg)
-	m_LocaleIndex = -1;
-	m_Name = _T("");
-	//}}AFX_DATA_INIT
-}
-
-
-void CNewProfileDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CNewProfileDlg)
-	DDX_CBIndex(pDX, IDC_LOCALE_COMBO, m_LocaleIndex);
-	DDX_Text(pDX, IDC_NEW_PROF_NAME, m_Name);
-	//}}AFX_DATA_MAP
-
-    pDX->PrepareEditCtrl(IDC_NEW_PROF_NAME);
-    if (pDX->m_bSaveAndValidate)
-    {
-        ValidateProfileName(m_Name, pDX);
-    }
-}
-
-
-BEGIN_MESSAGE_MAP(CNewProfileDlg, CDialog)
-	//{{AFX_MSG_MAP(CNewProfileDlg)
-		// NOTE: the ClassWizard will add message map macros here
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CNewProfileDlg message handlers
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CRenameProfileDlg dialog
-
-
-CRenameProfileDlg::CRenameProfileDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(CRenameProfileDlg::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(CRenameProfileDlg)
-	m_NewName = _T("");
-	//}}AFX_DATA_INIT
-}
-
-
-void CRenameProfileDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CRenameProfileDlg)
-	DDX_Text(pDX, IDC_NEW_NAME, m_NewName);
-	//}}AFX_DATA_MAP
-
-    pDX->PrepareEditCtrl(IDC_NEW_NAME);
-    if (pDX->m_bSaveAndValidate)
-    {
-        ValidateProfileName(m_NewName, pDX);
-    }
-}
-
-
-BEGIN_MESSAGE_MAP(CRenameProfileDlg, CDialog)
-	//{{AFX_MSG_MAP(CRenameProfileDlg)
-		// NOTE: the ClassWizard will add message map macros here
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CRenameProfileDlg message handlers
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CProfilesDlg dialog
-
-
-CProfilesDlg::CProfilesDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(CProfilesDlg::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(CProfilesDlg)
-    m_bAtStartUp = TRUE;
-	m_bAskAtStartUp = TRUE;
-	//}}AFX_DATA_INIT
-}
-
-
-void CProfilesDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CProfilesDlg)
-	DDX_Control(pDX, IDC_LIST1, m_ProfileList);
-	DDX_Check(pDX, IDC_CHECK_ASK_AT_START, m_bAskAtStartUp);
-	//}}AFX_DATA_MAP
-
-    if (pDX->m_bSaveAndValidate)
-    {
-        USES_CONVERSION;
-
-        int itemIndex = m_ProfileList.GetCurSel();
-        if (itemIndex != LB_ERR)
-        {
-            CString itemText;
-            m_ProfileList.GetText(itemIndex, itemText);
-            m_SelectedProfile.Assign(T2W(itemText));
-        }
-    }
-}
-
-
-BEGIN_MESSAGE_MAP(CProfilesDlg, CDialog)
-	//{{AFX_MSG_MAP(CProfilesDlg)
-	ON_BN_CLICKED(IDC_PROF_NEW, OnNewProfile)
-	ON_BN_CLICKED(IDC_PROF_RENAME, OnRenameProfile)
-	ON_BN_CLICKED(IDC_PROF_DELETE, OnDeleteProfile)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CProfilesDlg message handlers
-
-BOOL CProfilesDlg::OnInitDialog() 
-{
-    USES_CONVERSION;
-
-	CDialog::OnInitDialog();
-	
-    nsCAutoString   cStr;        
-    nsXPIDLString   curProfileName;
-
-    // Fill the list of profiles
-    nsresult rv;
-    //NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
-    nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID));
-    profileService->GetCurrentProfile(getter_Copies(curProfileName));
-
-    PRInt32     selectedRow = 0;
-    PRUint32    listLen;
-    PRUnichar   **profileList;
-    rv = profileService->GetProfileList(&listLen, &profileList);
-
-    for (PRUint32 index = 0; index < listLen; index++)
-    {
-        CString tmpStr(W2T(profileList[index]));
-        m_ProfileList.AddString(tmpStr);
-        if (nsCRT::strcmp(profileList[index], curProfileName.get()) == 0)
-            selectedRow = index;
-    }
-
-    m_ProfileList.SetCurSel(selectedRow);
-
-	if (m_bAtStartUp)
-    {
-        GetDlgItem(IDCANCEL)->EnableWindow(FALSE);
-    }
-	
-	return TRUE;  // return TRUE unless you set the focus to a control
-	              // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-void CProfilesDlg::OnNewProfile() 
-{
-	CNewProfileDlg dialog;
-
-    if (dialog.DoModal() == IDOK)
-    {
-        nsresult rv;
-
-        //NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
-	    nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID,&rv));
-        ASSERT(NS_SUCCEEDED(rv));
-        if (NS_SUCCEEDED(rv))
-        {
-            USES_CONVERSION;
-
-   		    rv = profileService->CreateNewProfile(T2W(dialog.m_Name), nsnull, nsnull, PR_FALSE);
-            ASSERT(NS_SUCCEEDED(rv));
-            if (NS_SUCCEEDED(rv))
-            {
-                int item = m_ProfileList.AddString(dialog.m_Name);
-                m_ProfileList.SetCurSel(item);
-                GetDlgItem(IDOK)->EnableWindow(TRUE);
-            }
-        }
-    }
-}
-
-void CProfilesDlg::OnRenameProfile() 
-{
-	CRenameProfileDlg dialog;
-
-    int itemIndex = m_ProfileList.GetCurSel();
-    ASSERT(itemIndex != LB_ERR);
-    if (itemIndex == LB_ERR)
-        return;
-
-    m_ProfileList.GetText(itemIndex, dialog.m_CurrentName);
-
-    if (dialog.DoModal() == IDOK)
-    {
-        USES_CONVERSION;
-
-        nsresult rv;
-
-        //NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
-	    nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID,&rv));
-        ASSERT(NS_SUCCEEDED(rv));
-        if (NS_SUCCEEDED(rv))
-        {
-            rv = profileService->RenameProfile(T2W(dialog.m_CurrentName), T2W(dialog.m_NewName));
-            ASSERT(NS_SUCCEEDED(rv));
-        }
-    }	
-}
-
-void CProfilesDlg::OnDeleteProfile() 
-{
-    int itemIndex = m_ProfileList.GetCurSel();
-
-    ASSERT(itemIndex != LB_ERR);
-    if (itemIndex == LB_ERR)
-        return;
-
-    CString selectedProfile;
-    m_ProfileList.GetText(itemIndex, selectedProfile);
-    
-    nsresult rv;
-    //NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
-    nsCOMPtr<nsIProfile> profileService(do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-	ASSERT(NS_SUCCEEDED(rv));
-    if (NS_SUCCEEDED(rv))
-    {
-        USES_CONVERSION;
-
-	    rv = profileService->DeleteProfile(T2W(selectedProfile), PR_TRUE);
-        ASSERT(NS_SUCCEEDED(rv));
-        if (NS_SUCCEEDED(rv))
-        {
-            int itemCount = m_ProfileList.DeleteString(itemIndex);
-            if (itemCount == 0)
-                GetDlgItem(IDOK)->EnableWindow(FALSE);
-        }
-    }	
-}
diff --git a/embedding/qa/testembed/ProfilesDlg.h b/embedding/qa/testembed/ProfilesDlg.h
deleted file mode 100644
index f82cb2d2c89..00000000000
--- a/embedding/qa/testembed/ProfilesDlg.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#if !defined(AFX_PROFILESDLG_H__48358887_EBFA_11D4_9905_00B0D0235410__INCLUDED_)
-#define AFX_PROFILESDLG_H__48358887_EBFA_11D4_9905_00B0D0235410__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// ProfilesDlg.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// CNewProfileDlg dialog
-
-class CNewProfileDlg : public CDialog
-{
-// Construction
-public:
-	CNewProfileDlg(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(CNewProfileDlg)
-	enum { IDD = IDD_PROFILE_NEW };
-	int		m_LocaleIndex;
-	CString	m_Name;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CNewProfileDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(CNewProfileDlg)
-		// NOTE: the ClassWizard will add member functions here
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// CRenameProfileDlg dialog
-
-class CRenameProfileDlg : public CDialog
-{
-// Construction
-public:
-	CRenameProfileDlg(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(CRenameProfileDlg)
-	enum { IDD = IDD_PROFILE_RENAME };
-	CString	m_NewName;
-	//}}AFX_DATA
-
-    CString     m_CurrentName;
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CRenameProfileDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(CRenameProfileDlg)
-		// NOTE: the ClassWizard will add member functions here
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// CProfilesDlg dialog
-
-class CProfilesDlg : public CDialog
-{
-// Construction
-public:
-	CProfilesDlg(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(CProfilesDlg)
-	enum { IDD = IDD_PROFILES };
-	CListBox	m_ProfileList;
-    BOOL        m_bAtStartUp;
-	BOOL	    m_bAskAtStartUp;
-	//}}AFX_DATA
-
-    nsAutoString m_SelectedProfile;
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CProfilesDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(CProfilesDlg)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnNewProfile();
-	afx_msg void OnRenameProfile();
-	afx_msg void OnDeleteProfile();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROFILESDLG_H__48358887_EBFA_11D4_9905_00B0D0235410__INCLUDED_)
diff --git a/embedding/qa/testembed/QaFindDlg.cpp b/embedding/qa/testembed/QaFindDlg.cpp
deleted file mode 100644
index 1b4971327b8..00000000000
--- a/embedding/qa/testembed/QaFindDlg.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// QaFindDlg.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "testembed.h"
-#include "QaFindDlg.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CQaFindDlg dialog
-
-
-CQaFindDlg::CQaFindDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(CQaFindDlg::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(QaFindDlg)
-		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-	m_textfield = _T("text");
-}
-
-
-void CQaFindDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CQaFindDlg)
-		// NOTE: the ClassWizard will add DDX and DDV calls here
-	DDX_Text(pDX, IDC_TEXTFIELD, m_textfield);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(CQaFindDlg, CDialog)
-	//{{AFX_MSG_MAP(CQaFindDlg)
-		// NOTE: the ClassWizard will add message map macros here
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CQaFindDlg message handlers
diff --git a/embedding/qa/testembed/QaFindDlg.h b/embedding/qa/testembed/QaFindDlg.h
deleted file mode 100644
index 977c30888d8..00000000000
--- a/embedding/qa/testembed/QaFindDlg.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#if !defined(AFX_QAFINDDLG_H__D27E3DAF_8479_11D6_9BC7_00C04FA02BE6__INCLUDED_)
-#define AFX_QAFINDDLG_H__D27E3DAF_8479_11D6_9BC7_00C04FA02BE6__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// QaFindDlg.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// QaFindDlg dialog
-
-class CQaFindDlg : public CDialog
-{
-// Construction
-public:
-	CQaFindDlg(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(CQaFindDlg)
-	enum { IDD = IDD_QAFINDDLG };
-		// NOTE: the ClassWizard will add data members here
-	//}}AFX_DATA
-	CString	m_textfield;
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CQaFindDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(CQaFindDlg)
-		// NOTE: the ClassWizard will add member functions here
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_QAFINDDLG_H__D27E3DAF_8479_11D6_9BC7_00C04FA02BE6__INCLUDED_)
diff --git a/embedding/qa/testembed/QaUtils.cpp b/embedding/qa/testembed/QaUtils.cpp
deleted file mode 100644
index dc44a1d2015..00000000000
--- a/embedding/qa/testembed/QaUtils.cpp
+++ /dev/null
@@ -1,508 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// These are utilities to help with QA tasks.
-
-// Includes routine to post results to a QA log file.
-
-#include "stdafx.h"
-#include "TestEmbed.h"
-#include "BrowserView.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "QAUtils.h"
-
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-storage getSupportObj;
-
-void RvTestResultDlg(nsresult rv, CString pLine,BOOL bClearList)
-{
-	static CShowTestResults dlgResult ;
-	if (!dlgResult)
-		dlgResult.Create(IDD_RUNTESTSDLG);
-
-	
-	if (bClearList)
-	{
-		dlgResult.m_ListResults.DeleteAllItems();
-		dlgResult.ShowWindow(true);
-	}
-
-	if (NS_FAILED(rv))
-	   dlgResult.AddItemToList(pLine,false);
-	else
-	   dlgResult.AddItemToList(pLine,true);
-
-}
-
-void RvTestResult(nsresult rv, const char *pLine, int displayMethod)
-{
-	// note: default displayMethod = 1 in .h file
-
-	CString strLine = pLine;
-	char theOutputLine[200];
-
-	if (NS_FAILED(rv))
-	   strLine += " failed.";
-	else
-	   strLine += " passed.";
-
-	strcpy(theOutputLine, strLine);
-	QAOutput(theOutputLine, displayMethod);
-}
-
-void WriteToOutputFile(const char *pLine) 
-{ 
-    CStdioFile myFile; 
-    CFileException e; 
-    CString strFileName = "c:\\temp\\TestOutput.txt"; 
-
-    if(! myFile.Open( strFileName, CStdioFile::modeCreate | CStdioFile::modeWrite
-								| CStdioFile::modeNoTruncate, &e ) ) 
-    { 
-        CString failCause = "Unable to open file. Reason : "; 
-        switch (e.m_cause) {
-        case CFileException::none:
-            failCause += "No error occurred.";
-            break;
-
-        case CFileException::generic:
-            failCause += "An unspecified error occurred.";
-            break;
-
-        case CFileException::fileNotFound:
-            failCause += "The file could not be located.";
-            break;
-
-        case CFileException::badPath:
-            failCause += "All or part of the path is invalid.";
-            break;
-
-        case CFileException::tooManyOpenFiles:
-            failCause += "The permitted number of open files was exceeded.";
-            break;
-
-        case CFileException::accessDenied:
-            failCause += "The file could not be accessed.";
-            break;
-
-        case CFileException::invalidFile:
-            failCause += "There was an attempt to use an invalid file handle.";
-            break;
-
-        case CFileException::removeCurrentDir:
-            failCause += "The current working directory cannot be removed.";
-            break;
-
-        case CFileException::directoryFull:
-            failCause += "There are no more directory entries.";
-            break;
-
-        case CFileException::badSeek:
-            failCause += "There was an error trying to set the file pointer.";
-            break;
-
-        case CFileException::hardIO:
-            failCause += "There was a hardware error.";
-            break;
-
-        case CFileException::sharingViolation:
-            failCause += "SHARE.EXE was not loaded, or a shared region was locked.";
-            break;
-
-        case CFileException::lockViolation:
-            failCause += "There was an attempt to lock a region that was already locked.";
-            break;
-
-        case CFileException::diskFull:
-            failCause += "The disk is full.";
-            break;
-
-        case CFileException::endOfFile:
-            failCause += "The end of file was reached.";
-            break;
-
-        default:
-            failCause += "Some reason not documented in <http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmfc98/html/_mfc_cfileexception.3a3a.m_cause.asp>.";
-            break;
-        }
-        AfxMessageBox(failCause);
-    } 
-    else 
-    { 
-		myFile.SeekToEnd();
-        CString strLine = pLine; 
-        strLine += "\r\n"; 
-
-        myFile.WriteString(strLine); 
-
-        myFile.Close(); 
-    } 
-} 
-
-void QAOutput(const char *pLine, int displayMethod)
-{
-	// note: default displayMethod = 1 in .h file
-	// displayMethod 0 = mfc dialog; 1 = output log file; 2 = both
-//#if 0
-   CString strLine = pLine;
-
-   if (displayMethod == 0)
-	   AfxMessageBox(strLine);
-   else if (displayMethod == 1)
-	   WriteToOutputFile(pLine);
-   else 
-   {
-       WriteToOutputFile(pLine);
-	   AfxMessageBox(strLine);
-   }
-//#endif
-}
-
-void FormatAndPrintOutput(const char *theInput, const char *theVar, int outputMode)
-{
-	nsCString outStr;
-	CString strMsg;
-
-	outStr = theInput;
-	outStr += theVar;
-
-	strMsg = outStr.get();
-
-	switch (outputMode)
-	{
-	case 0:
-		AfxMessageBox(strMsg); 
-		break;
-	case 1:
-		WriteToOutputFile(outStr.get());
-		break;
-	case 2:
-		WriteToOutputFile(outStr.get());
-		AfxMessageBox(strMsg); 
-		break;
-	}
-}
-
-void FormatAndPrintOutput(const char *theInput, nsCAutoString theVar, int outputMode)
-{
-	nsCString outStr;
-	CString strMsg;
-
-	outStr = theInput;
-	outStr += theVar;
-
-	strMsg = outStr.get();
-
-	switch (outputMode)
-	{
-	case 0:
-		AfxMessageBox(strMsg); 
-		break;
-	case 1:
-		WriteToOutputFile(outStr.get());
-		break;
-	case 2:
-		WriteToOutputFile(outStr.get());
-		AfxMessageBox(strMsg); 
-		break;
-	}
-}
-
-void FormatAndPrintOutput(const char *theInput, int theVar, int outputMode) 
-{
-	nsCString outStr;
-	CString strMsg;
-
-	outStr = theInput;
-	outStr.AppendInt(theVar);
-
-	strMsg = outStr.get();
-
-	switch (outputMode)
-	{
-	case 0:
-		AfxMessageBox(strMsg); 
-		break;
-	case 1:
-		WriteToOutputFile(outStr.get());
-		break;
-	case 2:
-		WriteToOutputFile(outStr.get());
-		AfxMessageBox(strMsg); 
-		break;
-	}
-}
-
-void FormatAndPrintOutput(const char *theInput, double theVar, int outputMode) 
-{
-	nsCString outStr;
-	CString strMsg;
-
-	outStr = theInput;
-	outStr.AppendFloat(theVar);
-
-	strMsg = outStr.get();
-
-	switch (outputMode)
-	{
-	case 0:
-		AfxMessageBox(strMsg); 
-		break;
-	case 1:
-		WriteToOutputFile(outStr.get());
-		break;
-	case 2:
-		WriteToOutputFile(outStr.get());
-		AfxMessageBox(strMsg); 
-		break;
-	}
-}
-
-void FormatAndPrintOutput(const char *theInput, PRUint32 theVar, int outputMode) 
-{
-	nsCString outStr;
-	CString strMsg;
-
-	outStr = theInput;
-	outStr.AppendFloat(theVar);
-
-	strMsg = outStr.get();
-
-	switch (outputMode)
-	{
-	case 0:
-		AfxMessageBox(strMsg); 
-		break;
-	case 1:
-		WriteToOutputFile(outStr.get());
-		break;
-	case 2:
-		WriteToOutputFile(outStr.get());
-		AfxMessageBox(strMsg); 
-		break;
-	}
-}
-
-// stringMsg is returned in case embeddor wishes to use it in the calling method.
-void RequestName(nsIRequest *request, nsCString &stringMsg, int displayMethod)
-{
-	nsresult rv;
-
-	if (!request) {
-		QAOutput("ERROR. nsIRequest object is Null. RequestName test fails.", displayMethod);
-		return;
-	}
-	else
-		rv = request->GetName(stringMsg);
-
-	if(NS_SUCCEEDED(rv))																
-		FormatAndPrintOutput("nsIRequest: The request name = ", stringMsg.get(), displayMethod);
-	else
-		QAOutput("nsIRequest: We didn't get the request name.", displayMethod);
-}
-
-void WebProgDOMWindowTest(nsIWebProgress *progress, const char *inString,
-								  int displayMethod)
-{
-	nsresult rv;
-	nsCString totalStr1, totalStr2;
-	nsCOMPtr<nsIDOMWindow> theDOMWindow;
-
-	totalStr1 = inString;
-	totalStr1 += ": Didn't get the DOMWindow. Test failed.";
-
-	totalStr2 = inString;
-	totalStr2 += ": nsIWebProgress:DOMWindow attribute test";
-
-	if (!progress) {
-		QAOutput("ERROR. nsIWebProgress object is Null. WebProgDOMWindowTest fails.", displayMethod);
-		return;
-	}
-	else
-		rv = progress->GetDOMWindow(getter_AddRefs(theDOMWindow));
-	if (!theDOMWindow)
-		QAOutput(totalStr1.get(), displayMethod);
-	else
-		RvTestResult(rv, totalStr2.get(), displayMethod);
-}
-
-void WebProgIsDocLoadingTest(nsIWebProgress *progress, const char *inString,
-								  int displayMethod)
-{
-	nsresult rv;
-	PRBool docLoading;
-	nsCString totalStr;
-
-	totalStr = inString;
-	totalStr += ": nsIWebProgress:IsDocumentLoading attribute test";
-
-	if (!progress) {
-		QAOutput("ERROR. nsIWebProgress object is Null. WebProgIsDocLoadingTest fails.", displayMethod);
-		return;
-	}
-	else
-	rv = progress->GetIsLoadingDocument(&docLoading);
-	RvTestResult(rv, totalStr.get(), displayMethod);
-	FormatAndPrintOutput("nsIWebProgress: isDocumentLoading return value = ", docLoading, displayMethod);
-}
-
-nsIDOMWindow * GetTheDOMWindow(nsIWebBrowser *webBrowser)
-{
-	nsCOMPtr<nsIDOMWindow> theDOMWindow;
-
-    webBrowser->GetContentDOMWindow(getter_AddRefs(theDOMWindow));
-    if (!theDOMWindow) {
-        QAOutput("Didn't get a DOM Window.");
-		return nsnull;
-	}
-	return (theDOMWindow);
-}
-
-nsCAutoString GetTheURI(nsIURI *theURI, int displayMethod)
-{
-	nsresult rv;
-	nsCAutoString uriString;
-
-	if (!theURI) {
-        QAOutput("nsIURI object is null. return failure.");
-		return uriString;  //dep 3/30
-	}
-	rv = theURI->GetSpec(uriString);
-    RvTestResult(rv, "nsIURI::GetSpec() test", displayMethod);
-    FormatAndPrintOutput("the uri = ", uriString, displayMethod);
-
-	return uriString;
-}
-
-// used for web progress listener in BrowserImplWebPrgrsLstnr.cpp
-void onStateChangeString(char *theStateType, char *theDocType, 
-						 nsCString stringMsg, PRUint32 status, int displayMode)
-{
-	nsCString totalMsg;
-
-	totalMsg = "OnStateChange(): ";
-	totalMsg += theStateType;
-	totalMsg += ", ";
-	totalMsg += theDocType;
-	totalMsg += ", ";
-	totalMsg += stringMsg;
-	totalMsg += ", status (hex) = ";
-	totalMsg.AppendInt(status, 16);
-	QAOutput(totalMsg.get(), displayMode);
-}
-
-void SaveObject(nsISupports *theSupports)
-{
-	getSupportObj.sup = theSupports;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CShowTestResults dialog
-
-
-CShowTestResults::CShowTestResults(CWnd* pParent /*=NULL*/)
-	: CDialog(CShowTestResults::IDD, pParent)
-{
-
-	//{{AFX_DATA_INIT(CShowTestResults)
-		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-
-}
-
-
-void CShowTestResults::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CShowTestResults)
-	DDX_Control(pDX, IDC_LIST1, m_ListResults);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(CShowTestResults, CDialog)
-	//{{AFX_MSG_MAP(CShowTestResults)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CShowTestResults message handlers
-
-BOOL CShowTestResults::OnInitDialog() 
-{
-	
-	CDialog::OnInitDialog();
-	
-	m_ListResults.InsertColumn(0,"Test Case",LVCFMT_LEFT,360);
-	m_ListResults.InsertColumn(1,"Result",LVCFMT_LEFT,100);
-	
-	return TRUE;  // return TRUE unless you set the focus to a control
-	              // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-
-void CShowTestResults::AddItemToList(LPCTSTR szTestCaseName, BOOL bResult) 
-{
-	LV_ITEM lvitem ;
-		
-	lvitem.mask = LVIF_TEXT;
-	lvitem.iItem = m_ListResults.GetItemCount();
-	lvitem.iSubItem = 0;
-	lvitem.pszText = (LPTSTR)szTestCaseName ;
-	//Insert the main item
-	m_ListResults.InsertItem(&lvitem);
-
-	if (bResult)
-	m_ListResults.SetItemText(m_ListResults.GetItemCount()-1,1,"Passed");
-	else
-	m_ListResults.SetItemText(m_ListResults.GetItemCount()-1,1,"Failed");
-
-	//Insert the sub item
-	//m_ListResults.InsertItem(&lvitem);
-
-}
diff --git a/embedding/qa/testembed/QaUtils.h b/embedding/qa/testembed/QaUtils.h
deleted file mode 100644
index d197583cfb6..00000000000
--- a/embedding/qa/testembed/QaUtils.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// QAUtils.h : Global function declarations
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _QAUTILS_H
-#define _QAUTILS_H
-
-#if _MSC_VER > 1000
-	#pragma once
-#endif
-
-#include "BrowserView.h"
-#include "resource.h"
-#include "stdafx.h"
-
-extern void RvTestResultDlg(nsresult rv, CString pLine,BOOL bClearList = false);
-extern void RvTestResult(nsresult, const char *, int displayMethod=1);
-extern void WriteToOutputFile(const char *);
-extern void QAOutput(const char *pLine, int displayMethod=1);
-extern void FormatAndPrintOutput(const char *, const char *, int);
-extern void FormatAndPrintOutput(const char *, nsCAutoString, int);
-extern void FormatAndPrintOutput(const char *, int, int);
-extern void FormatAndPrintOutput(const char *, double, int);
-extern void FormatAndPrintOutput(const char *, PRUint32, int);
-extern void RequestName(nsIRequest *, nsCString &, int displayMethod=1);
-extern void WebProgDOMWindowTest(nsIWebProgress *, const char *,int displayMethod=1);
-extern void WebProgIsDocLoadingTest(nsIWebProgress *, const char *, int displayMethod=1);
-extern void SaveObject(nsISupports *theSupports);
-extern nsIDOMWindow * GetTheDOMWindow(nsIWebBrowser *);
-extern nsCAutoString GetTheURI(nsIURI *theURI, int displayMethod=1);
-extern void onStateChangeString(char *, char *, nsCString, PRUint32, int displayMethod=1);
-extern nsresult rv;
-
-#endif //_QAUTILS_H/////////////////////////////////////////////////////////////////////////////
-
-
-// CShowTestResults dialog
-class CShowTestResults : public CDialog
-{
-// Construction
-public:
-	CShowTestResults(CWnd* pParent = NULL);   // standard constructor
-	void AddItemToList(LPCTSTR szTestCaseName, BOOL bResult);
-
-// Dialog Data
-	//{{AFX_DATA(CShowTestResults)
-	enum { IDD = IDD_RUNTESTSDLG };
-	CListCtrl	m_ListResults;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CShowTestResults)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-private:
-	LPCTSTR m_TitleString ;
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(CShowTestResults)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-
-typedef struct {
-	nsCOMPtr<nsISupports> sup;
-}storage;
-
-
diff --git a/embedding/qa/testembed/README.TXT b/embedding/qa/testembed/README.TXT
deleted file mode 100644
index aa6f853f5dc..00000000000
--- a/embedding/qa/testembed/README.TXT
+++ /dev/null
@@ -1,221 +0,0 @@
-***** BEGIN LICENSE BLOCK *****
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
-The contents of this file are subject to the Mozilla Public License Version 
-1.1 (the "License"); you may not use this file except in compliance with 
-the License. You may obtain a copy of the License at 
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
-
-The Original Code is is mozilla.org code.
-
-The Initial Developer of the Original Code is 
-Netscape Communications Corporation.
-Portions created by the Initial Developer are Copyright (C) 1998
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Chak Nanga <chak@netscape.com>
-  David Epstein <depstein@netscape.com>
-
-Alternatively, the contents of this file may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the MPL, the GPL or the LGPL.
-
-***** END LICENSE BLOCK *****
-
-TestEmbed is a C++ test app based upon mfcEmbed. It includes
-individual test cases for Embedding interface methods. Interfaces
-covered include nsIFile & nsILocalFile, nsISHistory, nsIWebNavigation,
-nsIWebProgressListener, nsIClipboardCommands, nsIRequest, nsIDOMWindow,
-nsIDirectoryService, nsIProfile, nsIObserverService, nsIWebBrowser,
-nsIWebProgress, nsIWebBrowserFind, nsIEditingSession, nsICommandManager,
-nsICommandParams, nsIStreamListener, nsIURIContentListener,
-nsISHistoryListener, nsIWebBrowserChrome, and nsIEmbeddingSiteWindow.
-.
-Individual tests also exist for methods found in nsIGlobalHistory
-and nsIProfile.
-
-In addition to the mfcEmbed menus, it contains 5 menus: Tests,
-Interfaces, Tools, Verified Bugs, and Clipboard Commands.
-
-Executed test cases print output to a logfile called TestOutput.txt.
-This will be created in the C:\temp folder.
-
-See build instructions below.
-	
-General Overview:
------------------
-
-1. The TestEmbedApp creates BrowserFrames
-
-2. BrowserFrame creates the toolbar, statusbar, URLbar 
-   BrowserView etc.
-   BrowserFrames implement the IBrowserFrameGlue interface
-   using which new BrowserFrames can be created, statusbar
-   updated etc. 
-
-3. BrowserView creates the embeddable browser instance and
-   manages user interaction such as URL navigation etc.
-   BrowserView connects the BrowserImpl with the BrowserFrame
-   via the IBrowserFrameGlue interface
-
-4. BrowserImpl implements the set of required/optional Gecko
-   embedding interfaces
-   
-
-Start by first looking at TestEmbed.cpp
-
-Files:
-
-StdAfx.h	 
-	- Includes the required Mozilla header files
-
-TestEmbed.cpp 
-	- CWinApp derived class
-	- Creates the browser's main frame window etc
-	  using the CreateNewBrowserFrame() and loads
-	  the HomePage
-	- Makes the required NS_InitEmbedding() and the
-	  NS_TermEmbedding() calls in the app's InitInstance()
-	  and ExitInstance() functions
-	- Keeps track of the list of new BrowserFrames created
-	  which it cleans up properly in ExitInstance()
-
-BrowserFrm.cpp 
-	- This is the browser's Frame window i.e. the one with the
-	  "chrome" - with the toolbar, urlbar etc.
-	- Creates the toolbar, URLbar, statusbar, progressbar 
-	  also the browser's view window. 
-
-BrowserFrameGlue.cpp
-	- Implements the IBrowserFrameGlue interface. This interface
-	  contains platform specific implementations of functions to
-	  update the statusbar, creating new browser frames etc. Embedded
-	  browser's callbacks use this interface when needed
-
-BrowserView.cpp 
-	- Creates the embedded browser object and handles most aspects
-	of the embedded browser interactions - like URL navigation,
-	clipboard interactions etc
-	- Also has code to keep the menu/toolbar/statusbar UI items up 
-	to date
-	- It's the view which conntects the BrowserFrame to the BrowserImpl
-	  (see below) by passing it the pointer to IBrowserFrameGlue
-
-BrowserImpl*.cpp 
-	- Implements the required and/or optional embedded browser 
-	interfaces
-	(BrowserImpl.cpp implements the set of interfaces which 
-	are required by Gecko of all embedding apps. The other
-	interfaces implemented in the BrowserImpl*.cpp files are 
-	optional. Included in the BrowserImpl.cpp file are interface tests for 					nsIWebBrowserChrome,nsIEmbeddingSiteWindow, nsIStreamListener, and 				nsIURIContentListener.)
-
-	- Calls on the statusbar/progressbar update functions exposed
-	via the IBrowserFrameGlue in response to the nsIWebProgressListener
-	interface callbacks. nsIWebProgressListener methods are implemented
-	in BrowserImplWebPrgrsLstnr.cpp. nsISHistoryListener methods are
-	implemented in BrowserImplHistoryLstnr.cpp
-
-Dialogs.cpp
-	- Contains dialog box code for displaying Prompts, getting
-	passwords, getting username/passwords etc
-	- Contains the CFindDialog class - used for searching text
-	in a web page
-
-winEmbedFileLocProvider.cpp, ProfilesDlg.cpp, ProfileMgr.cpp
-	- Profile management related code (by Conrad Carlen)
-
-Tests.cpp
-	- This is where individual test cases are stored and test interfaces are
-	registered. The file is divided into three sections: 1) individual test 
-	cases corresponding to the "Tests" menu. 2) tools that are helpful,
-	corresponding to the "Tools" menu. These include routines like
-	removing all entries from Global History. 3) Registration of
-	interface tests with CTests object (bottom part of the file). Example: 
-
-	void CTests::OnInterfacesNsidomwindow()
-	{
-		CDomWindow oDomWindow(qaWebBrowser) ;
-		oDomWindow.OnStartTests(nCommandID);
-	}
-
-	The interface tests OnInterfacesNsidomwindow() is associated with menu
-	handlers in the message map (in top part of the file). For this example,
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_RUNALLTESTS, OnInterfacesNsidomwindow).
-	The test interface object (oDomWindow) is created with appropriate constructor.
-	Then the object calls the test interface's OnStartTests() method and passes
-	the selected command ID.
-
-
-QAUtils.cpp
-	- This contains routines that are useful to QA. Such tasks as
-	printing to a logfile, displaying messages to the screen, formatting
-	output data, retrieving the name of an nsI request, and getting a urI 
-	are stored here.
-
-makefile.in
-	- We define "_AFXDLL" and for the compiler and specify
-	"-SUBSYSTEM:windows" for the linker using LCFLAGS and 
-	LLFLAGS, respectively
-	- We also define "USE_SINGLE_SIGN_ON" to enable the
-	single sign-on support
-	- Also need REQUIRES for all modules to be included
-	- Place all .cpp files for compiling in CPPSRCS section.
-
-testembed.dsp and testembed.dsw
-	- These VisualStudio workspace/project files can be used
-	to open/build this sample inside of the VC++ IDE
-
-Most interface tests have their own .cpp & .h files (e.g. nsIWebBrow.cpp).
-
-Instructions for building:
-	1) Open a dos shell.
-	2) cd /mozilla/embedding/qa/testembed	   // testEmbed directory
-	3) Copy the makefile.in file and call it makefile. Place in same directory.
-	4) Change the top few lines in 'makefile' to indicate local pathway. Example:
-		DEPTH		= ../../..
-		topsrcdir	= d:/mozilla_src/mozilla
-		srcdir		= d:/mozilla_src/mozilla/embedding/qa/testembed
-		VPATH		= d:/mozilla_src/mozilla/embedding/qa/testembed
-	5) cd components			  // components directory
-	6) Copy the makefile.in file and call it makefile. Place in same directory.
-	7) Change the top few lines in 'makefile' to indicate local pathway. Example:
-		DEPTH		= ../../../..
-		topsrcdir    = d:/mozilla_src/mozilla
-		srcdir       = d:/mozilla_src/mozilla/embedding/qa/testembed/components
-		VPATH        = d:/mozilla_src/mozilla/embedding/qa/testembed/components
-	8) make				   	// compile 'makefile.in' in components
-	9) cd ..				// return to testembed folder
-	10) make				// compile 'makefile.in' in testembed
-	11) cd ../../../dist/bin/	   	// navigate to the bin dir
-	12) testembed.exe			// run testEmbed.exe
-
-	note: if 'make' doesn't work above, try 'make -f makefile.in'
-
-A few suggestions:
-	1) Don't run nsIWebNavigation tests after turning on the Web
-	Progress listener (from Tests menu). This will create all types
-	of listener msgs in your logfile and display many msgs on the 
-	screen.
-	2) Best way to use web progress listener is to turn it on (from 
-	the Tests menu)then change URL . Change a few more urls and
-	monitor the output.
-	3) Before running nsISHistory interface tests, load 1-2 urls.
-	That will create a session history. The same applies for the
-	nsIWebNavigation interfaces tests. One loaded url will enable
-	back/forward navigation.
-	4) nsIUriContentListener is registered from the "Tests" >
-	"Add urIContentListener" menu. There are submenu items for different options. 
diff --git a/embedding/qa/testembed/Selection.cpp b/embedding/qa/testembed/Selection.cpp
deleted file mode 100644
index 1e385eb491d..00000000000
--- a/embedding/qa/testembed/Selection.cpp
+++ /dev/null
@@ -1,619 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// Test cases for the nsISelection Interface
-
-#include "stdafx.h"
-#include "QaUtils.h"
-#include <stdio.h>
-#include "Selection.h"
-
-CSelection::CSelection(nsIWebBrowser* mWebBrowser)
-{
-	qaWebBrowser = mWebBrowser;
-}
-
-
-CSelection::~CSelection()
-{
-}
-
-
-void CSelection::OnStartTests(UINT nMenuID)
-{
-	// Calls  all or indivdual test cases on the basis of the 
-	// option selected from menu.
-
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSISELECTION_RUNALLTESTS	:
-			RunAllTests();
-			break ;
-		case ID_INTERFACES_NSISELECTION_GETANCHORNODE :
-			GetAnchorNode();
-			break ;
-		case ID_INTERFACES_NSISELECTION_GETANCHOROFFSET :
-			GetAnchorOffset();
-			break ;
-		case ID_INTERFACES_NSISELECTION_GETFOCUSNODE :
-			 GetFocusNode() ;
-			break ;
-		case ID_INTERFACES_NSISELECTION_GETFOCUSOFFSET :
-			GetFocusOffset() ;
-			break ;
-		case ID_INTERFACES_NSISELECTION_GETISCOLLAPSED :
-			GetIsCollapsed() ;
-			break ;
-		case ID_INTERFACES_NSISELECTION_GETRANGECOUNT :
-			GetRangecount() ;
-			break ;
-		case ID_INTERFACES_NSISELECTION_GETRANGEAT :
-			GetRangeAt() ;
-			break ;
-		case ID_INTERFACES_NSISELECTION_COLLAPSE :
-			Collapse() ;
-			break ;
-		case ID_INTERFACES_NSISELECTION_EXTEND :
-			Extend() ;
-			break ;
-		case ID_INTERFACES_NSISELECTION_COLLAPSETOSTART :
-			CollapseToStart() ;
-			break ;
-		case ID_INTERFACES_NSISELECTION_COLLAPSETOEND :
-			CollapseToEnd() ;
-			break ;
-		case ID_INTERFACES_NSISELECTION_CONTAINSNODE :
-			ContainsNode() ;
-			break ;
-		case ID_INTERFACES_NSISELECTION_SELECTALLCHILDREN :
-			SelectAllChildren();
-			break ;
-		case ID_INTERFACES_NSISELECTION_ADDRANGE :
-			Addrange();
-			break ;
-		case ID_INTERFACES_NSISELECTION_REMOVERANGE :
-			RemoveRange();
-			break ;
-		case ID_INTERFACES_NSISELECTION_REMOVEALLRANGES :
-			RemoveAllRanges();
-			break ;
-		case ID_INTERFACES_NSISELECTION_DELETEFROMDOCUMENT :
-			DeleteFromDocument();
-			break ;
-		case ID_INTERFACES_NSISELECTION_SELECTIONLANGUAGECHANGE :
-			SelectionLanguageChange();
-			break ;
-		case ID_INTERFACES_NSISELECTION_TOSTRING :
-			ToString();
-			break ;
-	}
-
-}
-
-void CSelection::RunAllTests()
-{
-
-	PRInt32 ancoroffset = 0;
-	PRInt32 focusoffset = 0;
-	PRInt32 rangecount = 0;
-	PRInt32 index = 0;
-	PRBool  bisCollapsed = false;
-	PRBool  bContains = false;
-	nsXPIDLString szText;
-	
-	nsCOMPtr<nsISelection> oNsSelection ;
-	nsCOMPtr<nsIDOMNode> oNsDOMAnchorNode ;
-	nsCOMPtr<nsIDOMNode> oNsDOMFocusNode ;
-	nsCOMPtr<nsIDOMRange> oNsDOMRange ;
-
-	oNsSelection = GetSelectionObject(true);
-	if (!oNsSelection)
-		return ;
-
-//---------------- Test case for AnchorNode Attribute
-
-	rv = oNsSelection->GetAnchorNode(getter_AddRefs(oNsDOMAnchorNode));
-    RvTestResultDlg(rv, "nsISelection::GetAnchorNode() ");
-	if (!oNsDOMAnchorNode)
-		RvTestResultDlg(rv, "------>No Selection made to get the AnchorNode object");
-
-//---------------- Test case for AnchorOffset Attribute
-
-	rv = oNsSelection->GetAnchorOffset(&ancoroffset);
-	RvTestResultDlg(rv, "nsISelection::GetAnchorOffset()");
-
-
-//---------------- Test case for FocusNode Attribute
-
-	rv = oNsSelection->GetFocusNode(getter_AddRefs(oNsDOMFocusNode));
-    RvTestResultDlg(rv, "nsISelection::GetFocusNode() ");
-	if (!oNsDOMFocusNode)
-		RvTestResultDlg(rv, "------>No Selection made to get the FocusNode object");
-
-//---------------- Test case for FocusOffset Attribute
-
-	rv = oNsSelection->GetFocusOffset(&focusoffset);
-	RvTestResultDlg(rv, "nsISelection::GetFocusOffset()");	
-
-//---------------- Test case for isCollapsed Attribute
-
-	rv = oNsSelection->GetIsCollapsed(&bisCollapsed);
-	RvTestResultDlg(rv, "nsISelection::GetIsCollapsed()");	
-	if(bisCollapsed)
-		RvTestResultDlg(rv, "------> Returned value for IsCollapsed is true");	
-	else
-		RvTestResultDlg(rv, "------> Returned value for IsCollapsed is false");	
-
-	
-//---------------- Test case for isCollapsed Attribute
-
-	rv = oNsSelection->GetRangeCount(&rangecount);
-	RvTestResultDlg(rv, "nsISelection::GetRangeCount()");	
-
-
-//---------------- Test case for GetRangeAt function
-
-		rv = oNsSelection->GetRangeAt(index,getter_AddRefs(oNsDOMRange));
-		RvTestResultDlg(rv, "nsISelection::GetRangeAt() ");
-		if (!oNsDOMRange)
-			RvTestResultDlg(rv, "------>Not able to get nsIDOMRange object");
-
-
-//---------------- Test case for Collapse function
-
-	rv = oNsSelection->Collapse(oNsDOMFocusNode,1) ;
-	    RvTestResultDlg(rv, "nsISelection::Collapse() ");
-
-//---------------- Test case for Extend function
-
-	rv = oNsSelection->Extend(oNsDOMFocusNode,10) ;
-	    RvTestResultDlg(rv, "nsISelection::Extend() ");
-	
-//---------------- Test case for CollapseToStart function
-
-	rv = oNsSelection->CollapseToStart();
-	    RvTestResultDlg(rv, "nsISelection::CollapseToStart() ");
-
-//---------------- Test case for CollapseToEnd function
-
-	rv = oNsSelection->CollapseToEnd();
-	    RvTestResultDlg(rv, "nsISelection::CollapseToEnd() ");
-
-//---------------- Test case for ContainsNode function
-
-	rv = oNsSelection->ContainsNode(oNsDOMFocusNode,PR_TRUE, &bContains);
-	    RvTestResultDlg(rv, "nsISelection::ContainsNode() ");
-	if(bContains)
-		RvTestResultDlg(rv, "------> Returned value for ContainsNode is true");	
-	else
-		RvTestResultDlg(rv, "------> Returned value for ContainsNode is false");
-
-
-//---------------- Test case for SelectAllChildren function
-
-	rv = oNsSelection->SelectAllChildren(oNsDOMFocusNode);
-	    RvTestResultDlg(rv, "nsISelection::SelectAllChildren() ");
-
-//---------------- Test case for Addrange function
-
-	rv = oNsSelection->AddRange(oNsDOMRange);
-	    RvTestResultDlg(rv, "nsISelection::Addrange() ");
-
-//---------------- Test case for RemoveRange function
-
-	rv = oNsSelection->RemoveRange(oNsDOMRange);
-	    RvTestResultDlg(rv, "nsISelection::RemoveRange() ");
-
-//---------------- Test case for RemoveAllRanges function
-
-	rv = oNsSelection->RemoveAllRanges();
-	    RvTestResultDlg(rv, "nsISelection::RemoveAllRanges() ");
-
-//---------------- Test case for DeleteFromDocument function
-
-	rv = oNsSelection->DeleteFromDocument();
-	    RvTestResultDlg(rv, "nsISelection::DeleteFromDocument() ");
-
-//---------------- Test case for SelectionLanguageChange function
-
-	rv = oNsSelection->SelectionLanguageChange(PR_FALSE);
-	    RvTestResultDlg(rv, "nsISelection::SelectionLanguageChange() ");
-
-//---------------- Test case for ToString function
-
-	rv = oNsSelection->ToString(getter_Copies(szText));
-	    RvTestResultDlg(rv, "nsISelection::ToString() ");
-}
-
-
-void CSelection::GetAnchorNode() 
-{
-
-	nsCOMPtr<nsIDOMNode> oNsDOMAnchorNode ;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetAnchorNode(getter_AddRefs(oNsDOMAnchorNode));
-    RvTestResult(rv, "nsISelection::GetAnchorNode() ",0);
-	if (!oNsDOMAnchorNode)
-		RvTestResult(rv, "------>No Selection made to get the AnchorNode object",0);
-}
-
-
-void CSelection::GetAnchorOffset()
-{
-
-	PRInt32 ancoroffset = 0;
-	//char szstr[10] ;
-
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetAnchorOffset(&ancoroffset);
-	RvTestResult(rv, "nsISelection::GetAnchorOffset()",0);
-	//ltoa(ancoroffset,	szstr,10);
-	//AfxMessageBox(szstr);
-}
-
-void CSelection::GetFocusNode() 
-{
-	nsCOMPtr<nsIDOMNode> oNsDOMFocusNode ;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetFocusNode(getter_AddRefs(oNsDOMFocusNode));
-    RvTestResult(rv, "nsISelection::GetFocusNode() ",0);
-	if (!oNsDOMFocusNode)
-		RvTestResult(rv, "------>No Selection made to get the FocusNode object",0);
-}
-
-void CSelection::GetFocusOffset() 
-{
-	PRInt32 focusoffset = 0;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetFocusOffset(&focusoffset);
-	RvTestResult(rv, "nsISelection::GetFocusOffset()",0);	
-
-}
-
-void CSelection::GetIsCollapsed() 
-{
-	PRBool  bisCollapsed = false;
-
-	nsCOMPtr<nsISelection> oSelection ;
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetIsCollapsed(&bisCollapsed);
-	RvTestResult(rv, "nsISelection::GetIsCollapsed()",0);	
-	if(bisCollapsed)
-		RvTestResult(rv, "------> Returned value for IsCollapsed is true",0);	
-	else
-		RvTestResult(rv, "------> Returned value for IsCollapsed is false",0);	
-}
-
-void CSelection::GetRangecount() 
-{
-	PRInt32 rangecount = 0;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-	rv = oSelection->GetRangeCount(&rangecount);
-	RvTestResult(rv, "nsISelection::GetRangeCount()",0);	
-	char szstr[10] ;
-	ltoa(rangecount,	szstr,10);
-	AfxMessageBox(szstr);
-}
-
-
-void CSelection::GetRangeAt() 
-{
-	PRInt32 index = 0;
-	nsCOMPtr<nsIDOMRange> oNsDOMRange ;
-
-	nsCOMPtr<nsISelection> oSelection ;
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-	rv = oSelection->GetRangeAt(index,getter_AddRefs(oNsDOMRange));
-	RvTestResult(rv, "nsISelection::GetRangeAt() ",0);
-	if (!oNsDOMRange)
-		RvTestResult(rv, "------>Not able to get nsIDOMRange object",0);
-
-
-}
-
-void CSelection::Collapse() 
-{
-
-	nsCOMPtr<nsIDOMNode> oNsDOMFocusNode ;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetFocusNode(getter_AddRefs(oNsDOMFocusNode));
-    RvTestResult(rv, "nsISelection::GetFocusNode() ",0);
-	if (!oNsDOMFocusNode)
-		RvTestResult(rv, "------>No Selection made to get the FocusNode object",0);
-
-	rv = oSelection->Collapse(oNsDOMFocusNode,1) ;
-    RvTestResult(rv, "nsISelection::Collapse() ",0);
-
-}
-
-void CSelection::Extend() 
-{
-	nsCOMPtr<nsIDOMNode> oNsDOMFocusNode ;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetFocusNode(getter_AddRefs(oNsDOMFocusNode));
-    RvTestResult(rv, "nsISelection::GetFocusNode() ",0);
-	if (!oNsDOMFocusNode)
-		RvTestResult(rv, "------>No Selection made to get the FocusNode object",0);
-
-
-	rv = oSelection->Extend(oNsDOMFocusNode,10) ;
-    RvTestResult(rv, "nsISelection::Extend() ",0);
-
-
-}
-
-void CSelection::CollapseToStart()
-{
-	nsCOMPtr<nsISelection> oSelection ;
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-	rv = oSelection->CollapseToStart();
-	    RvTestResult(rv, "nsISelection::CollapseToStart() ",0);
-
-}
-
-void CSelection::CollapseToEnd()
-{
-	nsCOMPtr<nsISelection> oSelection ;
-	oSelection = GetSelectionObject();
-	rv = oSelection->CollapseToEnd();
-	    RvTestResult(rv, "nsISelection::CollapseToEnd() ",0);
-}
-
-void CSelection::ContainsNode()
-{
-	PRBool  bContains = false;
-
-	nsCOMPtr<nsIDOMNode> oNsDOMFocusNode ;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetFocusNode(getter_AddRefs(oNsDOMFocusNode));
-    RvTestResult(rv, "nsISelection::GetFocusNode() ",0);
-	if (!oNsDOMFocusNode)
-		RvTestResult(rv, "------>No Selection made to get the FocusNode object",0);
-
-
-	rv = oSelection->ContainsNode(oNsDOMFocusNode,PR_TRUE, &bContains);
-	    RvTestResult(rv, "nsISelection::ContainsNode() ",0);
-	if(bContains)
-		RvTestResult(rv, "------> Returned value for ContainsNode is true",0);	
-	else
-		RvTestResult(rv, "------> Returned value for ContainsNode is false",0);
-}
-
-void CSelection::SelectAllChildren()
-{
-	nsCOMPtr<nsIDOMNode> oNsDOMFocusNode ;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetFocusNode(getter_AddRefs(oNsDOMFocusNode));
-    RvTestResult(rv, "nsISelection::GetFocusNode() ",0);
-	if (!oNsDOMFocusNode)
-		RvTestResult(rv, "------>No Selection made to get the FocusNode object",0);
-
-
-	rv = oSelection->SelectAllChildren(oNsDOMFocusNode);
-	    RvTestResult(rv, "nsISelection::SelectAllChildren() ",0);
-
-}
-
-void CSelection::Addrange()
-{	
-	PRInt32 index= 0;
-	
-	nsCOMPtr<nsIDOMRange> oNsDOMRange ;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetRangeAt(index,getter_AddRefs(oNsDOMRange));
-	RvTestResult(rv, "nsISelection::GetRangeAt() ",0);
-	if (!oNsDOMRange)
-		RvTestResult(rv, "------>Not able to get nsIDOMRange object",0);
-
-	rv = oSelection->AddRange(oNsDOMRange);
-	    RvTestResult(rv, "nsISelection::Addrange() ",0);
-
-}
-
-void CSelection::RemoveRange()
-{ 
-	PRInt32 index= 0;
-
-	nsCOMPtr<nsIDOMRange> oNsDOMRange ;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->GetRangeAt(index,getter_AddRefs(oNsDOMRange));
-	RvTestResult(rv, "nsISelection::GetRangeAt() ",0);
-	if (!oNsDOMRange)
-		RvTestResult(rv, "------>Not able to get nsIDOMRange object",0);
-
-	rv = oSelection->RemoveRange(oNsDOMRange);
-	    RvTestResult(rv, "nsISelection::RemoveRange() ",0);
-}
-
-void CSelection::RemoveAllRanges()
-{ 
-	nsCOMPtr<nsISelection> oSelection ;
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-	rv = oSelection->RemoveAllRanges();
-	    RvTestResult(rv, "nsISelection::RemoveAllRanges() ",0);
-
-}
-
-void CSelection::DeleteFromDocument()
-{ 
-	nsCOMPtr<nsISelection> oSelection ;
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-	rv = oSelection->DeleteFromDocument();
-	    RvTestResult(rv, "nsISelection::DeleteFromDocument() ",0);
-
-}
-
-void CSelection::SelectionLanguageChange()
-{ 
-	nsCOMPtr<nsISelection> oSelection ;
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-
-	rv = oSelection->SelectionLanguageChange(PR_TRUE);
-	    RvTestResult(rv, "nsISelection::SelectionLanguageChange() ",0);
-
-}
-
-void CSelection::ToString()
-{ 
-	nsXPIDLString szText;
-	nsCOMPtr<nsISelection> oSelection ;
-
-	oSelection = GetSelectionObject();
-	if (!oSelection)
-		return ;
-	rv = oSelection->ToString(getter_Copies(szText));
-    RvTestResult(rv, "nsISelection::ToString() ",0);
-}
-
-
-nsISelection * CSelection::GetSelectionObject(BOOL bShowDialog)
-{
-	nsCOMPtr<nsISelection> oNsSelection ;
-
-	nsCOMPtr<nsIDOMWindow> oDomWindow;
-
-	// Get the nsIDOMWindow interface in order to get nsISelection 
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(oDomWindow));
-
-	if(bShowDialog)
-	   RvTestResultDlg(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test",true);
-	else
-       RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow()' rv test", 0);
-	if (!oDomWindow)
-	{
-		if(bShowDialog)
-		    RvTestResultDlg(rv, "------>Cannot get the  nsIDOMNode Object");
-		else
-	       RvTestResult(rv, "------>Cannot get the  nsIDOMNode Object", 0);
-		return NULL ;
-	}
-
-	if(bShowDialog)
-		RvTestResultDlg(rv, "------>nsIDOMWindow is required in order to get the nsISelection interface");
-	else
-       RvTestResult(rv, "nsIDOMWindow is required in order to get the nsISelection interface", 0);
-	
-	// Now get the nsISelection interface
-	rv = oDomWindow->GetSelection(getter_AddRefs(oNsSelection));
-
-	if(bShowDialog)
-	    RvTestResultDlg(rv, "nsIDOMWindow::GetSelection()");
-	else
-       RvTestResult(rv, "nsIDOMWindow::GetSelection()", 0);
-
-	if (!oNsSelection)
-	{
-		if(bShowDialog)
-		    RvTestResultDlg(rv, "------>Cannot get the  Selection Object");
-		else
-	       RvTestResult(rv, "Cannot get the  Selection Object", 0);
-
-		return NULL ;
-	}
-	
-	return oNsSelection ;
-}
\ No newline at end of file
diff --git a/embedding/qa/testembed/Selection.h b/embedding/qa/testembed/Selection.h
deleted file mode 100644
index 984122a3ab3..00000000000
--- a/embedding/qa/testembed/Selection.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// 
-// Header file for nsISelection interface test cases
-
-class CSelection
-{	
-public:
-
-	CSelection(nsIWebBrowser* mWebBrowser);
-
-public:
-	~CSelection();
-
-public:
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser ;
-
-	// Place Test Cases Here
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests();
-	void GetAnchorNode() ;
-	void GetAnchorOffset() ;
-	void GetFocusNode() ;
-	void GetFocusOffset() ;
-	void GetIsCollapsed() ;
-	void GetRangecount() ;
-	void GetRangeAt() ;
-	void Collapse() ;
-	void Extend() ;
-	void CollapseToStart() ;
-	void CollapseToEnd() ;
-	void ContainsNode() ;
-	void SelectAllChildren();
-	void Addrange();
-	void RemoveRange();
-	void RemoveAllRanges();
-	void DeleteFromDocument();
-	void SelectionLanguageChange();
-	void ToString();
-	nsISelection * CSelection::GetSelectionObject(BOOL bShowDialog = false) ;
-	
-private:
-protected:
-
-
-};
\ No newline at end of file
diff --git a/embedding/qa/testembed/StdAfx.cpp b/embedding/qa/testembed/StdAfx.cpp
deleted file mode 100644
index 445f03d71c0..00000000000
--- a/embedding/qa/testembed/StdAfx.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// stdafx.cpp : source file that includes just the standard includes
-//	mozembed.pch will be the pre-compiled header
-//	stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-
-
diff --git a/embedding/qa/testembed/StdAfx.h b/embedding/qa/testembed/StdAfx.h
deleted file mode 100644
index 4c4293e10f0..00000000000
--- a/embedding/qa/testembed/StdAfx.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#ifndef _STDAFX_H
-#define _STDAFX_H
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
-
-#include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
-#include <afxpriv.h>		// Needed for MFC MBCS/Unicode Conversion Macros
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>			// MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-#include "nsCOMPtr.h"
-#include "nsNetUtil.h"
-#include "nsString.h"
-#include "nsCWebBrowser.h"
-#include "nsXPIDLString.h"
-#include "nsWidgetsCID.h"
-#include "nsIDocShell.h"
-#include "nsIWebBrowser.h"
-#include "nsIBaseWindow.h"
-#include "nsIWebNavigation.h"
-#include "nsIWebBrowserChrome.h"
-#include "nsIWebProgressListener.h"
-#include "nsIWebProgress.h"
-#include "nsIWindowCreator.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIDocShellTreeOwner.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIClipboardCommands.h"
-#include "nsIWebBrowserPersist.h"
-#include "nsIContextMenuListener.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMHTMLAnchorElement.h"
-#include "nsIDOMHTMLImageElement.h"
-#include "nsReadableUtils.h"
-#include "nsIPrompt.h"
-#include "nsEmbedAPI.h"		 
-#include "nsISHistory.h"
-#include "nsISHEntry.h"
-#include "nsIPref.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsIProfileChangeStatus.h"
-#include "nsIObserverService.h"
-#ifdef MOZ_OLD_CACHE
-#include "nsINetDataCacheManager.h"
-#endif
-#include "nsError.h"
-#include "nsIObserver.h"
-#include "nsWeakReference.h"
-#include "nsIEmbeddingSiteWindow.h"
-#include "nsIWebBrowserFind.h"
-#include "nsIWebBrowserFocus.h"
-#include "nsIServiceManager.h"
-
-// Printer Includes
-#include "nsIWebBrowserPrint.h"
-
-// qa additions
-#include "nsIGlobalHistory.h"
-#include "nsIBrowserHistory.h"
-#include "nsILocalFile.h"
-#include "nsIProfile.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMDocumentType.h"
-#include "nsIURIContentListener.h"
-#include "nsIHelperAppLauncherDialog.h"
-
-#include "nsIDOMWindow.h"
-#include "nsIDOMRange.h"
-#include "nsIDOMBarProp.h"
-#include "nsIDOMWindowCollection.h"
-#include "nsISelection.h"
-#include "nsITooltipListener.h"
-#include "nsISimpleEnumerator.h"
-
-#include "nsIXPIProgressDialog.h"
-#include "nsIXPIDialogService.h"
-#include "nsIWebBrowserSetup.h"
-#include "nsCRT.h"
-#include "nsIURILoader.h"
-#include "nsCURILoader.h"
-#include "nsIHttpHeaderVisitor.h"
-#include "nsIEditingSession.h"
-#include "nsICommandManager.h"
-#include "nsICommandParams.h"
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif //_STDAFX_H
diff --git a/embedding/qa/testembed/TestEmbed.cpp b/embedding/qa/testembed/TestEmbed.cpp
deleted file mode 100644
index 0829f98d4ad..00000000000
--- a/embedding/qa/testembed/TestEmbed.cpp
+++ /dev/null
@@ -1,703 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *   Conrad Carlen <ccarlen@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// The typical MFC app, frame creation code + AboutDlg handling
-//
-// NS_InitEmbedding() is called in InitInstance()
-// 
-// NS_TermEmbedding() is called in ExitInstance()
-// ExitInstance() also takes care of cleaning up of
-// multiple browser frame windows on app exit
-//
-//
-// Code to handle the creation of a new browser window
-
-// Next suggested file to look at : BrowserFrm.cpp
-
-// Local Includes
-#include "stdafx.h"
-#include "BrowserImpl.h"
-#include "TestEmbed.h"
-#include "BrowserFrm.h"
-#include "winEmbedFileLocProvider.h"
-#include "ProfileMgr.h"
-#include "BrowserView.h"
-#include "nsIWindowWatcher.h"
-#include "nsIComponentRegistrar.h"
-#include "plstr.h"
-#include "Preferences.h"
-#include <io.h>
-#include <fcntl.h>
-
-#include "QAUtils.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-// this is for overriding the Mozilla default PromptService component
-#include "PromptService.h"
-#define kComponentsLibname "testEmbedComponents.dll"
-#define NS_PROMPTSERVICE_CID \
- {0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}}
-static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID);
-
-BEGIN_MESSAGE_MAP(CTestEmbedApp, CWinApp)
-	//{{AFX_MSG_MAP(CTestEmbedApp)
-	ON_COMMAND(ID_NEW_BROWSER, OnNewBrowser)
-	ON_COMMAND(ID_MANAGE_PROFILES, OnManageProfiles)
-	ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
-    ON_COMMAND(ID_EDIT_PREFERENCES, OnEditPreferences)
-	// NOTE - the ClassWizard will add and remove mapping macros here.
-	//    DO NOT EDIT what you see in these blocks of generated code!
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-CTestEmbedApp::CTestEmbedApp() :
-    m_ProfileMgr(NULL)
-{
-    mRefCnt = 1; // Start at one - nothing is going to addref this object
-
-    m_strHomePage = "";
-
-    m_iStartupPage = 0; 
-
-}
-
-CTestEmbedApp theApp;
-
-BOOL CTestEmbedApp::IsCmdLineSwitch(const char *pSwitch, BOOL bRemove)
-{
-    //  Search for the switch in the command line.
-    //  Don't take it out of m_lpCmdLine by default
-    char *pFound = PL_strcasestr(m_lpCmdLine, pSwitch);
-    if(pFound == NULL ||
-        // Switch must be at beginning of command line
-        // or have a space in front of it to avoid
-        // mangling filenames
-        ( (pFound != m_lpCmdLine) &&
-          *(pFound-1) != ' ' ) ) 
-    {
-        return(FALSE);
-    }
-
-    if (bRemove) 
-    {
-        // remove the flag from the command line
-        char *pTravEnd = pFound + strlen(pSwitch);
-        char *pTraverse = pFound;
-
-        *pTraverse = *pTravEnd;
-        while(*pTraverse != '\0')   
-        {
-            pTraverse++;
-            pTravEnd++;
-            *pTraverse = *pTravEnd;
-        }
-    }
-
-    return(TRUE);
-}
-
-void CTestEmbedApp::ParseCmdLine()
-{
-    // Show Debug Console?
-    if(IsCmdLineSwitch("-console"))
-        ShowDebugConsole();
-}
-
-/* Some Gecko interfaces are implemented as components, automatically
-   registered at application initialization. nsIPrompt is an example:
-   the default implementation uses XUL, not native windows. Embedding
-   apps can override the default implementation by implementing the
-   nsIPromptService interface and registering a factory for it with
-   the same CID and Contract ID as the default's.
-
-   Note that this example implements the service in a separate DLL,
-   replacing the default if the override DLL is present. This could
-   also have been done in the same module, without a separate DLL.
-   See the PowerPlant example for, well, an example.
-*/
-nsresult CTestEmbedApp::OverrideComponents()
-{
-    nsresult rv = NS_OK;
-
-    // replace Mozilla's default PromptService with our own, if the
-    // expected override DLL is present
-    HMODULE overlib = ::LoadLibrary(kComponentsLibname);
-    if (overlib) {
-        InitPromptServiceType InitLib;
-        MakeFactoryType MakeFactory;
-        InitLib = reinterpret_cast<InitPromptServiceType>(::GetProcAddress(overlib, kPromptServiceInitFuncName));
-        MakeFactory = reinterpret_cast<MakeFactoryType>(::GetProcAddress(overlib, kPromptServiceFactoryFuncName));
-
-        if (InitLib && MakeFactory) {
-            InitLib(overlib);
-
-            nsCOMPtr<nsIFactory> promptFactory;
-            rv = MakeFactory(getter_AddRefs(promptFactory));
-            if (NS_SUCCEEDED(rv)) {
-                nsCOMPtr<nsIComponentRegistrar> registrar;
-                NS_GetComponentRegistrar(getter_AddRefs(registrar));
-                if (registrar)
-                    registrar->RegisterFactory(kPromptServiceCID,
-                                               "Prompt Service",
-                                               "@mozilla.org/embedcomp/prompt-service;1",
-                                               promptFactory);
-            }
-        } else
-          ::FreeLibrary(overlib);
-    }
-
-    return rv;
-}
-
-void CTestEmbedApp::ShowDebugConsole()
-{
-#ifdef _DEBUG
-    // Show console only in debug mode
-
-    if(! AllocConsole())
-        return;
-
-    // Redirect stdout to the console
-    int hCrtOut = _open_osfhandle(
-                (long) GetStdHandle(STD_OUTPUT_HANDLE),
-                _O_TEXT);
-    if(hCrtOut == -1)
-        return;
-
-    FILE *hfOut = _fdopen(hCrtOut, "w");
-    if(hfOut != NULL)
-    {
-        // Setup for unbuffered I/O so the console 
-        // output shows up right away
-        *stdout = *hfOut;
-        setvbuf(stdout, NULL, _IONBF, 0); 
-    }
-
-    // Redirect stderr to the console
-    int hCrtErr = _open_osfhandle(
-                (long) GetStdHandle(STD_ERROR_HANDLE),
-                _O_TEXT);
-    if(hCrtErr == -1)
-        return;
-
-    FILE *hfErr = _fdopen(hCrtErr, "w");
-    if(hfErr != NULL)
-    {
-        // Setup for unbuffered I/O so the console 
-        // output shows up right away
-        *stderr = *hfErr;
-        setvbuf(stderr, NULL, _IONBF, 0); 
-    }
-#endif
-}
-
-// Initialize our MFC application and also init
-// the Gecko embedding APIs
-// Note that we're also init'ng the profile switching
-// code here
-// Then, create a new BrowserFrame and load our
-// default homepage
-//
-BOOL CTestEmbedApp::InitInstance()
-{
-	QAOutput("****************************************************\r\n");
-
-    ParseCmdLine();
-
-	Enable3dControls();
-
-	//
-	// 1. Determine the name of the dir from which the MRE based app is being run
-	// from [It's OK to do this even if you're not running in an MRE env]
-	//
-	// 2. Create an nsILocalFile out of it which will passed in to NS_InitEmbedding()
-	//
-	// Please see http://www.mozilla.org/projects/embedding/MRE.html
-	// for more info. on MRE
-
-	char curDir[_MAX_PATH+1];
-	::GetCurrentDirectory(_MAX_PATH, curDir);
-	nsresult rv;
-	nsCOMPtr<nsILocalFile> mreAppDir;
-	rv = NS_NewNativeLocalFile(nsDependentCString(curDir), TRUE, getter_AddRefs(mreAppDir));
-	NS_ASSERTION(NS_SUCCEEDED(rv), "failed to create mreAppDir localfile");
-
-	// Take a look at 
-	// http://www.mozilla.org/projects/xpcom/file_locations.html
-	// for more info on File Locations
-
-    winEmbedFileLocProvider *provider = new winEmbedFileLocProvider("TestEmbed");
-    if(!provider)
-    {
-        ASSERT(FALSE);
-        return FALSE;
-    }
-
-    rv = NS_InitEmbedding(mreAppDir, provider);
-    if(NS_FAILED(rv))
-    {
-		QAOutput("TestEmbed didn't start up.");
-        ASSERT(FALSE);
-        return FALSE;
-    }
-	else
-		QAOutput("TestEmbed started up.");
-
-    rv = OverrideComponents();
-    if(NS_FAILED(rv))
-    {
-        ASSERT(FALSE);
-        return FALSE;
-    }
-
-
-    rv = InitializeWindowCreator();
-    if (NS_FAILED(rv))
-    {
-        ASSERT(FALSE);
-        return FALSE;
-    }
-
-	if(!InitializeProfiles())
-	{
-        ASSERT(FALSE);
-        rv = NS_TermEmbedding();
-		RvTestResult(rv, "TestEmbed shutdown");
-		return FALSE;
-	}
-
-	rv = InitializePrefs();
-	if (NS_FAILED(rv))
-	{
-        ASSERT(FALSE);
-        NS_TermEmbedding();
-		return FALSE;
-	}
-
-    if(!CreateHiddenWindow())
-	{
-        ASSERT(FALSE);
-        rv = NS_TermEmbedding();
-		RvTestResult(rv, "TestEmbed shutdown");
-		return FALSE;
-	}
-
-
-	// Create the first browser frame window
-	OnNewBrowser();
-
-	return TRUE;
-}
-
-CBrowserFrame* CTestEmbedApp::CreateNewBrowserFrame(PRUint32 chromeMask,
-												   PRInt32 x, PRInt32 y,
-												   PRInt32 cx, PRInt32 cy,
-												   PRBool bShowWindow)
-{
-	// Setup a CRect with the requested window dimensions
-	CRect winSize(x, y, cx, cy);
-
-	// Use the Windows default if all are specified as -1
-	if(x == -1 && y == -1 && cx == -1 && cy == -1)
-		winSize = CFrameWnd::rectDefault;
-
-	// Load the window title from the string resource table
-	CString strTitle;
-	strTitle.LoadString(IDR_MAINFRAME);
-
-	// Now, create the browser frame
-	CBrowserFrame* pFrame = new CBrowserFrame(chromeMask);
-	if (!pFrame->Create(NULL, strTitle, WS_OVERLAPPEDWINDOW, 
-					winSize, NULL, MAKEINTRESOURCE(IDR_MAINFRAME), 0L, NULL))
-	{
-		return NULL;
-	}
-
-	// load accelerator resource
-	pFrame->LoadAccelTable(MAKEINTRESOURCE(IDR_MAINFRAME));
-
-	// Show the window...
-	if(bShowWindow)
-	{
-		pFrame->ShowWindow(SW_SHOW);
-		pFrame->UpdateWindow();
-	}
-
-	// Add to the list of BrowserFrame windows
-	m_FrameWndLst.AddHead(pFrame);
-
-	return pFrame;
-}
-
-void CTestEmbedApp::OnNewBrowser()
-{
-	CBrowserFrame *pBrowserFrame = CreateNewBrowserFrame();
-
-	//Load the HomePage into the browser view
-	if(pBrowserFrame && (GetStartupPageMode() == 1))
-		pBrowserFrame->m_wndBrowserView.LoadHomePage();
-}
-
-// This gets called anytime a BrowserFrameWindow is
-// closed i.e. by choosing the "close" menu item from
-// a window's system menu or by dbl clicking on the
-// system menu box
-// 
-// Sends a WM_QUIT to the hidden window which results
-// in ExitInstance() being called and the app is
-// properly cleaned up and shutdown
-//
-void CTestEmbedApp::RemoveFrameFromList(CBrowserFrame* pFrm, BOOL bCloseAppOnLastFrame/*= TRUE*/)
-{
-	POSITION pos = m_FrameWndLst.Find(pFrm);
-	m_FrameWndLst.RemoveAt(pos);
-
-	// Send a WM_QUIT msg. to the hidden window if we've
-	// just closed the last browserframe window and
-	// if the bCloseAppOnLastFrame is TRUE. This be FALSE
-	// only in the case we're switching profiles
-	// Without this the hidden window will stick around
-	// i.e. the app will never die even after all the 
-	// visible windows are gone.
-	if(m_FrameWndLst.GetCount() == 0 && bCloseAppOnLastFrame)
-		m_pMainWnd->PostMessage(WM_QUIT);
-}
-
-int CTestEmbedApp::ExitInstance()
-{
-	// When File/Exit is chosen and if the user
-	// has opened multiple browser windows shut all
-	// of them down properly before exiting the app
-
-	CBrowserFrame* pBrowserFrame = NULL;
-	nsresult rv;
-
-	POSITION pos = m_FrameWndLst.GetHeadPosition();
-	while( pos != NULL )
-	{
-		pBrowserFrame = (CBrowserFrame *) m_FrameWndLst.GetNext(pos);
-		if(pBrowserFrame)
-		{
-			pBrowserFrame->ShowWindow(false);
-			pBrowserFrame->DestroyWindow();
-		}
-	}
-	m_FrameWndLst.RemoveAll();
-
-    if (m_pMainWnd)
-        m_pMainWnd->DestroyWindow();
-
-    delete m_ProfileMgr;
-
-	rv = NS_TermEmbedding();
-	if (NS_FAILED(rv))
-		QAOutput("TestEmbed didn't shut down.");
-	else
-		QAOutput("TestEmbed shut down.");
-
-	return 1;
-}
-
-BOOL CTestEmbedApp::OnIdle(LONG lCount)
-{
-	CWinApp::OnIdle(lCount);
-
-	return FALSE;
-}
-
-void CTestEmbedApp::OnManageProfiles()
-{
-    m_ProfileMgr->DoManageProfilesDialog(PR_FALSE);
-}
-
-void CTestEmbedApp::OnEditPreferences()
-{
-    CPreferences prefs(_T("Preferences"));
-    
-    prefs.m_startupPage.m_iStartupPage = m_iStartupPage;
-    prefs.m_startupPage.m_strHomePage = m_strHomePage;   
-
-    if(prefs.DoModal() == IDOK)
-    {
-        // Update our member vars with these new pref values
-        m_iStartupPage = prefs.m_startupPage.m_iStartupPage;
-        m_strHomePage = prefs.m_startupPage.m_strHomePage;
-
-        // Save these changes to disk now
-        nsresult rv;
-
-		nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID,&rv));
-
-        if (NS_SUCCEEDED(rv)) 
-        {	
-            prefs->SetIntPref("browser.startup.page", m_iStartupPage);
-            rv = prefs->SetCharPref("browser.startup.homepage", m_strHomePage);
-            if (NS_SUCCEEDED(rv))
-                rv = prefs->SavePrefFile(nsnull);
-        }
-        else
-		    NS_ASSERTION(PR_FALSE, "Could not get preferences service");
-    }
-}
-
-BOOL CTestEmbedApp::InitializeProfiles()
-{
-    m_ProfileMgr = new CProfileMgr;
-    if (!m_ProfileMgr)
-        return FALSE;
-
-	nsresult rv;
-
-    nsCOMPtr<nsIObserverService>observerService(do_GetService("@mozilla.org/observer-service;1",&rv));
-	if (NS_SUCCEEDED(rv)) 
-	{	  
-		observerService->AddObserver(this, "profile-approve-change", PR_TRUE);
-		observerService->AddObserver(this, "profile-change-teardown", PR_TRUE);
-		observerService->AddObserver(this, "profile-after-change", PR_TRUE);
-	}
-
-    m_ProfileMgr->StartUp();
-
-	return TRUE;
-}
-
-// When the profile switch happens, all open browser windows need to be 
-// closed. 
-// In order for that not to kill off the app, we just make the MFC app's 
-// mainframe be an invisible window which doesn't get closed on profile 
-// switches
-BOOL CTestEmbedApp::CreateHiddenWindow()
-{
-	CFrameWnd *hiddenWnd = new CFrameWnd;
-	if(!hiddenWnd)
-		return FALSE;
-
-    RECT bounds = { -10010, -10010, -10000, -10000 };
-    hiddenWnd->Create(NULL, "main", WS_DISABLED, bounds, NULL, NULL, 0, NULL);
-    m_pMainWnd = hiddenWnd;
-
-	return TRUE;
-}
-
-nsresult CTestEmbedApp::InitializePrefs()
-{
-   nsresult rv;
-
-   nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID,&rv));
-
-   if (NS_SUCCEEDED(rv)) {	  
-
-		// We are using the default prefs from mozilla. If you were
-		// disributing your own, this would be done simply by editing
-		// the default pref files.
-		PRBool inited;
-		rv = prefs->GetBoolPref("mfcbrowser.prefs_inited", &inited);
-		if (NS_FAILED(rv) || !inited)
-		{
-            m_iStartupPage = 1;
-            m_strHomePage = "http://www.mozilla.org/projects/embedding";
-
-            prefs->SetIntPref("browser.startup.page", m_iStartupPage);
-            prefs->SetCharPref("browser.startup.homepage", m_strHomePage);
-            prefs->SetIntPref("font.size.variable.x-western", 16);
-            prefs->SetIntPref("font.size.fixed.x-western", 13);
-            rv = prefs->SetBoolPref("mfcbrowser.prefs_inited", PR_TRUE);
-            if (NS_SUCCEEDED(rv))
-                rv = prefs->SavePrefFile(nsnull);
-        }
-        else
-        {
-            // The prefs are present, read them in
-            prefs->GetIntPref("browser.startup.page", &m_iStartupPage);
-
-            CString strBuf;
-            char *pBuf = strBuf.GetBuffer(_MAX_PATH);
-            prefs->CopyCharPref("browser.startup.homepage", &pBuf);
-            strBuf.ReleaseBuffer(-1);
-            if(pBuf)
-                m_strHomePage = pBuf;
-        }       
-	}
-	else
-		NS_ASSERTION(PR_FALSE, "Could not get preferences service");
-		
-    return rv;
-}
-
-
-/* InitializeWindowCreator creates and hands off an object with a callback
-   to a window creation function. This will be used by Gecko C++ code
-   (never JS) to create new windows when no previous window is handy
-   to begin with. This is done in a few exceptional cases, like PSM code.
-   Failure to set this callback will only disable the ability to create
-   new windows under these circumstances. */
-nsresult CTestEmbedApp::InitializeWindowCreator()
-{
-  // give an nsIWindowCreator to the WindowWatcher service
-  nsCOMPtr<nsIWindowCreator> windowCreator(static_cast<nsIWindowCreator *>(this));
-  if (windowCreator) {
-    nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
-    if (wwatch) {
-      wwatch->SetWindowCreator(windowCreator);
-      return NS_OK;
-    }
-  }
-  return NS_ERROR_FAILURE;
-}
-
-// ---------------------------------------------------------------------------
-//  CTestEmbedApp : nsISupports
-// ---------------------------------------------------------------------------
-
-NS_IMPL_THREADSAFE_ISUPPORTS3(CTestEmbedApp, nsIObserver, nsIWindowCreator, nsISupportsWeakReference)
-
-// ---------------------------------------------------------------------------
-//  CTestEmbedApp : nsIObserver
-// ---------------------------------------------------------------------------
-
-// Mainly needed to support "on the fly" profile switching
-
-NS_IMETHODIMP CTestEmbedApp::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData)
-{
-    nsresult rv = NS_OK;
-    
-    if (nsCRT::strcmp(aTopic, "profile-approve-change") == 0)
-    {
-        // Ask the user if they want to
-        int result = MessageBox(NULL, "Do you want to close all windows in order to switch the profile?", "Confirm", MB_YESNO | MB_ICONQUESTION);
-        if (result != IDYES)
-        {
-            nsCOMPtr<nsIProfileChangeStatus> status = do_QueryInterface(aSubject);
-            NS_ENSURE_TRUE(status, NS_ERROR_FAILURE);
-            status->VetoChange();
-        }
-    }
-    else if (nsCRT::strcmp(aTopic, "profile-change-teardown") == 0)
-    {
-        // Close all open windows. Alternatively, we could just call CBrowserWindow::Stop()
-        // on each. Either way, we have to stop all network activity on this phase.
-        
-	    POSITION pos = m_FrameWndLst.GetHeadPosition();
-	    while( pos != NULL )
-	    {
-		    CBrowserFrame *pBrowserFrame = (CBrowserFrame *) m_FrameWndLst.GetNext(pos);
-		    if(pBrowserFrame)
-		    {
-			    pBrowserFrame->ShowWindow(false);
-
-				// Passing in FALSE below so that we do not
-				// kill the main app during a profile switch
-				RemoveFrameFromList(pBrowserFrame, FALSE);
-
-				pBrowserFrame->DestroyWindow();
-		    }
-	    }
-    }
-    else if (nsCRT::strcmp(aTopic, "profile-after-change") == 0)
-    {
-        InitializePrefs(); // In case we have just switched to a newly created profile.
-        
-        // Only make a new browser window on a switch. This also gets
-        // called at start up and we already make a window then.
-        if (!nsCRT::strcmp(someData, NS_LITERAL_STRING("switch").get()))      
-            OnNewBrowser();
-    }
-    return rv;
-}
-
-// ---------------------------------------------------------------------------
-//  CTestEmbedApp : nsIWindowCreator
-// ---------------------------------------------------------------------------
-NS_IMETHODIMP CTestEmbedApp::CreateChromeWindow(nsIWebBrowserChrome *parent,
-                                               PRUint32 chromeFlags,
-                                               nsIWebBrowserChrome **_retval)
-{
-  // XXX we're ignoring the "parent" parameter
-  NS_ENSURE_ARG_POINTER(_retval);
-  *_retval = 0;
-
-  CBrowserFrame *pBrowserFrame = CreateNewBrowserFrame(chromeFlags);
-  if(pBrowserFrame) {
-    *_retval = static_cast<nsIWebBrowserChrome *>(pBrowserFrame->GetBrowserImpl());
-    NS_ADDREF(*_retval);
-  }
-  return NS_OK;
-}
-
-// AboutDlg Stuff
-
-class CAboutDlg : public CDialog
-{
-public:
-	CAboutDlg();
-
-	enum { IDD = IDD_ABOUTBOX };
-
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-
-protected:
-	DECLARE_MESSAGE_MAP()
-};
-
-CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
-{
-}
-
-void CAboutDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-}
-
-BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
-END_MESSAGE_MAP()
-
-// Show the AboutDlg
-void CTestEmbedApp::OnAppAbout()
-{
-	CAboutDlg aboutDlg;
-	aboutDlg.DoModal();
-}
diff --git a/embedding/qa/testembed/TestEmbed.h b/embedding/qa/testembed/TestEmbed.h
deleted file mode 100644
index 1d5541b4e42..00000000000
--- a/embedding/qa/testembed/TestEmbed.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// mozembed.h : main header file for the MOZEMBED application
-//
-
-#ifndef _TESTEMBED_H
-#define _TESTEMBED_H
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#ifndef __AFXWIN_H__
-	#error include 'stdafx.h' before including this file for PCH
-#endif
-
-#include "resource.h"       // main symbols
-
-/////////////////////////////////////////////////////////////////////////////
-// CTestEmbedApp:
-// See mozembed.cpp for the implementation of this class
-//
-
-class CBrowserFrame;
-class CProfileMgr;
-
-class CTestEmbedApp : public CWinApp,
-                     public nsIObserver,
-                     public nsIWindowCreator,
-                     public nsSupportsWeakReference
-{
-public:
-	CTestEmbedApp();
-	
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIOBSERVER
-    NS_DECL_NSIWINDOWCREATOR
-
-	CBrowserFrame* CreateNewBrowserFrame(PRUint32 chromeMask = nsIWebBrowserChrome::CHROME_ALL, 
-							PRInt32 x = -1, PRInt32 y = -1, 
-							PRInt32 cx = -1, PRInt32 cy = -1,
-							PRBool bShowWindow = PR_TRUE);
-	void RemoveFrameFromList(CBrowserFrame* pFrm, BOOL bCloseAppOnLastFrame = TRUE);
-
-    void ShowDebugConsole();
-    BOOL IsCmdLineSwitch(const char *pSwitch, BOOL bRemove = TRUE);
-    void ParseCmdLine();
-    nsresult OverrideComponents();
-
-	// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CTestEmbedApp)
-	public:
-	virtual BOOL InitInstance();
-	virtual int ExitInstance();
-	virtual BOOL OnIdle(LONG lCount);
-	//}}AFX_VIRTUAL
-
-	CObList m_FrameWndLst;
-
-    CString m_strHomePage;
-    inline BOOL GetHomePage(CString& strHomePage) {
-        strHomePage = m_strHomePage;
-        return TRUE;
-    }
-
-    int m_iStartupPage; //0 = BlankPage, 1 = HomePage
-    inline int GetStartupPageMode() {
-        return m_iStartupPage;
-    }
-
-// Implementation
-
-public:
-	//{{AFX_MSG(CTestEmbedApp)
-	afx_msg void OnAppAbout();
-	afx_msg void OnNewBrowser();
-    afx_msg void OnManageProfiles();
-    afx_msg void OnEditPreferences();
-		// NOTE - the ClassWizard will add and remove member functions here.
-		//    DO NOT EDIT what you see in these blocks of generated code !
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-
-private:
-	BOOL			InitializeProfiles();
-	BOOL			CreateHiddenWindow();
-    nsresult        InitializePrefs();
-    nsresult        InitializeWindowCreator();
-    
-private:
-    CProfileMgr     *m_ProfileMgr;
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // _TESTEMBED_H
diff --git a/embedding/qa/testembed/Tests.cpp b/embedding/qa/testembed/Tests.cpp
deleted file mode 100644
index c2b985c96ea..00000000000
--- a/embedding/qa/testembed/Tests.cpp
+++ /dev/null
@@ -1,1132 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:set ts=4 sw=4 sts=4 cindent noexpandtab: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Dharma Sirnapalli <dsirnapalli@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-// File Overview....
-//
-// These are QA test case implementations
-//
-
-
-#include "stdafx.h"
-#include "TestEmbed.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "UrlDialog.h"
-#include "ProfileMgr.h"
-#include "ProfilesDlg.h"
-#include "Tests.h"
-#include "nsihistory.h"
-#include "nsiwebnav.h"
-#include "nsirequest.h"
-#include "nsidirserv.h"
-#include "domwindow.h"
-#include "selection.h"
-#include "nsProfile.h"
-#include "nsIClipboardCmd.h"
-#include "nsIObserServ.h"
-#include "nsIFile.h"
-#include "nsIWebBrow.h"
-#include "nsIWebProg.h"
-#include "nsIWebBrowFind.h"
-#include "nsIEditSession.h"
-#include "nsICommandMgr.h"
-#include "nsICmdParams.h"
-#include "QaUtils.h"
-#include "nsIIOService.h"
-#include "nsIChannelTests.h"
-#include "nsIHttpChannelTests.h"
-#include <stdio.h>
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-nsresult rv;
-
-// Register message for FindDialog communication
-static UINT WM_FINDMSG = ::RegisterWindowMessage(FINDMSGSTRING);
-
-BEGIN_MESSAGE_MAP(CTests, CWnd)
-	//{{AFX_MSG_MAP(CTests)
-	ON_COMMAND(ID_TESTS_CHANGEURL, OnTestsChangeUrl)
-	ON_COMMAND(ID_TESTS_GLOBALHISTORY, OnTestsGlobalHistory)
-	ON_COMMAND(ID_TESTS_CREATEFILE, OnTestsCreateFile)
-	ON_COMMAND(ID_TESTS_CREATEPROFILE, OnTestsCreateprofile)
-	ON_COMMAND(ID_TESTS_ADDTOOLTIPLISTENER, OnTestsAddTooltipListener)
-	ON_COMMAND(ID_TESTS_ADDWEBPROGLISTENER, OnTestsAddWebProgListener)
-	ON_COMMAND(ID_TESTS_ADDHISTORYLISTENER, OnTestsAddHistoryListener)
-	ON_COMMAND(ID_TESTS_REMOVEHISTORYLISTENER, OnTestsRemovehistorylistener)
-	ON_COMMAND(ID_TESTS_ADDURICONTENTLISTENER_ADDFROMNSIWEBBROWSER, OnTestsAddUriContentListenerByWebBrowser)
-	ON_COMMAND(ID_TESTS_ADDURICONTENTLISTENER_ADDFROMNSIURILOADER, OnTestsAddUriContentListenerByUriLoader)
-	ON_COMMAND(ID_TESTS_ADDURICONTENTLISTENER_OPENURI, OnTestsAddUriContentListenerByOpenUri)
-	ON_COMMAND(ID_TESTS_NSNEWCHANNEL, OnTestsNSNewChannelAndAsyncOpen)
-	ON_COMMAND(ID_TESTS_NSIIOSERVICENEWURI, OnTestsIOServiceNewURI)
-	ON_COMMAND(ID_TESTS_NSIPROTOCOLHANDLERNEWURI, OnTestsProtocolHandlerNewURI)
-	ON_COMMAND(ID_TOOLS_REMOVEGHPAGE, OnToolsRemoveGHPage)
-	ON_COMMAND(ID_TOOLS_REMOVEALLGH, OnToolsRemoveAllGH)
-	ON_COMMAND(ID_TOOLS_VIEWLOGFILE, OnToolsViewLogfile)
-	ON_COMMAND(ID_TOOLS_DELETELOGFILE, OnToolsDeleteLogfile)
-	ON_COMMAND(ID_TOOLS_TESTYOURMETHOD, OnToolsTestYourMethod)
-	ON_COMMAND(ID_TOOLS_TESTYOURMETHOD2, OnToolsTestYourMethod2)
-	ON_COMMAND(ID_VERIFYBUGS_70228, OnVerifybugs70228)
-	ON_COMMAND(ID_VERIFYBUGS_90195, OnVerifybugs90195)
-	ON_COMMAND(ID_VERIFYBUGS_169617, OnVerifybugs169617)
-	ON_COMMAND(ID_VERIFYBUGS_170274, OnVerifybugs170274)
-	ON_COMMAND(ID_INTERFACES_NSIDIRECTORYSERVICE_INIT, OnInterfacesNsidirectoryservice)
-	ON_COMMAND(ID_INTERFACES_NSIDIRECTORYSERVICE_REGISTERPROVIDER, OnInterfacesNsidirectoryservice)
-	ON_COMMAND(ID_INTERFACES_NSIDIRECTORYSERVICE_RUNALLTESTS, OnInterfacesNsidirectoryservice)
-	ON_COMMAND(ID_INTERFACES_NSIDIRECTORYSERVICE_UNREGISTERPROVIDER, OnInterfacesNsidirectoryservice)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_RUNALLTESTS, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_GETDOMDOCUMENT, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_GETFRAMES, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_GETNAME, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_GETPARENT, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_GETSCROLLBARS, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_GETSCROLLY, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_GETSCSOLLX, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_GETSELECTION, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_SCROLLBY, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_SCROLLBYLINES, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_SCROLLBYPAGES, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_SCROLLTO, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_SIZETOCONTENT, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_GETTEXTZOOM, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSIDOMWINDOW_SETTEXTZOOM, OnInterfacesNsidomwindow)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_RUNALLTESTS, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_GETANCHORNODE, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_ADDRANGE, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_COLLAPSE, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_COLLAPSETOEND, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_COLLAPSETOSTART, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_CONTAINSNODE, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_DELETEFROMDOCUMENT, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_EXTEND, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_GETANCHOROFFSET, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_GETFOCUSNODE, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_GETFOCUSOFFSET, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_GETISCOLLAPSED, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_GETRANGEAT, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_GETRANGECOUNT, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_REMOVEALLRANGES, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_REMOVERANGE, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_SELECTALLCHILDREN, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_SELECTIONLANGUAGECHANGE, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSISELECTION_TOSTRING, OnInterfacesNsiselection)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_RUNALLTESTS, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_CLONEPROFILE, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_CREATENEWPROFILE, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_DELETEPROFILE, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_GETCURRENTPROFILE, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_GETPROFILECOUNT, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_GETPROFILELIST, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_PROFILEEXISTS, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_RENAMEPROFILE, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_SETCURRENTPROFILE, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSIPROFILE_SHUTDOWNCURRENTPROFILE, OnInterfacesNsiprofile)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_GETCOUNT, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_GETENTRYATINDEX, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_GETINDEX, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_GETMAXLENGTH, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_GETSHISTORYENUMERATOR, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_PURGEHISTORY, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_RUNALLTESTS, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_SETMAXLENGTH, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETISSUBFRAME, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETTITLE, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETURI, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_RUNALLTESTS, OnInterfacesNsishistory)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETCANGOBACK, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETCANGOFORWARD, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETCURRENTURI, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETREFERRINGURI, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETDOCUMENT, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETSESSIONHISTORY, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GOBACK, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GOFORWARD, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GOTOINDEX, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_LOADURI, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_RELOAD, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_RUNALLTESTS, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_SETSESSIONHISTORY, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSIWEBNAV_STOP, OnInterfacesNsiwebnav)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_RUNALLTESTS, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_SETORIGINALURI, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_GETORIGINALURI, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_GETURI, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_SETOWNER, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_GETOWNER, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_SETNOTIFICATIONS, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_GETNOTIFICATIONS, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_GETSECURITYINFO, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_SETCONTENTTYPE, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_GETCONTENTTYPE, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_SETCONTENTCHARSET, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_GETCONTENTCHARSET, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_SETCONTENTLENGTH, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_GETCONTENTLENGTH, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_OPEN, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSICHANNEL_ASYNCOPEN, OnInterfacesNsichannel)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_GETLOADFLAGS, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_GETLOADGROUP, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_GETNAME, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_GETSTATUS, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_ISPENDING, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_CANCEL, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_RESUME, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_SETLOADFLAGS, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_SETLOADGROUP, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_SUSPEND, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSIREQUEST_RUNALLTESTS, OnInterfacesNsirequest)
-	ON_COMMAND(ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANCUTSELECTION, OnInterfacesNsiclipboardcommands)
-	ON_COMMAND(ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANCOPYSELECTION, OnInterfacesNsiclipboardcommands)
-	ON_COMMAND(ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANPASTE, OnInterfacesNsiclipboardcommands)
-	ON_COMMAND(ID_INTERFACES_NSICLIPBOARDCOMMANDS_COPYLINKLOCATION, OnInterfacesNsiclipboardcommands)
-	ON_COMMAND(ID_INTERFACES_NSICLIPBOARDCOMMANDS_COPYSELECTION, OnInterfacesNsiclipboardcommands)
-	ON_COMMAND(ID_INTERFACES_NSICLIPBOARDCOMMANDS_CUTSELECTION, OnInterfacesNsiclipboardcommands)
-	ON_COMMAND(ID_INTERFACES_NSICLIPBOARDCOMMANDS_PASTE, OnInterfacesNsiclipboardcommands)
-	ON_COMMAND(ID_INTERFACES_NSICLIPBOARDCOMMANDS_SELECTALL, OnInterfacesNsiclipboardcommands)
-	ON_COMMAND(ID_INTERFACES_NSICLIPBOARDCOMMANDS_SELECTNONE, OnInterfacesNsiclipboardcommands)
-	ON_COMMAND(ID_INTERFACES_NSIOBSERVERSERVICE_ADDOBSERVERS, OnInterfacesNsiobserverservice)
-	ON_COMMAND(ID_INTERFACES_NSIOBSERVERSERVICE_ENUMERATEOBSERVERS, OnInterfacesNsiobserverservice)
-	ON_COMMAND(ID_INTERFACES_NSIOBSERVERSERVICE_NOTIFYOBSERVERS, OnInterfacesNsiobserverservice)
-	ON_COMMAND(ID_INTERFACES_NSIOBSERVERSERVICE_REMOVEOBSERVERS, OnInterfacesNsiobserverservice)
-	ON_COMMAND(ID_INTERFACES_NSIOBSERVERSERVICE_RUNALLTESTS, OnInterfacesNsiobserverservice)
-	ON_COMMAND(ID_INTERFACES_NSIFILE_APPENDRELATICEPATH, OnInterfacesNsifile)
-	ON_COMMAND(ID_INTERFACES_NSIFILE_COPYTO, OnInterfacesNsifile)
-	ON_COMMAND(ID_INTERFACES_NSIFILE_CREATE, OnInterfacesNsifile)
-	ON_COMMAND(ID_INTERFACES_NSIFILE_EXISTS, OnInterfacesNsifile)
-	ON_COMMAND(ID_INTERFACES_NSIFILE_INITWITHPATH, OnInterfacesNsifile)
-	ON_COMMAND(ID_INTERFACES_NSIFILE_MOVETO, OnInterfacesNsifile)
-	ON_COMMAND(ID_INTERFACES_NSIFILE_RUNALLTESTS, OnInterfacesNsifile)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_RUNALLTESTS, OnInterfacesNsiwebbrowser)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_ADDWEBBROWSERLISTENER, OnInterfacesNsiwebbrowser)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_REMOVEWEBBROWSERLISTENER, OnInterfacesNsiwebbrowser)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_GETCONTAINERWINDOW, OnInterfacesNsiwebbrowser)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_SETCONTAINERWINDOW, OnInterfacesNsiwebbrowser)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_GETPARENTURICONTENTLISTENER, OnInterfacesNsiwebbrowser)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_SETPARENTURICONTENTLISTENER, OnInterfacesNsiwebbrowser)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_GETCONTENTDOMWINDOW, OnInterfacesNsiwebbrowser)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_NSIWBSETUPSETPROPERTY, OnInterfacesNsiwebbrowser)
-	ON_COMMAND(ID_INTERFACES_NSIWEBPROGRESS_RUNALLTESTS, OnInterfacesNsiwebprogress)
-	ON_COMMAND(ID_INTERFACES_NSIWEBPROGRESS_ADDPROGRESSLISTENER, OnInterfacesNsiwebprogress)
-	ON_COMMAND(ID_INTERFACES_NSIWEBPROGRESS_REMOVEPROGRESSLISTENER, OnInterfacesNsiwebprogress)
-	ON_COMMAND(ID_INTERFACES_NSIWEBPROGRESS_GETDOMWINDOW, OnInterfacesNsiwebprogress)
-	ON_COMMAND(ID_INTERFACES_NSIWEBPROGRESS_ISLOADINGDOCUMENT, OnInterfacesNsiwebprogress)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_RUNALLTESTS, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_SETSEARCHSTRINGTEST, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_GETSEARCHSTRINGTEST, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_FINDNEXTTEST, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_SETFINDBACKWARDSTEST, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_GETFINDBACKWARDSTEST, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_SETWRAPFINDTEST, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_GETWRAPFINDTEST, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_SETENTIREWORDTEST, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_GETENTIREWORDTEST, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_SETMATCHCASE, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_GETMATCHCASE, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_SETSEARCHFRAMES, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIWEBBROWSERFIND_GETSEARCHFRAMES, OnInterfacesNsiwebbrowfind)
-	ON_COMMAND(ID_INTERFACES_NSIEDITINGSESSION_RUNALLTESTS, OnInterfacesNsieditingsession)
-	ON_COMMAND(ID_INTERFACES_NSIEDITINGSESSION_INIT, OnInterfacesNsieditingsession)
-	ON_COMMAND(ID_INTERFACES_NSIEDITINGSESSION_MAKEWINDOWEDITABLE, OnInterfacesNsieditingsession)
-	ON_COMMAND(ID_INTERFACES_NSIEDITINGSESSION_WINDOWISEDITABLE, OnInterfacesNsieditingsession)
-	ON_COMMAND(ID_INTERFACES_NSIEDITINGSESSION_GETEDITORFORWINDOW, OnInterfacesNsieditingsession)
-	ON_COMMAND(ID_INTERFACES_NSIEDITINGSESSION_SETUPEDITORONWINDOW, OnInterfacesNsieditingsession)
-	ON_COMMAND(ID_INTERFACES_NSIEDITINGSESSION_TEARDOWNEDITORONWINDOW, OnInterfacesNsieditingsession)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDMANAGER_RUNALLTESTS, OnInterfacesNsicommandmgr)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDMANAGER_ADDCOMMANDOBSERVER, OnInterfacesNsicommandmgr)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDMANAGER_REMOVECOMMANDOBSERVER, OnInterfacesNsicommandmgr)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDMANAGER_ISCOMMANDESUPPORTED, OnInterfacesNsicommandmgr)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDMANAGER_ISCOMMANDENABLED, OnInterfacesNsicommandmgr)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDMANAGER_GETCOMMANDSTATE, OnInterfacesNsicommandmgr)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDMANAGER_DOCOMMAND, OnInterfacesNsicommandmgr)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_RUNALLTESTS, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETVALUETYPE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETBOOLEANVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETLONGVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETDOUBLEVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETSTRINGVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETCSTRINGVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETISUPPORTSVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETBOOLEANVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETLONGVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETDOUBLEVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETSTRINGVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETCSTRINGVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETISUPPORTSVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_REMOVEVALUE, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_HASMOREELEMENTS, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_FIRST, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETNEXT, OnInterfacesNsicmdparams)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_RUNALLTESTS ,OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_SETREQUESTMETHOD, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_GETREQUESTMETHOD, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_SETREFERRER, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_GETREFERRER, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_SETREQUESTHEADER, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_GETREQUESTHEADER, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_VISITREQUESTHEADERS, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_SETALLOWPIPELINING, OnInterfacesNsihttpchannel)	
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_GETALLOWPIPELINING, OnInterfacesNsihttpchannel)	
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_SETREDIRECTIONLIMIT, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_GETREDIRECTIONLIMIT, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUS, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUSTEXT, OnInterfacesNsihttpchannel)
-	ON_COMMAND(ID_INTERFACES_RUNALLTESTCASES, OnInterfacesRunalltestcases)
-	
-	//}}AFX_MSG_MAP
-
-END_MESSAGE_MAP()
-
-//static declarations
-//nsCOMPtr<nsIWebBrowser> CTests::qaWebBrowser;
-
-//end static declarations
-
-CTests::CTests(nsIWebBrowser* mWebBrowser,
-			   nsIBaseWindow* mBaseWindow,
-			   nsIWebNavigation* mWebNav,
-			   CBrowserImpl *mpBrowserImpl)
-{
-	qaWebBrowser = mWebBrowser;
-	qaBaseWindow = mBaseWindow;
-	qaWebNav = mWebNav;
-	qaBrowserImpl = mpBrowserImpl;
-}
-
-CTests::~CTests()
-{
-
-}
-
-
-// *********************************************************
-// depstein: Start QA test cases here
-// *********************************************************
-
-void CTests::OnTestsChangeUrl()
-{
-	if (!qaWebNav)
-	{
-		QAOutput("Web navigation object not found. Change URL test not performed.", 2);
-		return;
-	}
-
-	if (myDialog.DoModal() == IDOK)
-	{
-		QAOutput("Begin Change URL test.", 1);
-		rv = qaWebNav->LoadURI(NS_ConvertASCIItoUTF16(myDialog.m_urlfield).get(),
-								myDialog.m_flagvalue, nsnull,nsnull, nsnull);
-
-	    RvTestResult(rv, "rv LoadURI() test", 1);
-		FormatAndPrintOutput("The url = ", myDialog.m_urlfield, 2);
-		FormatAndPrintOutput("The flag = ", myDialog.m_flagvalue, 1);
-		QAOutput("End Change URL test.", 1);
-	}
-	else
-		QAOutput("Change URL test not executed.", 1);
-}
-
-// *********************************************************
-
-void CTests::OnTestsGlobalHistory()
-{
-	// create instance of myHistory object. Call's XPCOM
-	// service manager to pass the contract ID.
-
-	PRBool theRetVal = PR_FALSE;
-
-	nsCOMPtr<nsIGlobalHistory> myHistory(do_GetService(NS_GLOBALHISTORY_CONTRACTID));
-
-	if (!myHistory)
-	{
-		QAOutput("Couldn't find history object. No GH tests performed.", 2);
-		return;
-	}
-
-	if (myDialog.DoModal() == IDOK)
-	{
-		QAOutput("Begin IsVisited() and AddPage() tests.", 2);
-		FormatAndPrintOutput("The history url = ", myDialog.m_urlfield, 1);
-
-		// see if url is already in the GH file (pre-AddPage() test)
-		rv = myHistory->IsVisited(myDialog.m_urlfield, &theRetVal);
-	    RvTestResult(rv, "rv IsVisited() test", 1);
-		FormatAndPrintOutput("The IsVisited() boolean return value = ", theRetVal, 1);
-
-		if (theRetVal)
-			QAOutput("URL has been visited. Won't execute AddPage().", 2);
-		else
-		{
-			QAOutput("URL hasn't been visited. Will execute AddPage().", 2);
-
-			// adds a url to the global history file
-			rv = myHistory->AddPage(myDialog.m_urlfield);
-
-			// prints addPage() results to output file
-			if (NS_FAILED(rv))
-			{
-				QAOutput("Invalid results for AddPage(). Url not added. Test failed.", 1);
-				return;
-			}
-			else
-				QAOutput("Valid results for AddPage(). Url added. Test passed.", 1);
-
-			// checks if url was visited (post-AddPage() test)
- 			myHistory->IsVisited(myDialog.m_urlfield, &theRetVal);
-
-			if (theRetVal)
-				QAOutput("URL is visited; post-AddPage() test. IsVisited() test passed.", 1);
-			else
-				QAOutput("URL isn't visited; post-AddPage() test. IsVisited() test failed.", 1);
-		}
-		QAOutput("End IsVisited() and AddPage() tests.", 2);
-	}
-	else
-		QAOutput("IsVisited() and AddPage() tests not executed.", 1);
-}
-
-
-// *********************************************************
-
-void CTests::OnTestsCreateFile()
-{
-   	//nsresult rv;
-
-	PRBool exists;
-    nsCOMPtr<nsILocalFile> theTestFile(do_GetService(NS_LOCAL_FILE_CONTRACTID));
-
-    if (!theTestFile)
-	{
-		QAOutput("File object doesn't exist. No File tests performed.", 2);
-		return;
-	}
-
-
-	QAOutput("Start Create File test.", 2);
-
-	rv = theTestFile->InitWithNativePath(NS_LITERAL_CSTRING("c:\\temp\\theFile.txt"));
-	rv = theTestFile->Exists(&exists);
-	QAOutput("File (theFile.txt) doesn't exist. We'll create it.\r\n", 1);
-
-	rv = theTestFile->Create(nsIFile::NORMAL_FILE_TYPE, 0777);
-	RvTestResult(rv, "File Create() test", 2);
-}
-
-// *********************************************************
-
-void CTests::OnTestsCreateprofile()
-{
-    CProfilesDlg    myDialog;
-    nsresult        rv;
-
-	if (myDialog.DoModal() == IDOK)
-    {
-		nsCOMPtr<nsIProfile> theProfServ(do_GetService(NS_PROFILE_CONTRACTID,&rv));
-		if (NS_FAILED(rv))
-		{
-		   QAOutput("Didn't get profile service. No profile tests performed.", 2);
-		   return;
-		}
-
-	   QAOutput("Start Profile switch test.", 2);
-
-	   QAOutput("Retrieved profile service.", 2);
-
-       rv = theProfServ->SetCurrentProfile(myDialog.m_SelectedProfile.get());
-	   RvTestResult(rv, "SetCurrentProfile() (profile switching) test", 2);
-
-	   QAOutput("End Profile switch test.", 2);
-    }
-	else
-	   QAOutput("Profile switch test not executed.", 2);
-}
-
-// *********************************************************
-
-void CTests::OnTestsAddTooltipListener()
-{
-    nsWeakPtr weakling(
-        do_GetWeakReference(static_cast<nsITooltipListener*>(qaBrowserImpl)));
- 
-	rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsITooltipListener));
-	RvTestResult(rv, "AddWebBrowserListener(). Add Tooltip Listener test", 2);
-}
-
-// *********************************************************
-
-void CTests::OnTestsAddWebProgListener()
-{
-    nsWeakPtr weakling(
-        do_GetWeakReference(static_cast<nsIWebProgressListener*>(qaBrowserImpl)));
- 
-	rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener));
-	RvTestResult(rv, "AddWebBrowserListener(). Add Web Prog Lstnr test", 2);
-}
-
-// *********************************************************
-
-void CTests::OnTestsAddHistoryListener()
-{
-   // addSHistoryListener test
-
-	nsWeakPtr weakling(
-        do_GetWeakReference(static_cast<nsISHistoryListener*>(qaBrowserImpl)));
-
-	rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsISHistoryListener));
-	RvTestResult(rv, "AddWebBrowserListener(). Add History Lstnr test", 2);
-}
-
-// *********************************************************
-
-void CTests::OnTestsRemovehistorylistener()
-{
-  // RemoveSHistoryListener test
-
-	nsWeakPtr weakling(
-        do_GetWeakReference(static_cast<nsISHistoryListener*>(qaBrowserImpl)));
-
-	rv = qaWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsISHistoryListener));
-	RvTestResult(rv, "RemoveWebBrowserListener(). Remove History Lstnr test", 2);
-}
-
-// *********************************************************
-
-void CTests::OnTestsAddUriContentListenerByWebBrowser()
-{
-    nsWeakPtr weakling(
-        do_GetWeakReference(static_cast<nsIURIContentListener*>(qaBrowserImpl)));
-
-    rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIURIContentListener));
-	RvTestResult(rv, "AddWebBrowserListener(). add nsIURIContentListener test", 2);
-}
-
-// *********************************************************
-
-void CTests::OnTestsAddUriContentListenerByUriLoader()
-{
-	nsCOMPtr<nsIURILoader> myLoader(do_GetService(NS_URI_LOADER_CONTRACTID,&rv));
-	RvTestResult(rv, "nsIURILoader() object test", 1);
-
-	if (!myLoader) {
-		QAOutput("Didn't get urILoader object. test failed", 2);
-		return;
-	}
-
-	nsCOMPtr<nsIURIContentListener> cntListener(static_cast<nsIURIContentListener*>(qaBrowserImpl));
-
-	if (!cntListener) {
-		QAOutput("Didn't get urIContentListener object. test failed", 2);
-		return;
-	}
-	else {
-		rv = myLoader->RegisterContentListener(cntListener);
-		RvTestResult(rv, "nsIUriLoader->RegisterContentListener() test", 2);
-	}
-}
-
-// *********************************************************
-
-void CTests::OnTestsAddUriContentListenerByOpenUri()
-{
-	nsCOMPtr<nsIURILoader> myLoader(do_GetService(NS_URI_LOADER_CONTRACTID,&rv));
-	RvTestResult(rv, "nsIURILoader() object test", 1);
-
-	if (!myLoader) {
-		QAOutput("Didn't get urILoader object. test failed", 2);
-		return;
-	}
-
-	if (myDialog.DoModal() == IDOK)
-	{
-		nsCAutoString theStr;
-
-		theStr = myDialog.m_urlfield;
-		rv = NS_NewURI(getter_AddRefs(theURI), theStr);
-		RvTestResult(rv, "For OpenURI(): NS_NewURI() test", 1);
-		FormatAndPrintOutput("theStr = ", theStr, 1);
-		GetTheURI(theURI, 1);
-		rv = NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
-		RvTestResult(rv, "For OpenURI(): NS_NewChannel() test", 1);
-	}
-	else {
-		QAOutput("Didn't get a url. test failed", 2);
-		return;
-	}
-
-	rv = myLoader->OpenURI(theChannel, PR_TRUE, qaBrowserImpl);
-	RvTestResult(rv, "nsIUriLoader->OpenURI() test", 2);
-}
-
-// *********************************************************
-
-void CTests::OnTestsNSNewChannelAndAsyncOpen()
-{
-	nsCOMPtr<nsIChannel> theChannel;
-	nsCOMPtr<nsILoadGroup> theLoadGroup(do_CreateInstance(NS_LOADGROUP_CONTRACTID));
-
-	if (myDialog.DoModal() == IDOK)
-	{
-		nsCAutoString theStr;
-
-		theStr = myDialog.m_urlfield;
-
-		rv = NS_NewURI(getter_AddRefs(theURI), theStr);
-		RvTestResult(rv, "NS_NewURI() test", 2);
-		rv = NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
-		RvTestResult(rv, "NS_NewChannel() test", 2);
-
-		if (!theChannel)
-		{
-		   QAOutput("We didn't get the Channel for AsyncOpen(). Test failed.", 1);
-		   return;
-		}
-
-		QAOutput("AynchOpen() test:", 2);
-
-		// this calls nsIStreamListener::OnDataAvailable()
-		CnsIChannelTests  *channelTests = new CnsIChannelTests(qaWebBrowser, qaBrowserImpl);
-		channelTests->AsyncOpenTest(theChannel, 2);;
-	}
-}
-
-// *********************************************************
-
-void CTests::OnTestsIOServiceNewURI()
-{
-	nsCOMPtr<nsIIOService> ioService(do_GetIOService(&rv));
-	if (!ioService) {
-		QAOutput("We didn't get the IOService object.", 2);
-		return;
-	}
-
-	if (myDialog.DoModal() == IDOK)
-	{
-		nsCAutoString theStr, retURI;
-
-		theStr = myDialog.m_urlfield;
-
-		rv = ioService->NewURI(theStr, nsnull, nsnull, getter_AddRefs(theURI));
-		RvTestResult(rv, "ioService->NewURI() test", 2);
-
-		if (!theURI)
-			QAOutput("We didn't get the nsIURI object for IOService test.", 2);
-		else {
-			retURI = GetTheURI(theURI, 1);
-			FormatAndPrintOutput("The ioService->NewURI() output uri = ", retURI, 2);
-		}
-	}
-}
-
-// *********************************************************
-
-void CTests::OnTestsProtocolHandlerNewURI()
-{
-	nsCOMPtr<nsIIOService> ioService(do_GetIOService(&rv));
-
-	if (!ioService) {
-		QAOutput("We didn't get the IOService object.", 2);
-		return;
-	}
-
-	if (myDialog.DoModal() == IDOK)
-	{
-		nsCAutoString theStr, retStr;
-		nsCOMPtr<nsIURI> theOriginalURI;
-		nsIURI *theReturnURI = nsnull;
-		nsIChannel *theReturnChannel = nsnull;
-		const char *theProtocol;
-
-		nsCOMPtr<nsIProtocolHandler> protocolHandler;
-
-		theStr = myDialog.m_urlfield;
-		theProtocol = myDialog.m_protocolvalue;
-		FormatAndPrintOutput("The protocol scheme = ", theProtocol, 1);
-		rv = ioService->GetProtocolHandler(theProtocol, getter_AddRefs(protocolHandler));
-		RvTestResult(rv, "ioService->GetProtocolHandler() test", 2);
-		rv = qaWebNav->GetCurrentURI(getter_AddRefs(theOriginalURI));
-		if (!protocolHandler) {
-			QAOutput("We didn't get the protocolHandler object.", 2);
-			return;
-		}
-		rv = protocolHandler->NewURI(theStr, nsnull, theOriginalURI, &theReturnURI);
-		if (!theOriginalURI)
-			QAOutput("We didn't get the original nsIURI object.", 2);
-		else if (!theReturnURI)
-			QAOutput("We didn't get the output nsIURI object.", 2);
-
-		RvTestResult(rv, "protocolHandler->NewURI() test", 2);
-
-	    retStr = GetTheURI(theReturnURI, 1);
-
-	   // simple string compare to see if input & output URLs match
-	    if (strcmp(myDialog.m_urlfield, retStr.get()) == 0)
-		   QAOutput("The in/out URIs MATCH.", 1);
-	    else
-		   QAOutput("The in/out URIs don't MATCH.", 1);
-
-		// other protocol handler tests:
-
-		// GetScheme() test
-		nsCAutoString theScheme;
-		rv = protocolHandler->GetScheme(theScheme);
-		RvTestResult(rv, "protocolHandler->GetScheme() test", 1);
-		FormatAndPrintOutput("GetScheme() = ", theScheme, 1);
-
-		// GetDefaultPort() test
-		PRInt32 theDefaultPort;
-		rv = protocolHandler->GetDefaultPort(&theDefaultPort);
-		RvTestResult(rv, "protocolHandler->GetDefaultPort() test", 1);
-		FormatAndPrintOutput("GetDefaultPort() = ", theDefaultPort, 1);
-
-		// GetProtocolFlags() test
-		PRUint32 theProtocolFlags;
-		rv = protocolHandler->GetProtocolFlags(&theProtocolFlags);
-		RvTestResult(rv, "protocolHandler->GetDefaultPort() test", 1);
-		FormatAndPrintOutput("GetProtocolFlags() = ", theProtocolFlags, 1);
-
-		// NewChannel() test
-		rv = protocolHandler->NewChannel(theReturnURI, &theReturnChannel);
-		RvTestResult(rv, "protocolHandler->NewChannel() test", 1);
-		if (!theReturnChannel)
-			QAOutput("We didn't get the returned nsIChannel object.", 1);
-
-
-		// AllowPort() test
-		PRBool retPort;
-		rv = protocolHandler->AllowPort(theDefaultPort, "http", &retPort);
-		RvTestResult(rv, "protocolHandler->AllowPort() test", 1);
-		FormatAndPrintOutput("AllowPort() boolean = ", retPort, 1);
-
-		
-	}
-}
-
-// *********************************************************
-// *********************************************************
-//					TOOLS to help us
-
-void CTests::OnToolsRemoveGHPage()
-
-{
-	PRBool theRetVal = PR_FALSE;
-	nsCOMPtr<nsIGlobalHistory> myGHistory(do_GetService(NS_GLOBALHISTORY_CONTRACTID));
-
-	if (!myGHistory)
-	{
-		QAOutput("Could not get the global history object.", 2);
-		return;
-	}
-
-	nsCOMPtr<nsIBrowserHistory> myHistory = do_QueryInterface(myGHistory, &rv);
-	if(NS_FAILED(rv)) {
-		QAOutput("Could not get the history object.", 2);
-		return;
-	}
-
-	if (myDialog.DoModal() == IDOK)
-	{
-		QAOutput("Begin URL removal from the GH file.", 2);
-
-		myGHistory->IsVisited(myDialog.m_urlfield, &theRetVal);
-		if (theRetVal)
-		{
-			nsCOMPtr<nsIIOService> ios = do_GetIOService();
-			if (ios)
-			{
-				nsCOMPtr<nsIURI> uri;
-				ios->NewURI(nsDependentCString(myDialog.m_urlfield), nsnull, nsnull,
-							getter_AddRefs(uri));
-				if (uri)
-				{
-					rv = myHistory->RemovePage(uri);
-					RvTestResult(rv, "RemovePage() test (url removal from GH file)", 2);
-				}
-			}
-		}
-		else
-		{
-			QAOutput("The URL wasn't in the GH file.\r\n", 1);
-		}
-		QAOutput("End URL removal from the GH file.", 2);
-	}
-	else
-		QAOutput("URL removal from the GH file not executed.", 2);
-}
-
-void CTests::OnToolsRemoveAllGH()
-{
-
-	nsCOMPtr<nsIGlobalHistory> myGHistory(do_GetService(NS_GLOBALHISTORY_CONTRACTID));
-	if (!myGHistory)
-	{
-		QAOutput("Could not get the global history object.", 2);
-		return;
-	}
-
-	nsCOMPtr<nsIBrowserHistory> myHistory = do_QueryInterface(myGHistory, &rv);
-	if(NS_FAILED(rv)) {
-		QAOutput("Could not get the history object.", 2);
-		return;
-	}
-
-	QAOutput("Begin removal of all pages from the GH file.", 2);
-
-	rv = myHistory->RemoveAllPages();
-	RvTestResult(rv, "removeAllPages().", 2);
-
-	QAOutput("End removal of all pages from the GH file.", 2);
-}
-
-void CTests::OnToolsViewLogfile()
-{
-	char theURI[1024];
-
-	CStdioFile myFile; 
-    CFileException e; 
-    CString strFileName = "c:\\temp\\TestOutput.txt"; 
-	myFile.Open( strFileName, CStdioFile::modeCreate | CStdioFile::modeWrite
-			   | CStdioFile::modeNoTruncate, &e );               
-	myFile.Close();
-
-	strcpy(theURI, "file://C|/temp/TestOutput.txt");
-	rv = qaWebNav->LoadURI(NS_ConvertASCIItoUTF16(theURI).get(),
-		 nsIWebNavigation::LOAD_FLAGS_NONE, nsnull,nsnull, nsnull);
-}
-
-void CTests::OnToolsDeleteLogfile()
-{
-	CStdioFile myFile; 
-    CFileException e; 
-    CString strFileName = "c:\\temp\\TestOutput.txt"; 
-	myFile.Open( strFileName, CStdioFile::modeCreate | CStdioFile::modeWrite
-			   | CStdioFile::modeNoTruncate, &e );       
-	myFile.Close();
-
-	nsCOMPtr<nsILocalFile> theOriginalFile(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
-
-	rv = theOriginalFile->InitWithNativePath(NS_LITERAL_CSTRING("c:\\temp\\TestOutput.txt"));
-    nsCOMPtr<nsIFile> theTestFile = do_QueryInterface(theOriginalFile);
-	rv = theTestFile->Remove(PR_FALSE);
-}
-
-// ***********************************************************************
-
-void CTests::OnToolsTestYourMethod()
-{	
-	// place your test code here
-}
-
-// ***********************************************************************
-
-void CTests::OnToolsTestYourMethod2()
-{
-	// place your test code here
-}
-
-// ***********************************************************************
-// ***************** Bug Verifications ******************
-// ***********************************************************************
-
-void CTests::OnVerifybugs70228()
-{
-	nsCOMPtr<nsIHelperAppLauncherDialog>
-			myHALD(do_CreateInstance(NS_IHELPERAPPLAUNCHERDLG_CONTRACTID));
-	if (!myHALD)
-		QAOutput("Object not created. It should be. It's a component!", 2);
-	else
-		QAOutput("Object is created. It's a component!", 2);
-}
-
-void CTests::OnVerifybugs90195()
-{
-    nsWeakPtr weakling(
-        do_GetWeakReference(static_cast<nsITooltipListener*>(qaBrowserImpl)));
-
-    rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsITooltipListener));
-	RvTestResult(rv, "AddWebBrowserListener(). Add Tool Tip Lstnr test", 2);
-
-/*	nsCOMPtr<nsITooltipTextProvider> oTooltipTextProvider = do_GetService(NS_TOOLTIPTEXTPROVIDER_CONTRACTID) ;
-	if (!oTooltipTextProvider)
-		AfxMEssageBox("Asdfadf");
-*/
-}
-
-void CTests::OnVerifybugs169617()
-{
-	nsCOMPtr<nsIURILoader> myLoader(do_GetService(NS_URI_LOADER_CONTRACTID,&rv));
-	nsCAutoString theStr;
-
-	QAOutput("Verification for bug 169617!", 2);
-
-	theStr = "file://C|/Program Files";
-	rv = NS_NewURI(getter_AddRefs(theURI), theStr);
-	RvTestResult(rv, "NS_NewURI() test for file url", 1);
-
-	GetTheURI(theURI, 1);
-
-	rv = NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
-	RvTestResult(rv, "NS_NewChannel() test for file url", 1);
-
-	rv = myLoader->OpenURI(theChannel, PR_TRUE, qaBrowserImpl);
-	RvTestResult(rv, "nsIUriLoader->OpenURI() test for file url", 2);
-
-}
-
-void CTests::OnVerifybugs170274()
-{
-	nsCOMPtr<nsIURILoader> myLoader(do_GetService(NS_URI_LOADER_CONTRACTID,&rv));
-	nsCAutoString theStr;
-
-	QAOutput("Verification for bug 170274!", 2);
-
-	theStr = "data:text/plain;charset=iso-8859-7,%be%fg%be";
-	rv = NS_NewURI(getter_AddRefs(theURI), theStr);
-	RvTestResult(rv, "NS_NewURI() test for data url", 1);
-
-	GetTheURI(theURI, 1);
-
-	rv = NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
-	RvTestResult(rv, "NS_NewChannel() test for data url", 1);
-
-	rv = myLoader->OpenURI(theChannel, PR_TRUE, qaBrowserImpl);
-	RvTestResult(rv, "nsIUriLoader->OpenURI() test for data url", 2);
-}
-
-// ***********************************************************************
-
-BOOL CTests::OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo)
-{
-   // To handle Menu handlers add here. Don't have to do if not handling
-   // menu handlers
-	nCommandID = nID;
-
-	return CWnd::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo);
-}
-
-void CTests::OnInterfacesNsirequest()
-{
-	CNsIRequest oNsIRequest(qaWebBrowser,/*qaBaseWindow,qaWebNav,*/ qaBrowserImpl);
-	oNsIRequest.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsidirectoryservice()
-{
-	CNsIDirectoryService oNsIDirectoryService;
-	oNsIDirectoryService.StartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsidomwindow()
-{
-	CDomWindow oDomWindow(qaWebBrowser);
-	oDomWindow.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsiselection()
-{
-	CSelection oSelection(qaWebBrowser);
-	oSelection.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsiprofile()
-{
-	CProfile oProfile(qaWebBrowser);
-	oProfile.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsishistory()
-{
-	CNsIHistory oHistory(qaWebNav);
-	oHistory.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsiwebnav()
-{
-	CNsIWebNav oWebNav(qaWebNav);
-	oWebNav.OnStartTests(nCommandID);
-}
-
-
-void CTests::OnInterfacesNsiclipboardcommands()
-{
-	CNsIClipBoardCmd  oClipCmd(qaWebBrowser);
-	oClipCmd.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsiobserverservice()
-{
-	CnsIObserServ oObserv;
-	oObserv.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsifile()
-{
-	CNsIFile oFile ;
-	oFile.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsiwebbrowser()
-{
-	CNsIWebBrowser oWebBrowser(qaWebBrowser, qaBrowserImpl);
-	oWebBrowser.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsiwebprogress()
-{
-	CnsiWebProg oWebProgress(qaWebBrowser, qaBrowserImpl);
-	oWebProgress.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsiwebbrowfind()
-{
-	CNsIWebBrowFind oWebBrowFind(qaWebBrowser, qaBrowserImpl);
-	oWebBrowFind.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsieditingsession()
-{
-	CnsIEditSession oEditSession(qaWebBrowser);
-	oEditSession.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsicommandmgr()
-{
-	CnsICommandMgr oCommandMgr(qaWebBrowser);
-	oCommandMgr.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsicmdparams()
-{
-	CnsICmdParams oCmdParams(qaWebBrowser);
-	oCmdParams.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsichannel()
-{
-	CnsIChannelTests oChannelTests(qaWebBrowser, qaBrowserImpl);
-	oChannelTests.OnStartTests(nCommandID);
-}
-
-void CTests::OnInterfacesNsihttpchannel()
-{
-	CnsIHttpChannelTests oHttpChannelTests(qaWebBrowser, qaBrowserImpl);
-	oHttpChannelTests.OnStartTests(nCommandID);
-}
-
-
-//Run all interface test cases in automation
-
-void CTests::OnInterfacesRunalltestcases() 
-{
-	CNsIFile oFile ;
-	oFile.OnStartTests(ID_INTERFACES_NSIFILE_RUNALLTESTS);
-
-	CNsIHistory oHistory(qaWebNav);
-	oHistory.OnStartTests(ID_INTERFACES_NSISHISTORY_RUNALLTESTS);
-
-
-	// Can only be run manually
-//	CNsIWebNav oWebNav(qaWebNav);
-//	oWebNav.OnStartTests(ID_INTERFACES_NSIWEBNAV_RUNALLTESTS);
-
-
-	CnsIObserServ oObserv;
-	oObserv.OnStartTests(ID_INTERFACES_NSIOBSERVERSERVICE_RUNALLTESTS);
-
-
-	CNsIDirectoryService oNsIDirectoryService;
-	oNsIDirectoryService.StartTests(ID_INTERFACES_NSIDIRECTORYSERVICE_RUNALLTESTS);
-
-
-	CDomWindow oDomWindow(qaWebBrowser) ;
-	oDomWindow.OnStartTests(ID_INTERFACES_NSIDOMWINDOW_RUNALLTESTS);
-
-
-	// Can only be run manually
-	//CSelection oSelection(qaWebBrowser);
-	//oSelection.OnStartTests(ID_INTERFACES_NSISELECTION_RUNALLTESTS);
-
-
-	CProfile oProfile(qaWebBrowser);
-	oProfile.OnStartTests(ID_INTERFACES_NSIPROFILE_RUNALLTESTS);
-
-
-	// Can only be run manually
-	//CNsIClipBoardCmd  oClipCmd(qaWebBrowser);
-	//oClipCmd.OnStartTests(nCommandID);
-
-
-	CNsIRequest oNsIRequest(qaWebBrowser,/*qaBaseWindow,qaWebNav,*/ qaBrowserImpl);
-	oNsIRequest.OnStartTests(ID_INTERFACES_NSIREQUEST_RUNALLTESTS);
-
-
-	CNsIWebBrowser oWebBrowser(qaWebBrowser, qaBrowserImpl);
-	oWebBrowser.OnStartTests(ID_INTERFACES_NSIWEBBROWSER_RUNALLTESTS);
-
-
-	CnsiWebProg oWebProgress(qaWebBrowser, qaBrowserImpl);
-	oWebProgress.OnStartTests(ID_INTERFACES_NSIWEBPROGRESS_RUNALLTESTS);
-
-
-	CNsIWebBrowFind oWebBrowFind(qaWebBrowser, qaBrowserImpl);
-	oWebBrowFind.OnStartTests(ID_INTERFACES_NSIWEBBROWSERFIND_RUNALLTESTS);
-
-
-	CnsIEditSession oEditSession(qaWebBrowser);
-	oEditSession.OnStartTests(ID_INTERFACES_NSIEDITINGSESSION_RUNALLTESTS);
-
-
-	CnsICommandMgr oCommandMgr(qaWebBrowser);
-	oCommandMgr.OnStartTests(ID_INTERFACES_NSICOMMANDMANAGER_RUNALLTESTS);
-
-
-	CnsICmdParams oCmdParams(qaWebBrowser);
-	oCmdParams.OnStartTests(ID_INTERFACES_NSICOMMANDPARAMS_RUNALLTESTS);
-
-	CnsIChannelTests oChannelTests(qaWebBrowser, qaBrowserImpl);
-	oChannelTests.OnStartTests(ID_INTERFACES_NSICHANNEL_RUNALLTESTS);
-
-	CnsIHttpChannelTests oHttpChannelTests(qaWebBrowser, qaBrowserImpl);
-	oHttpChannelTests.OnStartTests(ID_INTERFACES_NSIHTTPCHANNEL_RUNALLTESTS);
-}
diff --git a/embedding/qa/testembed/Tests.h b/embedding/qa/testembed/Tests.h
deleted file mode 100644
index f75a57c144c..00000000000
--- a/embedding/qa/testembed/Tests.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Tests.h : header file for QA test cases
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _TESTS_H
-#define _TESTS_H
-
-#if _MSC_VER > 1000
-	#pragma once
-#endif
-
-#include "BrowserView.h"
-#include "BrowserImpl.h"
-#include "StdAfx.h"
-#include "UrlDialog.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CTESTS class
-
-class CBrowserImpl;
-class CBrowserView;
-
-class CTests:public CWnd
-{
-public:
-	CTests(nsIWebBrowser* mWebBrowser,
-			   nsIBaseWindow* mBaseWindow,
-			   nsIWebNavigation* mWebNav,
-			   CBrowserImpl *mpBrowserImpl);
-	virtual ~CTests();
-
-	// Some helper methods
-
-	// Mozilla interfaces
-	//
-	//static 
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser;
-	nsCOMPtr<nsIBaseWindow> qaBaseWindow;
-	nsCOMPtr<nsIWebNavigation> qaWebNav;
-	CBrowserImpl	*qaBrowserImpl;
-	CUrlDialog myDialog;
-
-	// local test methods
-
-	// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CTests)
-	public:
-	virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
-	//}}AFX_VIRTUAL
-
-private:
-	// Individual interface Objects
-
-	// local test variables
-	PRBool exists;
-	nsCOMPtr<nsIURI> theURI;
-	nsCOMPtr<nsIChannel> theChannel;
-	UINT nCommandID;
-protected:
-	//{{AFX_MSG(CTests)
-	afx_msg void OnUpdateNavBack(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateNavForward(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateNavStop(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateCut(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateCopy(CCmdUI* pCmdUI);
-	afx_msg void OnUpdatePaste(CCmdUI* pCmdUI);
-	afx_msg void OnTestsChangeUrl();
-	afx_msg void OnTestsGlobalHistory();
-	afx_msg void OnTestsCreateFile();
-	afx_msg void OnTestsCreateprofile();
-	afx_msg void OnTestsAddTooltipListener();
-	afx_msg void OnTestsAddWebProgListener();
-	afx_msg void OnTestsAddHistoryListener();
-	afx_msg void OnTestsRemovehistorylistener();
-	afx_msg void OnTestsAddUriContentListenerByWebBrowser();
-	afx_msg void OnTestsAddUriContentListenerByUriLoader();
-	afx_msg void OnTestsAddUriContentListenerByOpenUri();
-	afx_msg void OnTestsNSNewChannelAndAsyncOpen();
-	afx_msg void OnTestsIOServiceNewURI();
-	afx_msg void OnTestsProtocolHandlerNewURI();
-	afx_msg void OnInterfacesNsifile();
-	afx_msg void OnToolsRemoveGHPage();
-	afx_msg void OnToolsRemoveAllGH();
-	afx_msg void OnToolsViewLogfile();
-	afx_msg void OnToolsDeleteLogfile();
-	afx_msg void OnToolsTestYourMethod();
-	afx_msg void OnToolsTestYourMethod2();
-	afx_msg void OnVerifybugs70228();
-	afx_msg void OnVerifybugs90195();
-	afx_msg void OnVerifybugs169617();
-	afx_msg void OnVerifybugs170274();
-    afx_msg void OnPasteTest();
-    afx_msg void OnCopyTest();
-    afx_msg void OnSelectAllTest();
-    afx_msg void OnSelectNoneTest();
-    afx_msg void OnCutSelectionTest();
-    afx_msg void copyLinkLocationTest();
-    afx_msg void canCopySelectionTest();
-    afx_msg void canCutSelectionTest();
-    afx_msg void canPasteTest();
-	afx_msg void OnInterfacesNsirequest();
-	afx_msg void OnInterfacesNsidomwindow();
-	afx_msg void OnInterfacesNsidirectoryservice();
-	afx_msg void OnInterfacesNsiselection();
-	afx_msg void OnInterfacesNsiprofile();
-	afx_msg void OnInterfacesNsishistory();
-	afx_msg void OnInterfacesNsiwebnav();
-	afx_msg void OnInterfacesNsiclipboardcommands();
-	afx_msg void OnInterfacesNsiobserverservice();
-	afx_msg void OnInterfacesNsiwebbrowser();
-	afx_msg void OnInterfacesNsiwebprogress();
-	afx_msg void OnInterfacesNsiwebbrowfind();
-	afx_msg void OnInterfacesNsieditingsession();
-	afx_msg void OnInterfacesNsicommandmgr();
-	afx_msg void OnInterfacesNsicmdparams();
-	afx_msg void OnInterfacesRunalltestcases();
-	afx_msg void OnInterfacesNsichannel();
-	afx_msg void OnInterfacesNsihttpchannel();
-
-	//}}AFX_MSG
-
-	DECLARE_MESSAGE_MAP()
-
-	// individual nsIFile tests
-	void InitWithPathTest(nsILocalFile *);
-	void AppendRelativePathTest(nsILocalFile *);
-	void FileCreateTest(nsILocalFile *);
-	void FileExistsTest(nsILocalFile *);
-	void FileCopyTest(nsILocalFile *, nsILocalFile *);
-	void FileMoveTest(nsILocalFile *, nsILocalFile *);
-};
-
-#endif //_TESTS_H
-
diff --git a/embedding/qa/testembed/UrlDialog.cpp b/embedding/qa/testembed/UrlDialog.cpp
deleted file mode 100644
index fb7b64caed9..00000000000
--- a/embedding/qa/testembed/UrlDialog.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// UrlDialog.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "Testembed.h"
-#include "UrlDialog.h"
-#include "QaUtils.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CUrlDialog dialog
-
-
-CUrlDialog::CUrlDialog(CWnd* pParent /*=NULL*/)
-	: CDialog(CUrlDialog::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(CUrlDialog)
-	m_urlfield = _T("");
-	m_flagvalue = 0;
-	m_flagIndex = -1;
-	m_chkValue = FALSE;
-	//}}AFX_DATA_INIT
-}
-
-
-void CUrlDialog::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CUrlDialog)
-	DDX_Control(pDX, IDC_CHKURLFLAG, m_chkFlags);
-	DDX_Control(pDX, IDC_COMBO1, m_urlflags);
-	DDX_Text(pDX, IDC_URLFIELD, m_urlfield);
-	DDX_CBIndex(pDX, IDC_COMBO1, m_flagIndex);
-	DDX_Check(pDX, IDC_CHKURLFLAG, m_chkValue);
-	DDX_Control(pDX, IDC_COMBO2, m_protocol);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(CUrlDialog, CDialog)
-	//{{AFX_MSG_MAP(CUrlDialog)
-	ON_EN_CHANGE(IDC_URLFIELD, OnChangeUrlfield)
-	ON_BN_CLICKED(IDC_CHKURLFLAG, OnChkurlflag)
-	ON_EN_CHANGE(IDC_COMBO1, OnChangeUrlfield)
-	ON_CBN_SELCHANGE(IDC_COMBO1, OnSelchangeCombo1)
-	ON_CBN_SELCHANGE(IDC_COMBO2, OnSelchangeCombo2)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CUrlDialog message handlers
-
-void CUrlDialog::OnChangeUrlfield() 
-{
-	// TODO: If this is a RICHEDIT control, the control will not
-	// send this notification unless you override the CDialog::OnInitDialog()
-	// function and call CRichEditCtrl().SetEventMask()
-	// with the ENM_CHANGE flag ORed into the mask.
-	
-	// TODO: Add your control notification handler code here
-
-}
-
-void CUrlDialog::OnChkurlflag() 
-{
-	m_chkValue = ! m_chkValue ;
-	m_urlflags.EnableWindow(m_chkValue);
-}
-
-BOOL CUrlDialog::OnInitDialog() 
-{
-	CDialog::OnInitDialog();
-	
-	m_flagIndex = 0;
-	m_urlflags.SetCurSel(m_flagIndex);
-	m_urlflags.EnableWindow(m_chkValue);
-
-	
-	return TRUE;  // return TRUE unless you set the focus to a control
-	              // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-void CUrlDialog::OnSelchangeCombo1() 
-{
-   CString flagvalue;
-// m_urlflags.GetLBText(m_flagIndex,flagvalue);
-   m_flagIndex = m_urlflags.GetCurSel();
-
-//   if (flagvalue == "NONE") {
-   if (m_flagIndex == 0) {
-	   QAOutput("Selected NONE flag.", 1);
-	   m_flagvalue = nsIWebNavigation::LOAD_FLAGS_NONE;
-   }
-   else if (m_flagIndex == 1) {
-		QAOutput("Selected MASK flag.", 1);
-		m_flagvalue = nsIWebNavigation::LOAD_FLAGS_MASK;
-   }
-   else if (m_flagIndex == 2) {
-		QAOutput("Selected IS_LINK flag.", 1);
-		m_flagvalue = nsIWebNavigation::LOAD_FLAGS_IS_LINK;
-   }
-   else if (m_flagIndex == 3) {
-		QAOutput("Selected BYPASS_HISTORY flag.", 1);
-		m_flagvalue = nsIWebNavigation::LOAD_FLAGS_BYPASS_HISTORY;
-   }
-   else if (m_flagIndex == 4) {
-		QAOutput("Selected REPLACE_HISTORY flag.", 1);
-		m_flagvalue = nsIWebNavigation::LOAD_FLAGS_REPLACE_HISTORY;
-   }
-   else if (m_flagIndex == 5) {
-		QAOutput("Selected BYPASS_CACHE flag.", 1);
-		m_flagvalue = nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE;
-   }
-   else if (m_flagIndex == 6) {
-		QAOutput("Selected BYPASS_PROXY flag.", 1);
-		m_flagvalue = nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY;
-   }
-   else if (m_flagIndex == 7) {
-		QAOutput("Selected CHARSET_CHANGE flag.", 1);
-		m_flagvalue = nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE;	
-   }
-   else if (m_flagIndex == 8) {
-		QAOutput("Selected REFRESH flag.", 1);
-		m_flagvalue = nsIWebNavigation::LOAD_FLAGS_IS_REFRESH;	
-   }
-   else
-		QAOutput("NO FLAG!!!.", 1);
-}
-
-void CUrlDialog::OnSelchangeCombo2() 
-{
-   m_protocolIndex = m_protocol.GetCurSel();
-
-   if (m_protocolIndex == 0) {
-		QAOutput("Selected http protocol.", 1);
-		m_protocolvalue = "http";
-   }
-   else if (m_protocolIndex == 1) {
-		QAOutput("Selected https protocol.", 1);
-		m_protocolvalue = "https";
-   }
-   else if (m_protocolIndex == 2) {
-		QAOutput("Selected ftp protocol.", 1);
-		m_protocolvalue = "ftp";
-   }
-   else if (m_protocolIndex == 3) {
-		QAOutput("Selected file protocol.", 1);
-		m_protocolvalue = "file";
-   }
-   else if (m_protocolIndex == 4) {
-		QAOutput("Selected javascript protocol.", 1);
-		m_protocolvalue = "javascript";
-   }
-   else if (m_protocolIndex == 5) {
-		QAOutput("Selected about protocol.", 1);
-		m_protocolvalue = "about";
-   }
-   else if (m_protocolIndex == 6) {
-		QAOutput("Selected data protocol.", 1);
-		m_protocolvalue = "data";
-   }
-   else if (m_protocolIndex == 7) {
-		QAOutput("Selected mailto protocol.", 1);
-		m_protocolvalue = "mailto";	
-   }
-   else if (m_protocolIndex == 8) {
-		QAOutput("Selected imap protocol.", 1);
-		m_protocolvalue = "imap";	
-   }
-   else
-		QAOutput("NO PROTOCOL SELECTED!!!.", 1);
-}
\ No newline at end of file
diff --git a/embedding/qa/testembed/UrlDialog.h b/embedding/qa/testembed/UrlDialog.h
deleted file mode 100644
index 90c4c278553..00000000000
--- a/embedding/qa/testembed/UrlDialog.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#if !defined(AFX_URLDIALOG_H__260C4EE1_2F8E_11D5_99F0_00C04FA02BE6__INCLUDED_)
-#define AFX_URLDIALOG_H__260C4EE1_2F8E_11D5_99F0_00C04FA02BE6__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// UrlDialog.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// CUrlDialog dialog
-
-class CUrlDialog : public CDialog
-{
-// Construction
-public:
-	CUrlDialog(CWnd* pParent = NULL);   // standard constructor
-//    unsigned long m_flagvalue ;
-    PRUint32 m_flagvalue;
-// Dialog Data
-	//{{AFX_DATA(CUrlDialog)
-	enum { IDD = IDD_URLDIALOG };
-	CButton	m_chkFlags;
-	CComboBox	m_urlflags;
-	CString	m_urlfield;
-	int		m_flagIndex;
-	int		m_protocolIndex;
-	BOOL	m_chkValue;
-	CComboBox m_protocol;
-	CString m_protocolvalue;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CUrlDialog)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(CUrlDialog)
-	afx_msg void OnChangeUrlfield();
-	afx_msg void OnChkurlflag();
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSelchangeCombo1();
-	afx_msg void OnSelchangeCombo2();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_URLDIALOG_H__260C4EE1_2F8E_11D5_99F0_00C04FA02BE6__INCLUDED_)
diff --git a/embedding/qa/testembed/WebProgDlg.cpp b/embedding/qa/testembed/WebProgDlg.cpp
deleted file mode 100644
index cdcb844567a..00000000000
--- a/embedding/qa/testembed/WebProgDlg.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// WebProgDlg.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "testembed.h"
-#include "WebProgDlg.h"
-#include "QaUtils.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CWebProgDlg dialog
-
-
-CWebProgDlg::CWebProgDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(CWebProgDlg::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(CWebProgDlg)
-	m_wpFlagValue = 0;
-	m_wpFlagIndex = -1;
-	//}}AFX_DATA_INIT
-}
-
-
-void CWebProgDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CWebProgDlg)
-	DDX_Control(pDX, IDC_WPCOMBO, m_webProgFlags);
-	DDX_CBIndex(pDX, IDC_WPCOMBO, m_wpFlagIndex);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(CWebProgDlg, CDialog)
-	//{{AFX_MSG_MAP(CWebProgDlg)
-	ON_CBN_SELCHANGE(IDC_WPCOMBO, OnSelectWPCombo)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CWebProgDlg message handlers
-
-BOOL CWebProgDlg::OnInitWPDialog()
-{
-	CDialog::OnInitDialog();
-
-	m_wpFlagIndex = 0;
-	m_webProgFlags.SetCurSel(m_wpFlagIndex);
-
-	return TRUE;
-}
-void CWebProgDlg::OnSelectWPCombo()
-{
-	m_wpFlagIndex = m_webProgFlags.GetCurSel();	
-
-	if (m_wpFlagIndex == 0) {
-		m_wpFlagValue = nsIWebProgress::NOTIFY_STATE_REQUEST;
-		QAOutput("Selected NOTIFY_STATE_REQUEST flag.", 1);
-	}
-	else if (m_wpFlagIndex == 1) {
-		m_wpFlagValue = nsIWebProgress::NOTIFY_STATE_DOCUMENT;
-		QAOutput("Selected NOTIFY_STATE_DOCUMENT flag.", 1);
-	}
-	else if (m_wpFlagIndex == 2) {
-		m_wpFlagValue = nsIWebProgress::NOTIFY_STATE_NETWORK;
-		QAOutput("Selected NOTIFY_STATE_NETWORK flag.", 1);
-	}
-	else if (m_wpFlagIndex == 3) {
-		m_wpFlagValue = nsIWebProgress::NOTIFY_STATE_WINDOW;
-		QAOutput("Selected NOTIFY_STATE_WINDOW flag.", 1);
-	}
-	else if (m_wpFlagIndex == 4) {
-		m_wpFlagValue = nsIWebProgress::NOTIFY_STATE_ALL;
-		QAOutput("Selected NOTIFY_STATE_ALL flag.", 1);
-	}
-	else if (m_wpFlagIndex == 5) {
-		m_wpFlagValue = nsIWebProgress::NOTIFY_PROGRESS;
-		QAOutput("Selected NOTIFY_PROGRESS flag.", 1);
-	}
-	else if (m_wpFlagIndex == 6) {
-		m_wpFlagValue = nsIWebProgress::NOTIFY_STATUS;
-		QAOutput("Selected NOTIFY_STATUS flag.", 1);
-	}
-	else if (m_wpFlagIndex == 7) {
-		m_wpFlagValue = nsIWebProgress::NOTIFY_SECURITY;
-		QAOutput("Selected NOTIFY_SECURITY flag.", 1);
-	}
-	else if (m_wpFlagIndex == 8) {
-		m_wpFlagValue = nsIWebProgress::NOTIFY_LOCATION;
-		QAOutput("Selected NOTIFY_LOCATION flag.", 1);
-	}
-	else if (m_wpFlagIndex == 9) {
-		m_wpFlagValue = nsIWebProgress::NOTIFY_ALL;
-		QAOutput("Selected NOTIFY_ALL flag.", 1);
-	}
-	else
-		QAOutput("NO FLAG!!!.", 1);
-}
diff --git a/embedding/qa/testembed/WebProgDlg.h b/embedding/qa/testembed/WebProgDlg.h
deleted file mode 100644
index 0e0668240da..00000000000
--- a/embedding/qa/testembed/WebProgDlg.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#if !defined(AFX_WEBPROGDLG_H__79FFB433_9E6A_11D6_9BD9_00C04FA02BE6__INCLUDED_)
-#define AFX_WEBPROGDLG_H__79FFB433_9E6A_11D6_9BD9_00C04FA02BE6__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// WebProgDlg.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// CWebProgDlg dialog
-
-class CWebProgDlg : public CDialog
-{
-// Construction
-public:
-	CWebProgDlg(CWnd* pParent = NULL);   // standard constructor
-	unsigned long m_wpFlagValue;
-// Dialog Data
-	//{{AFX_DATA(CWebProgDlg)
-	enum { IDD = IDD_WEBPROGDLG };
-	CComboBox	m_webProgFlags;
-	int			m_wpFlagIndex;
-		// NOTE: the ClassWizard will add data members here
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CWebProgDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(CWebProgDlg)
-	virtual BOOL OnInitWPDialog();
-	afx_msg	void OnSelectWPCombo();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WEBPROGDLG_H__79FFB433_9E6A_11D6_9BD9_00C04FA02BE6__INCLUDED_)
diff --git a/embedding/qa/testembed/components/Dialogs.cpp b/embedding/qa/testembed/components/Dialogs.cpp
deleted file mode 100644
index 6188964b77a..00000000000
--- a/embedding/qa/testembed/components/Dialogs.cpp
+++ /dev/null
@@ -1,437 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "stdafx.h"
-#include "Dialogs.h"
-
-// File overview....
-//
-// Contains dialog box code to support Alerts, Prompts such as
-// password prompt and username/password prompts
-//
-
-//--------------------------------------------------------------------------//
-//				CPromptDialog Stuff
-//--------------------------------------------------------------------------//
-
-CPromptDialog::CPromptDialog(CWnd* pParent, const char* pTitle, const char* pText,
-                             const char* pInitPromptText,
-                             BOOL bHasCheck, const char* pCheckText, int initCheckVal)
-    : CDialog(CPromptDialog::IDD, pParent),
-    m_bHasCheckBox(bHasCheck)
-{   
-    if(pTitle)
-        m_csDialogTitle = pTitle;
-    if(pText)
-        m_csPromptText = pText;
-    if(pInitPromptText)
-        m_csPromptAnswer = pInitPromptText;
-    if(pCheckText)
-        m_csCheckBoxText = pCheckText; 
-}
-
-void CPromptDialog::DoDataExchange(CDataExchange* pDX)
-{
-    CDialog::DoDataExchange(pDX);
-    //{{AFX_DATA_MAP(CPromptDialog)
-    DDX_Text(pDX, IDC_PROMPT_ANSWER, m_csPromptAnswer);
-    DDX_Check(pDX, IDC_CHECK_SAVE_PASSWORD, m_bCheckBoxValue);
-    //}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CPromptDialog, CDialog)
-    //{{AFX_MSG_MAP(CPromptDialog)
-        // NOTE: the ClassWizard will add message map macros here
-    //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-int CPromptDialog::OnInitDialog()
-{   
-    SetWindowText(m_csDialogTitle);
-  
-    CWnd *pWnd = GetDlgItem(IDC_PROMPT_TEXT);
-    if(pWnd)
-        pWnd->SetWindowText(m_csPromptText);
-
-    CButton *pChk = (CButton *)GetDlgItem(IDC_CHECK_SAVE_PASSWORD);
-    if(pChk)
-    {
-        if (m_bHasCheckBox)
-        {
-            if(!m_csCheckBoxText.IsEmpty())
-                pChk->SetWindowText(m_csCheckBoxText);
-            pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
-        }
-        else
-        {
-            // Hide the check box control if there's no label text
-            // This will be the case when we're not using single sign-on
-            pChk->ShowWindow(SW_HIDE); 
-        }
-    }
-
-    CEdit *pEdit = (CEdit *)GetDlgItem(IDC_PROMPT_ANSWER);
-    if(pEdit) 
-    {
-        pEdit->SetWindowText(m_csPromptAnswer);
-        pEdit->SetFocus();
-        pEdit->SetSel(0, -1);
-
-        return 0; // Returning "0" since we're explicitly setting focus
-    }
-
-    return TRUE;
-}
-
-//--------------------------------------------------------------------------//
-//				CPromptPasswordDialog Stuff
-//--------------------------------------------------------------------------//
-
-CPromptPasswordDialog::CPromptPasswordDialog(CWnd* pParent, const char* pTitle, const char* pText,
-                                             const char* pInitPasswordText,
-                                             BOOL bHasCheck, const char* pCheckText, int initCheckVal)
-    : CDialog(CPromptPasswordDialog::IDD, pParent),
-    m_bHasCheckBox(bHasCheck), m_bCheckBoxValue(initCheckVal)
-{   
-	if(pTitle)
-		m_csDialogTitle = pTitle;
-	if(pText)
-		m_csPromptText = pText;
-	if(pInitPasswordText)
-	    m_csPassword = pInitPasswordText;
-	if(pCheckText)
-		m_csCheckBoxText = pCheckText;
-}
-
-void CPromptPasswordDialog::DoDataExchange(CDataExchange* pDX)
-{
-    CDialog::DoDataExchange(pDX);
-    //{{AFX_DATA_MAP(CPromptPasswordDialog)
-    DDX_Text(pDX, IDC_PASSWORD, m_csPassword);
-    DDX_Check(pDX, IDC_CHECK_SAVE_PASSWORD, m_bCheckBoxValue);
-    //}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CPromptPasswordDialog, CDialog)
-    //{{AFX_MSG_MAP(CPromptPasswordDialog)
-        // NOTE: the ClassWizard will add message map macros here
-    //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-int CPromptPasswordDialog::OnInitDialog()
-{   
-    SetWindowText(m_csDialogTitle);
-  
-    CWnd *pWnd = GetDlgItem(IDC_PROMPT_TEXT);
-    if(pWnd)
-        pWnd->SetWindowText(m_csPromptText);
-
-    CButton *pChk = (CButton *)GetDlgItem(IDC_CHECK_SAVE_PASSWORD);
-    if(pChk)
-    {
-        if (m_bHasCheckBox)
-        {
-            if(!m_csCheckBoxText.IsEmpty())
-                pChk->SetWindowText(m_csCheckBoxText);
-            pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
-        }
-        else
-        {
-            // Hide the check box control if there's no label text
-            // This will be the case when we're not using single sign-on
-            pChk->ShowWindow(SW_HIDE); 
-        }
-    }
-
-    CEdit *pEdit = (CEdit *)GetDlgItem(IDC_PASSWORD);
-    if(pEdit) 
-    {
-        pEdit->SetFocus();
-
-        return 0; // Returning "0" since we're explicitly setting focus
-    }
-
-    return TRUE;
-}
-
-//--------------------------------------------------------------------------//
-//				CPromptUsernamePasswordDialog Stuff
-//--------------------------------------------------------------------------//
-
-CPromptUsernamePasswordDialog::CPromptUsernamePasswordDialog(CWnd* pParent, const char* pTitle, const char* pText,
-                                  const char* pInitUsername, const char* pInitPassword, 
-		                          BOOL bHasCheck, const char* pCheckText, int initCheckVal)
-    : CDialog(CPromptUsernamePasswordDialog::IDD, pParent),
-    m_bHasCheckBox(bHasCheck), m_bCheckBoxValue(initCheckVal)
-{
-    if(pTitle)
-        m_csDialogTitle = pTitle;
-    if(pText)
-        m_csPromptText = pText;
-    if(pInitUsername)
-        m_csUserName = pInitUsername;
-    if(pInitPassword)
-        m_csPassword = pInitPassword;
-    if(pCheckText)
-        m_csCheckBoxText = pCheckText;
-}
-
-void CPromptUsernamePasswordDialog::DoDataExchange(CDataExchange* pDX)
-{
-    CDialog::DoDataExchange(pDX);
-    //{{AFX_DATA_MAP(CPromptUsernamePasswordDialog)
-    DDX_Text(pDX, IDC_USERNAME, m_csUserName);
-    DDX_Text(pDX, IDC_PASSWORD, m_csPassword);
-    DDX_Check(pDX, IDC_CHECK_SAVE_PASSWORD, m_bCheckBoxValue);
-    //}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CPromptUsernamePasswordDialog, CDialog)
-    //{{AFX_MSG_MAP(CPromptUsernamePasswordDialog)
-        // NOTE: the ClassWizard will add message map macros here
-    //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-int CPromptUsernamePasswordDialog::OnInitDialog()
-{   
-   	SetWindowText(m_csDialogTitle);
-  
-    CWnd *pWnd = GetDlgItem(IDC_PROMPT_TEXT);
-    if(pWnd)
-        pWnd->SetWindowText(m_csPromptText);
-
-    CButton *pChk = (CButton *)GetDlgItem(IDC_CHECK_SAVE_PASSWORD);
-    if(pChk)
-    {
-        if(m_bHasCheckBox)
-        {
-            if (!m_csCheckBoxText.IsEmpty())
-                pChk->SetWindowText(m_csCheckBoxText);
-            pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
-        }
-        else
-        {
-            pChk->ShowWindow(SW_HIDE);
-        }
-    }
-
-    CEdit *pEdit = (CEdit *)GetDlgItem(IDC_PASSWORD);
-    if(pEdit) 
-    {
-        pEdit->SetWindowText(m_csPassword);
-    }
-
-    pEdit = (CEdit *)GetDlgItem(IDC_USERNAME);
-    if(pEdit) 
-    {
-        pEdit->SetWindowText(m_csUserName);
-        pEdit->SetSel(0, -1);
-
-        pEdit->SetFocus();
-
-        return 0; // Returning "0" since we're explicitly setting focus
-    }
-
-    return TRUE;
-}
-
-//--------------------------------------------------------------------------//
-//				CAlertCheckDialog Stuff
-//--------------------------------------------------------------------------//
-
-CAlertCheckDialog::CAlertCheckDialog(CWnd* pParent, const char* pTitle, const char* pText,
-                             const char* pCheckText, int initCheckVal)
-        : CDialog(CAlertCheckDialog::IDD, pParent)
-{   
-    if(pTitle)
-        m_csDialogTitle = pTitle;
-    if(pText)
-        m_csMsgText = pText;
-    if(pCheckText)
-        m_csCheckBoxText = pCheckText; 
-
-    m_bCheckBoxValue = initCheckVal;
-}
-
-void CAlertCheckDialog::DoDataExchange(CDataExchange* pDX)
-{
-    CDialog::DoDataExchange(pDX);
-    //{{AFX_DATA_MAP(CAlertCheckDialog)
-    DDX_Check(pDX, IDC_CHECKBOX, m_bCheckBoxValue);
-    //}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CAlertCheckDialog, CDialog)
-    //{{AFX_MSG_MAP(CAlertCheckDialog)
-        // NOTE: the ClassWizard will add message map macros here
-    //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-int CAlertCheckDialog::OnInitDialog()
-{
-    SetWindowText(m_csDialogTitle);
-
-    CWnd *pWnd = GetDlgItem(IDC_MSG_TEXT);
-    if(pWnd)
-        pWnd->SetWindowText(m_csMsgText);
-
-    CButton *pChk = (CButton *)GetDlgItem(IDC_CHECKBOX);
-    if(pChk)
-    {
-        pChk->SetWindowText(m_csCheckBoxText);
-        pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
-    }
-
-    return TRUE;
-}
-
-//--------------------------------------------------------------------------//
-//				CConfirmCheckDialog Stuff
-//--------------------------------------------------------------------------//
-
-CConfirmCheckDialog::CConfirmCheckDialog(CWnd* pParent, const char* pTitle, const char* pText,
-                            const char* pCheckText, int initCheckVal,
-                            const char *pBtn1Text, const char *pBtn2Text, 
-                            const char *pBtn3Text)
-            : CDialog(CConfirmCheckDialog::IDD, pParent)
-{   
-    if(pTitle)
-        m_csDialogTitle = pTitle;
-    if(pText)
-        m_csMsgText = pText;
-    if(pCheckText)
-        m_csCheckBoxText = pCheckText; 
-
-    m_bCheckBoxValue = initCheckVal;
-
-    if(pBtn1Text)
-        m_csBtn1Text = pBtn1Text;
-    if(pBtn2Text)
-        m_csBtn2Text = pBtn2Text;
-    if(pBtn3Text)
-        m_csBtn3Text = pBtn3Text;
-}
-
-void CConfirmCheckDialog::DoDataExchange(CDataExchange* pDX)
-{
-    CDialog::DoDataExchange(pDX);
-    //{{AFX_DATA_MAP(CConfirmCheckDialog)
-    DDX_Check(pDX, IDC_CHECKBOX, m_bCheckBoxValue);
-    //}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CConfirmCheckDialog, CDialog)
-    //{{AFX_MSG_MAP(CConfirmCheckDialog)
-    ON_BN_CLICKED(IDC_BTN1, OnBtn1Clicked)
-    ON_BN_CLICKED(IDC_BTN2, OnBtn2Clicked)
-    ON_BN_CLICKED(IDC_BTN3, OnBtn3Clicked)
-    //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-int CConfirmCheckDialog::OnInitDialog()
-{   
-   	SetWindowText(m_csDialogTitle);
-  
-    CWnd *pWnd = GetDlgItem(IDC_MSG_TEXT);
-    if(pWnd)
-        pWnd->SetWindowText(m_csMsgText);
-
-    CButton *pChk = (CButton *)GetDlgItem(IDC_CHECKBOX);
-    if(pChk)
-    {
-        if(m_csCheckBoxText.IsEmpty())
-        {
-            pChk->ShowWindow(SW_HIDE);
-        }
-        else
-        {
-            pChk->SetWindowText(m_csCheckBoxText);
-            pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
-        }
-    }
-
-    CButton *pBtn1 = (CButton *)GetDlgItem(IDC_BTN1);
-    if(pBtn1)
-    {
-        if(m_csBtn1Text.IsEmpty())
-            pBtn1->ShowWindow(SW_HIDE);
-        else
-            pBtn1->SetWindowText(m_csBtn1Text);
-    }
-
-    CButton *pBtn2 = (CButton *)GetDlgItem(IDC_BTN2);
-    if(pBtn2)
-    {
-        if(m_csBtn2Text.IsEmpty())
-            pBtn2->ShowWindow(SW_HIDE);
-        else
-            pBtn2->SetWindowText(m_csBtn2Text);
-    }
-
-    CButton *pBtn3 = (CButton *)GetDlgItem(IDC_BTN3);
-    if(pBtn3)
-    {
-        if(m_csBtn3Text.IsEmpty())
-            pBtn3->ShowWindow(SW_HIDE);
-        else
-            pBtn3->SetWindowText(m_csBtn3Text);
-    }
-
-    return TRUE;
-}
-
-void CConfirmCheckDialog::OnBtn1Clicked()
-{
-    UpdateData();
-
-    EndDialog(0); // where 0 indicates that the btn pressed was at index 0
-}
-
-void CConfirmCheckDialog::OnBtn2Clicked()
-{
-    UpdateData();
-
-    EndDialog(1); // where 1 indicates that the btn pressed was at index 1
-}
-
-void CConfirmCheckDialog::OnBtn3Clicked()
-{
-    UpdateData();
-
-    EndDialog(2); // where 2 indicates that the btn pressed was at index 2
-}
diff --git a/embedding/qa/testembed/components/Dialogs.h b/embedding/qa/testembed/components/Dialogs.h
deleted file mode 100644
index 5f765b95766..00000000000
--- a/embedding/qa/testembed/components/Dialogs.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _DIALOGS_H_
-#define _DIALOGS_H_
-
-#include "resource.h"
-
-class CPromptDialog : public CDialog
-{
-public:
-    CPromptDialog(CWnd* pParent, const char* pTitle, const char* pText,
-                  const char* pInitPromptText,
-                  BOOL bHasCheck, const char* pCheckText, int initCheckVal);
-	
-	// Dialog Data
-    enum { IDD = IDD_PROMPT_DIALOG };
-    CString m_csPromptAnswer;
-
-    CString m_csDialogTitle;
-	CString m_csPromptText;
-	BOOL m_bHasCheckBox;
-	CString m_csCheckBoxText;
-	int m_bCheckBoxValue;
-    
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CPromptDialog)
-	protected:
-    virtual void DoDataExchange(CDataExchange* pDX);
-	//}}AFX_VIRTUAL
-
-	//{{AFX_MSG(CPromptDialog)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-    DECLARE_MESSAGE_MAP()
-};
-
-class CPromptPasswordDialog : public CDialog
-{
-public:
-    CPromptPasswordDialog(CWnd* pParent, const char* pTitle, const char* pText,
-                          const char* pInitPasswordText,
-                          BOOL bHasCheck, const char* pCheckText, int initCheckVal);
-	
-	// Dialog Data
-    enum { IDD = IDD_PROMPT_PASSWORD_DIALOG };
-
-    CString m_csDialogTitle;
-	CString m_csPromptText;
-	CString m_csPassword;
-	BOOL m_bHasCheckBox;
-	CString m_csCheckBoxText;
-	int m_bCheckBoxValue;
-
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CPromptPasswordDialog)		
-	protected:
-    virtual void DoDataExchange(CDataExchange* pDX);
-	//}}AFX_VIRTUAL
-
-	//{{AFX_MSG(CPromptPasswordDialog)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-    DECLARE_MESSAGE_MAP()
-};
-
-class CPromptUsernamePasswordDialog : public CDialog
-{
-public:
-    CPromptUsernamePasswordDialog(CWnd* pParent, const char* pTitle, const char* pText,
-                                  const char* pInitUsername, const char* pInitPassword, 
-		                          BOOL bHasCheck, const char* pCheckText, int initCheckVal);
-	
-	// Dialog Data
-    enum { IDD = IDD_PROMPT_USERPASS_DIALOG };
-
-    CString m_csDialogTitle;
-	CString m_csPromptText;
-	CString m_csUserNameLabel;
-	CString m_csPasswordLabel;
-	CString m_csPassword;
-	CString m_csUserName;
-	BOOL m_bHasCheckBox;
-	CString m_csCheckBoxText;
-	int m_bCheckBoxValue;
-
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CPromptUsernamePasswordDialog)	
-	protected:
-    virtual void DoDataExchange(CDataExchange* pDX);
-	//}}AFX_VIRTUAL
-
-	//{{AFX_MSG(CPromptUsernamePasswordDialog)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-
-    DECLARE_MESSAGE_MAP()
-};
-
-class CAlertCheckDialog : public CDialog
-{
-public:
-    CAlertCheckDialog(CWnd* pParent, const char* pTitle, const char* pText,
-                  const char* pCheckText, int initCheckVal);
-	
-    // Dialog Data
-    enum { IDD = IDD_ALERT_CHECK_DIALOG };
-
-    CString m_csDialogTitle;
-    CString m_csMsgText;
-    CString m_csCheckBoxText;
-    int m_bCheckBoxValue;
-    
-    // ClassWizard generated virtual function overrides
-    //{{AFX_VIRTUAL(CAlertCheckDialog)
-    protected:
-    virtual void DoDataExchange(CDataExchange* pDX);
-    //}}AFX_VIRTUAL
-
-    //{{AFX_MSG(CAlertCheckDialog)
-    virtual BOOL OnInitDialog();
-    //}}AFX_MSG
-
-    DECLARE_MESSAGE_MAP()
-};
-
-class CConfirmCheckDialog : public CDialog
-{
-public:
-    CConfirmCheckDialog(CWnd* pParent, const char* pTitle, const char* pText,
-                  const char* pCheckText, int initCheckVal,
-                  const char *pBtn1Text, const char *pBtn2Text, 
-                  const char *pBtn3Text);
-	
-    // Dialog Data
-    enum { IDD = IDD_CONFIRM_CHECK_DIALOG };
-
-    CString m_csDialogTitle;
-    CString m_csMsgText;
-    CString m_csCheckBoxText;
-    int m_bCheckBoxValue;
-    CString m_csBtn1Text;
-    CString m_csBtn2Text;
-    CString m_csBtn3Text;
-
-    // ClassWizard generated virtual function overrides
-    //{{AFX_VIRTUAL(CConfirmCheckDialog)
-    protected:
-    virtual void DoDataExchange(CDataExchange* pDX);
-    //}}AFX_VIRTUAL
-
-    //{{AFX_MSG(CConfirmCheckDialog)
-    virtual BOOL OnInitDialog();
-    afx_msg void OnBtn1Clicked();
-    afx_msg void OnBtn2Clicked();
-    afx_msg void OnBtn3Clicked();
-    //}}AFX_MSG
-
-    DECLARE_MESSAGE_MAP()
-};
-
-#endif //_DIALOG_H_
diff --git a/embedding/qa/testembed/components/Dialogs.rc b/embedding/qa/testembed/components/Dialogs.rc
deleted file mode 100644
index 20972ea8e4e..00000000000
--- a/embedding/qa/testembed/components/Dialogs.rc
+++ /dev/null
@@ -1,214 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\mfcembed.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_PROMPT_DIALOG DIALOG DISCARDABLE  0, 0, 249, 92
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Prompt Dialog"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,130,69,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,189,69,50,14
-    LTEXT           "Please enter something....",IDC_PROMPT_TEXT,10,7,229,29
-    EDITTEXT        IDC_PROMPT_ANSWER,7,39,232,13,ES_AUTOHSCROLL
-    CONTROL         "Save Answer",IDC_CHECK_SAVE_PASSWORD,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,57,229,10
-END
-
-IDD_PROMPT_PASSWORD_DIALOG DIALOG DISCARDABLE  0, 0, 248, 93
-STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "Password Entry Dialog"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Please enter your password:",IDC_PROMPT_TEXT,5,7,232,20
-    DEFPUSHBUTTON   "OK",IDOK,129,75,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,188,75,50,14
-    EDITTEXT        IDC_PASSWORD,5,37,233,12,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "Save Password",IDC_CHECK_SAVE_PASSWORD,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,57,229,10
-END
-
-IDD_PROMPT_USERPASS_DIALOG DIALOG DISCARDABLE  0, 0, 214, 123
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Username and Password Required"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "This operation requires authentication.  Please enter your user name and password:",
-                    IDC_PROMPT_TEXT,6,9,171,25
-    LTEXT           "User Name:",IDC_USERNAME_LABEL,6,39,39,9
-    EDITTEXT        IDC_USERNAME,49,39,153,12,ES_AUTOHSCROLL
-    LTEXT           "Password:",IDC_PASSWORD_LABEL,6,58,36,8
-    EDITTEXT        IDC_PASSWORD,49,56,153,12,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "Save User Name and Password",IDC_CHECK_SAVE_PASSWORD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,78,201,10
-    DEFPUSHBUTTON   "OK",IDOK,40,101,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,95,101,50,14
-END
-
-IDD_ALERT_CHECK_DIALOG DIALOG DISCARDABLE  0, 0, 233, 151
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Alert"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,91,127,50,14
-    CONTROL         "",IDC_CHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,
-                    104,215,10
-    EDITTEXT        IDC_MSG_TEXT,10,10,214,88,ES_MULTILINE | ES_READONLY
-END
-
-IDD_CONFIRM_CHECK_DIALOG DIALOG DISCARDABLE  0, 0, 371, 111
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ConfirmCheck"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "Btn1",IDC_BTN1,104,90,50,14
-    CONTROL         "",IDC_CHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
-                    62,355,10
-    LTEXT           "",IDC_MSG_TEXT,6,10,354,39
-    DEFPUSHBUTTON   "Btn2",IDC_BTN2,164,89,50,14
-    DEFPUSHBUTTON   "Btn3",IDC_BTN3,224,89,50,14
-END
-
-IDD_PROGRESS_DIALOG DIALOG DISCARDABLE  0, 0, 285, 95
-STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "Saving File"
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "Cancel",IDCANCEL,115,73,50,14
-    LTEXT           "Action:",IDC_STATIC,27,23,26,9
-    CONTROL         "",IDC_ACTION,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,59,23,211,8
-    LTEXT           "Saving From:",IDC_STATIC,7,6,42,8
-    LTEXT           "",IDC_SAVING_FROM,59,6,213,8
-    LTEXT           "Progress:",IDC_STATIC,19,41,30,8
-    CONTROL         "Progress1",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | 
-                    WS_BORDER,59,41,166,10
-    LTEXT           "100%",IDC_STATIC,229,42,18,8
-END
-
-IDD_CHOOSE_ACTION_DIALOG DIALOG DISCARDABLE  0, 0, 285, 114
-STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "Choose An Action"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "You have chosen to download a file of type: ",
-                    IDC_STATIC,8,9,142,8
-    LTEXT           "Static",IDC_CONTENT_TYPE,152,10,123,8
-    GROUPBOX        "What would you like MfcEmbed to do with this file?",
-                    IDC_STATIC,8,24,268,61
-    CONTROL         "O&pen using",IDC_OPEN_USING,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,19,41,60,10
-    CONTROL         "&Save this file to disk",IDC_SAVE_TO_DISK,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,19,69,103,10
-    LTEXT           "Static",IDC_APP_NAME,31,53,186,9,SS_SUNKEN
-    PUSHBUTTON      "&Choose...",IDC_CHOOSE_APP,222,51,50,12
-    PUSHBUTTON      "Ok",IDOK,94,94,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,150,94,50,14
-END
-
-IDD_PRINT_PROGRESS_DIALOG DIALOG DISCARDABLE  0, 0, 294, 53
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Print Progress"
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "Cancel",IDCANCEL,237,36,50,14
-    RTEXT           "URL:",IDC_PRINT_PROGRESS_URL_LABEL_TXT,7,7,30,8
-    LTEXT           "...",IDC_PRINT_PROGRESS_URL_TXT,41,7,231,8
-    RTEXT           "Progress:",IDC_STATIC,7,18,30,8
-    CONTROL         "Progress1",IDC_PRINT_PROGRESS_PRG,"msctls_progress32",
-                    WS_BORDER,41,18,217,8
-    LTEXT           "Preparing...",IDC_PRINT_PROGRESS_TXT,41,18,217,8
-    LTEXT           "",IDC_PRINT_PROGRESS_PERCENT_TXT,264,18,19,8
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/embedding/qa/testembed/components/Makefile.in b/embedding/qa/testembed/components/Makefile.in
deleted file mode 100644
index e9749b49bcb..00000000000
--- a/embedding/qa/testembed/components/Makefile.in
+++ /dev/null
@@ -1,82 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= testEmbedComponents
-RESFILE		= Dialogs.res
-MOZILLA_INTERNAL_API = 1
-
-REQUIRES = \
-	xpcom \
-	string \
-	dom \
-	webbrwsr \
-	webBrowser_core \
-	windowwatcher \
-	exthandler \
-	uriloader \
-	necko \
-	mimetype \
-	$(NULL)
-
-CPPSRCS	= \
-	Dialogs.cpp \
-	PromptService.cpp \
-	$(NULL)
-
-EXTRA_DSO_LIBS = gkgfx
-
-EXTRA_DSO_LDOPTS += \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_LIBS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-FORCE_SHARED_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS	+= /D "WIN32_LEAN_AND_MEAN" /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" /D "_WINDLL"
-LDFLAGS		+= -SUBSYSTEM:windows
-
-Dialogs.res: Dialogs.rc resource.h
-
diff --git a/embedding/qa/testembed/components/PromptService.cpp b/embedding/qa/testembed/components/PromptService.cpp
deleted file mode 100644
index 0b83db8f0b6..00000000000
--- a/embedding/qa/testembed/components/PromptService.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* PromptService is intended to override the default Mozilla PromptService,
-   giving nsIPrompt implementations of our own design, rather than using
-   Mozilla's. Do this by building this into a component and registering the
-   factory with the same CID/ContractID as Mozilla's (see MfcEmbed.cpp).
-*/
-
-#include "stdafx.h"
-#include "Dialogs.h"
-#include "PromptService.h"
-#include "nsCOMPtr.h"
-#include "nsMemory.h"
-#include "nsString.h"
-#include "nsReadableUtils.h"
-#include "nsIDOMWindow.h"
-#include "nsIEmbeddingSiteWindow.h"
-#include "nsIFactory.h"
-#include "nsIPromptService.h"
-#include "nsIServiceManager.h"
-#include "nsIWebBrowserChrome.h"
-#include "nsIWindowWatcher.h"
-
-static HINSTANCE gInstance;
-
-//*****************************************************************************
-// ResourceState
-//***************************************************************************** 
-
-class ResourceState {
-public:
-  ResourceState() {
-    mPreviousInstance = ::AfxGetResourceHandle();
-    ::AfxSetResourceHandle(gInstance);
-  }
-  ~ResourceState() {
-    ::AfxSetResourceHandle(mPreviousInstance);
-  }
-private:
-  HINSTANCE mPreviousInstance;
-};
-
-
-//*****************************************************************************
-// CPromptService
-//*****************************************************************************
-
-class CPromptService: public nsIPromptService {
-public:
-                 CPromptService();
-  virtual       ~CPromptService();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIPROMPTSERVICE
-
-private:
-  nsCOMPtr<nsIWindowWatcher> mWWatch;
-  CWnd *CWndForDOMWindow(nsIDOMWindow *aWindow);
-};
-
-//*****************************************************************************
-
-NS_IMPL_ISUPPORTS1(CPromptService, nsIPromptService)
-
-CPromptService::CPromptService() :
-  mWWatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID))
-{
-}
-
-CPromptService::~CPromptService() {
-}
-
-CWnd *
-CPromptService::CWndForDOMWindow(nsIDOMWindow *aWindow)
-{
-  nsCOMPtr<nsIWebBrowserChrome> chrome;
-  CWnd *val = 0;
-
-  if (mWWatch) {
-    nsCOMPtr<nsIDOMWindow> fosterParent;
-    if (!aWindow) { // it will be a dependent window. try to find a foster parent.
-      mWWatch->GetActiveWindow(getter_AddRefs(fosterParent));
-      aWindow = fosterParent;
-    }
-    mWWatch->GetChromeForWindow(aWindow, getter_AddRefs(chrome));
-  }
-
-  if (chrome) {
-    nsCOMPtr<nsIEmbeddingSiteWindow> site(do_QueryInterface(chrome));
-    if (site) {
-      HWND w;
-      site->GetSiteWindow(reinterpret_cast<void **>(&w));
-      val = CWnd::FromHandle(w);
-    }
-  }
-
-  return val;
-}
-
-NS_IMETHODIMP CPromptService::Alert(nsIDOMWindow *parent, const PRUnichar *dialogTitle,
-                                    const PRUnichar *text)
-{
-  USES_CONVERSION;
-  CWnd *wnd = CWndForDOMWindow(parent);
-  if (wnd)
-    wnd->MessageBox(W2T(text), W2T(dialogTitle), MB_OK | MB_ICONEXCLAMATION);
-  else
-    ::MessageBox(0, W2T(text), W2T(dialogTitle), MB_OK | MB_ICONEXCLAMATION);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP CPromptService::AlertCheck(nsIDOMWindow *parent,
-                                         const PRUnichar *dialogTitle,
-                                         const PRUnichar *text,
-                                         const PRUnichar *checkboxMsg,
-                                         PRBool *checkValue)
-{
-  ResourceState setState;
-  USES_CONVERSION;
-
-  CWnd *wnd = CWndForDOMWindow(parent);
-  CAlertCheckDialog dlg(wnd, W2T(dialogTitle), W2T(text),
-                    W2T(checkboxMsg), checkValue ? *checkValue : 0);
-
-  dlg.DoModal();
-
-  *checkValue = dlg.m_bCheckBoxValue;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP CPromptService::Confirm(nsIDOMWindow *parent,
-                                      const PRUnichar *dialogTitle,
-                                      const PRUnichar *text,
-                                      PRBool *_retval)
-{
-  USES_CONVERSION;
-  CWnd *wnd = CWndForDOMWindow(parent);
-  int choice;
-
-  if (wnd)
-    choice = wnd->MessageBox(W2T(text), W2T(dialogTitle),
-                      MB_YESNO | MB_ICONEXCLAMATION);
-  else
-    choice = ::MessageBox(0, W2T(text), W2T(dialogTitle),
-                      MB_YESNO | MB_ICONEXCLAMATION);
-
-  *_retval = choice == IDYES ? PR_TRUE : PR_FALSE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP CPromptService::ConfirmCheck(nsIDOMWindow *parent,
-                                           const PRUnichar *dialogTitle,
-                                           const PRUnichar *text,
-                                           const PRUnichar *checkboxMsg,
-                                           PRBool *checkValue,
-                                           PRBool *_retval)
-{
-    ResourceState setState;
-    USES_CONVERSION;
-
-    CWnd *wnd = CWndForDOMWindow(parent);
-    CConfirmCheckDialog dlg(wnd, W2T(dialogTitle), W2T(text),
-                    W2T(checkboxMsg), checkValue ? *checkValue : 0,
-                    "Yes", "No", NULL);
-
-    int iBtnClicked = dlg.DoModal();
-
-    *checkValue = dlg.m_bCheckBoxValue;
-
-    *_retval = iBtnClicked == 0 ? PR_TRUE : PR_FALSE;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP CPromptService::Prompt(nsIDOMWindow *parent,
-                                     const PRUnichar *dialogTitle,
-                                     const PRUnichar *text,
-                                     PRUnichar **value,
-                                     const PRUnichar *checkboxMsg,
-                                     PRBool *checkValue,
-                                     PRBool *_retval)
-{
-  ResourceState setState;
-  USES_CONVERSION;
-
-  CWnd *wnd = CWndForDOMWindow(parent);
-  CPromptDialog dlg(wnd, W2T(dialogTitle), W2T(text),
-                    text && *text ? W2T(text) : 0,
-                    checkValue != nsnull, W2T(checkboxMsg),
-                    checkValue ? *checkValue : 0);
-  if(dlg.DoModal() == IDOK) {
-    // Get the value entered in the editbox of the PromptDlg
-    if (value && *value) {
-      nsMemory::Free(*value);
-      *value = nsnull;
-    }
-    nsString csPromptEditValue;
-    csPromptEditValue.AssignWithConversion(dlg.m_csPromptAnswer.GetBuffer(0));
-
-    *value = ToNewUnicode(csPromptEditValue);
-
-    *_retval = PR_TRUE;
-  } else
-    *_retval = PR_FALSE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP CPromptService::PromptUsernameAndPassword(nsIDOMWindow *parent,
-                                                        const PRUnichar *dialogTitle,
-                                                        const PRUnichar *text,
-                                                        PRUnichar **username,
-                                                        PRUnichar **password,
-                                                        const PRUnichar *checkboxMsg,
-                                                        PRBool *checkValue,
-                                                        PRBool *_retval)
-{
-  ResourceState setState;
-  USES_CONVERSION;
-
-  CWnd *wnd = CWndForDOMWindow(parent);
-  CPromptUsernamePasswordDialog dlg(wnd, W2T(dialogTitle), W2T(text),
-                    username && *username ? W2T(*username) : 0,
-                    password && *password ? W2T(*password) : 0, 
-                    checkValue != nsnull, W2T(checkboxMsg),
-                    checkValue ? *checkValue : 0);
-
-  if (dlg.DoModal() == IDOK) {
-    // Get the username entered
-    if (username && *username) {
-        nsMemory::Free(*username);
-        *username = nsnull;
-    }
-    nsString csUserName;
-    csUserName.AssignWithConversion(dlg.m_csUserName.GetBuffer(0));
-    *username = ToNewUnicode(csUserName);
-
-    // Get the password entered
-    if (password && *password) {
-      nsMemory::Free(*password);
-      *password = nsnull;
-    }
-    nsString csPassword;
-    csPassword.AssignWithConversion(dlg.m_csPassword.GetBuffer(0));
-    *password = ToNewUnicode(csPassword);
-
-    if(checkValue)		
-      *checkValue = dlg.m_bCheckBoxValue;
-
-    *_retval = PR_TRUE;
-  } else
-    *_retval = PR_FALSE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP CPromptService::PromptPassword(nsIDOMWindow *parent,
-                                             const PRUnichar *dialogTitle,
-                                             const PRUnichar *text,
-                                             PRUnichar **password,
-                                             const PRUnichar *checkboxMsg,
-                                             PRBool *checkValue,
-                                             PRBool *_retval)
-{
-  ResourceState setState;
-  USES_CONVERSION;
-
-  CWnd *wnd = CWndForDOMWindow(parent);
-  CPromptPasswordDialog dlg(wnd, W2T(dialogTitle), W2T(text),
-                            password && *password ? W2T(*password) : 0,
-                            checkValue != nsnull, W2T(checkboxMsg),
-                            checkValue ? *checkValue : 0);
-  if(dlg.DoModal() == IDOK) {
-    // Get the password entered
-    if (password && *password) {
-        nsMemory::Free(*password);
-        *password = nsnull;
-    }
-    nsString csPassword;
-    csPassword.AssignWithConversion(dlg.m_csPassword.GetBuffer(0));
-    *password = ToNewUnicode(csPassword);
-
-    if(checkValue)
-      *checkValue = dlg.m_bCheckBoxValue;
-
-    *_retval = PR_TRUE;
-  } else
-    *_retval = PR_FALSE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP CPromptService::Select(nsIDOMWindow *parent,
-                                     const PRUnichar *dialogTitle,
-                                     const PRUnichar *text, PRUint32 count,
-                                     const PRUnichar **selectList,
-                                     PRInt32 *outSelection,
-                                     PRBool *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP CPromptService::ConfirmEx(nsIDOMWindow *parent,
-                                        const PRUnichar *dialogTitle,
-                                        const PRUnichar *text,
-                                        PRUint32 buttonFlags,
-                                        const PRUnichar *button0Title,
-                                        const PRUnichar *button1Title,
-                                        const PRUnichar *button2Title,
-                                        const PRUnichar *checkMsg,
-                                        PRBool *checkValue,
-                                        PRInt32 *buttonPressed)
-{
-    ResourceState setState;
-    USES_CONVERSION;
-
-    // First, determine the button titles based on buttonFlags
-    const PRUnichar* buttonStrings[] = { button0Title, button1Title, button2Title };
-    CString csBtnTitles[3];
-
-    for(int i=0; i<3; i++)
-    {
-        switch(buttonFlags & 0xff) {
-            case BUTTON_TITLE_OK:
-                csBtnTitles[i] = "Ok";
-                break;
-            case BUTTON_TITLE_CANCEL:
-                csBtnTitles[i] = "Cancel";
-                break;
-            case BUTTON_TITLE_YES:
-                csBtnTitles[i] = "Yes";
-                break;
-            case BUTTON_TITLE_NO:
-                csBtnTitles[i] = "No";
-                break;
-            case BUTTON_TITLE_SAVE:
-                csBtnTitles[i] = "Save";
-                break;
-            case BUTTON_TITLE_DONT_SAVE:
-                csBtnTitles[i] = "DontSave";
-                break;
-            case BUTTON_TITLE_REVERT:
-                csBtnTitles[i] = "Revert";
-                break;
-            case BUTTON_TITLE_IS_STRING:
-                csBtnTitles[i] = W2T(buttonStrings[i]);
-                break;
-        }
-   
-        buttonFlags >>= 8;    
-    }
-
-    CWnd *wnd = CWndForDOMWindow(parent);
-    CConfirmCheckDialog dlg(wnd, W2T(dialogTitle), W2T(text),
-        checkMsg ? W2T(checkMsg) : NULL, checkValue ? *checkValue : 0,
-                    csBtnTitles[0].IsEmpty() ? NULL : (LPCTSTR)csBtnTitles[0], 
-                    csBtnTitles[1].IsEmpty() ? NULL : (LPCTSTR)csBtnTitles[1], 
-                    csBtnTitles[2].IsEmpty() ? NULL : (LPCTSTR)csBtnTitles[2]);
-
-    *buttonPressed = dlg.DoModal();
-
-    if(checkValue)
-        *checkValue = dlg.m_bCheckBoxValue;
-
-    return NS_OK;    
-}
- 
-//*****************************************************************************
-// CPromptServiceFactory
-//*****************************************************************************   
-
-class CPromptServiceFactory : public nsIFactory {
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIFACTORY
-
-  CPromptServiceFactory();
-  virtual ~CPromptServiceFactory();
-};
-
-//*****************************************************************************
-
-NS_IMPL_ISUPPORTS1(CPromptServiceFactory, nsIFactory)
-
-CPromptServiceFactory::CPromptServiceFactory() {
-}
-
-CPromptServiceFactory::~CPromptServiceFactory() {
-}
-
-NS_IMETHODIMP CPromptServiceFactory::CreateInstance(nsISupports *aOuter, const nsIID & aIID, void **aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  
-  *aResult = NULL;  
-  CPromptService *inst = new CPromptService;    
-  if (!inst)
-    return NS_ERROR_OUT_OF_MEMORY;
-    
-  nsresult rv = inst->QueryInterface(aIID, aResult);
-  if (rv != NS_OK) {  
-    // We didn't get the right interface, so clean up  
-    delete inst;  
-  }  
-    
-  return rv;
-}
-
-NS_IMETHODIMP CPromptServiceFactory::LockFactory(PRBool lock)
-{
-  return NS_OK;
-}
-
-//*****************************************************************************
-
-void InitPromptService(HINSTANCE instance) {
-
-  gInstance = instance;
-}
-
-nsresult NS_NewPromptServiceFactory(nsIFactory** aFactory)
-{
-  NS_ENSURE_ARG_POINTER(aFactory);
-  *aFactory = nsnull;
-  
-  CPromptServiceFactory *result = new CPromptServiceFactory;
-  if (!result)
-    return NS_ERROR_OUT_OF_MEMORY;
-    
-  NS_ADDREF(result);
-  *aFactory = result;
-  
-  return NS_OK;
-}
diff --git a/embedding/qa/testembed/components/PromptService.h b/embedding/qa/testembed/components/PromptService.h
deleted file mode 100644
index 231c0716afe..00000000000
--- a/embedding/qa/testembed/components/PromptService.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __PromptService_h
-#define __PromptService_h
-
-#include "nsError.h"
-
-// this component is for an MFC app; it's Windows. make sure this is defined.
-#ifndef XP_WIN
-#define XP_WIN
-#endif
-
-class nsIFactory;
-
-// factory creator, in hard and soft link formats
-extern "C" NS_EXPORT nsresult NS_NewPromptServiceFactory(nsIFactory** aFactory);
-typedef nsresult (__cdecl *MakeFactoryType)(nsIFactory **);
-#define kPromptServiceFactoryFuncName "NS_NewPromptServiceFactory"
-
-// initialization function, in hard and soft link formats
-extern "C" NS_EXPORT void InitPromptService(HINSTANCE instance);
-typedef nsresult (__cdecl *InitPromptServiceType)(HINSTANCE instance);
-#define kPromptServiceInitFuncName "InitPromptService"
-
-#endif
diff --git a/embedding/qa/testembed/components/resource.h b/embedding/qa/testembed/components/resource.h
deleted file mode 100644
index 1cb88645004..00000000000
--- a/embedding/qa/testembed/components/resource.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by Dialogs.rc
-//
-#define IDD_PROMPT_DIALOG               128
-#define IDD_PROMPT_PASSWORD_DIALOG      129
-#define IDD_PROMPT_USERPASS_DIALOG      130
-#define IDD_ALERT_CHECK_DIALOG          131
-#define IDD_CONFIRM_CHECK_DIALOG        132
-#define IDD_PROGRESS_DIALOG             133
-#define IDD_CHOOSE_ACTION_DIALOG        134
-#define IDD_PRINT_PROGRESS_DIALOG       143
-#define IDC_PROMPT_ANSWER               1001
-#define IDC_PROMPT_TEXT                 1002
-#define IDC_USERNAME                    1003
-#define IDC_PASSWORD                    1004
-#define IDC_CHECK_SAVE_PASSWORD         1005
-#define IDC_USERNAME_LABEL              1006
-#define IDC_PASSWORD_LABEL              1007
-#define IDC_CHECKBOX                    1008
-#define IDC_MSG_TEXT                    1009
-#define IDC_BTN1                        1010
-#define IDC_BTN2                        1011
-#define IDC_BTN3                        1012
-#define IDC_ACTION                      1013
-#define IDC_SAVING_FROM                 1014
-#define IDC_PROGRESS                    1015
-#define IDC_CONTENT_TYPE                1016
-#define IDC_SAVE_TO_DISK                1017
-#define IDC_OPEN_USING                  1018
-#define IDC_CHOOSE_APP                  1019
-#define IDC_APP_NAME                    1020
-#define IDC_PRINT_PROGRESS_URL_TXT      1022
-#define IDC_PRINT_PROGRESS_PRG          1023
-#define IDC_PRINT_PROGRESS_PERCENT_TXT  1024
-#define IDC_PRINT_PROGRESS_URL_LABEL_TXT 1025
-#define IDC_PRINT_PROGRESS_TXT          1026
-
-
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        144
-#define _APS_NEXT_COMMAND_VALUE         32789
-#define _APS_NEXT_CONTROL_VALUE         1027
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
-
diff --git a/embedding/qa/testembed/components/stdafx.h b/embedding/qa/testembed/components/stdafx.h
deleted file mode 100644
index eb35bded514..00000000000
--- a/embedding/qa/testembed/components/stdafx.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chak Nanga <chak@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#ifndef _STDAFX_H
-#define _STDAFX_H
-
-#define VC_EXTRALEAN	// Exclude rarely-used stuff from Windows headers
-
-#include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
-#include <afxpriv.h>		// Needed for MFC MBCS/Unicode Conversion Macros
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>			// MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif //_STDAFX_H
diff --git a/embedding/qa/testembed/nsICmdParams.cpp b/embedding/qa/testembed/nsICmdParams.cpp
deleted file mode 100644
index b1916224d3d..00000000000
--- a/embedding/qa/testembed/nsICmdParams.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-// nsICmdParams.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "testembed.h"
-#include "nsICmdParams.h"
-#include "QaUtils.h"
-#include "BrowserFrm.h"
-#include "BrowserImpl.h"
-#include "BrowserView.h"
-#include "Tests.h"
-#include "nsICommandMgr.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// nsICmdParams
-
-// note: this table is temporary. will customize later.
-// 1st column: command; 2nd column: DoCommand state, 3rd column: CmdParam state; 
-
-
-CnsICmdParams::CnsICmdParams(nsIWebBrowser *mWebBrowser)
-{
-	qaWebBrowser = mWebBrowser;
-}
-
-CnsICmdParams::~CnsICmdParams()
-{
-}
-
-nsICommandParams * CnsICmdParams::GetCommandParamObject()
-{
-    nsCOMPtr<nsICommandParams> cmdParamsObj = do_CreateInstance(NS_COMMAND_PARAMS_CONTRACTID,&rv);
-	RvTestResult(rv, "GetCommandParamsObject() test", 1); 
-    if (!cmdParamsObj) {
-        QAOutput("Didn't get nsICommandParams object.");
-		return nsnull;
-	}
-	nsICommandParams *retVal = cmdParamsObj;
-	NS_ADDREF(retVal);
-	return retVal;
-}
-
-void CnsICmdParams::GetValueTypeTest(const char *aCommand, const char *stateType, int displayMode)
-{
-	PRInt16 retval;
-
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj) {
-		FormatAndPrintOutput("The input command name = ", aCommand, displayMode);
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-		cmdMgrObj = CnsICommandMgr::GetCommandMgrObject(qaWebBrowser, displayMode);
-		if (!cmdMgrObj) {
-			QAOutput("We didn't get nsICommandMgr object. Test fails.", displayMode);
-			return;
-		}
-		else {
-			rv = cmdMgrObj->GetCommandState(aCommand, nsnull, cmdParamObj);
-			RvTestResult(rv, "cmdMgrObj->GetCommandState test", displayMode);
-		}
-		rv = cmdParamObj->GetValueType(stateType, &retval);
-		RvTestResult(rv, "GetValueType test", displayMode);
-		FormatAndPrintOutput("GetValueType return int = ", retval, displayMode);
-	}	
-	else
-	    QAOutput("GetValueTypeTest(): We didn't get nsICommandParams object.", 1);
-}
-
-void CnsICmdParams::GetBooleanValueTest(const char *aCommand, const char *stateType, int displayMode)
-{
-	PRBool retval;
-
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj) {
-		FormatAndPrintOutput("The input command name = ", aCommand, displayMode);
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-		cmdMgrObj = CnsICommandMgr::GetCommandMgrObject(qaWebBrowser, displayMode);
-		if (!cmdMgrObj) {
-			QAOutput("We didn't get nsICommandMgr object. Test fails.", displayMode);
-			return;
-		}
-		else
-			cmdMgrObj->GetCommandState(aCommand, nsnull, cmdParamObj);
-
-		rv = cmdParamObj->GetBooleanValue(stateType, &retval);
-		RvTestResult(rv, "GetBooleanValue test", displayMode);
-		FormatAndPrintOutput("GetBooleanValue() return boolean = ", retval, displayMode);
-	}
-	else
-	    QAOutput("GetBooleanValueTest(): We didn't get nsICommandParams object.", 1);
-}
-
-void CnsICmdParams::GetLongValueTest(PRInt32 value, const char *stateType, int displayMode)
-{
-	PRInt32	retval;
-
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj)
-	{
-		FormatAndPrintOutput("The input Set value = ", value, displayMode);
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-		cmdParamObj->SetLongValue(stateType, value);
-		rv = cmdParamObj->GetLongValue(stateType, &retval);
-		RvTestResult(rv, "GetLongValue test", displayMode);
-		FormatAndPrintOutput("GetLongValue() return long = ", retval, displayMode);
-	}
-	else
-	    QAOutput("GetLongValueTest: We didn't get nsICommandParams object.", 1);
-}
-
-void CnsICmdParams::GetDoubleValueTest(double value, const char *stateType, int displayMode)
-{
-	double	retval;
-
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj) {
-		FormatAndPrintOutput("The input Set value = ", value, displayMode);
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-		cmdParamObj->SetDoubleValue(stateType, value);
-		rv = cmdParamObj->GetDoubleValue(stateType, &retval);
-		RvTestResult(rv, "GetDoubleValue test", displayMode);
-		FormatAndPrintOutput("GetDoubleValue() return double = ", retval, displayMode);
-	}
-	else
-	    QAOutput("GetDoubleValueTest: We didn't get nsICommandParams object.", 1);
-}
-
-void CnsICmdParams::GetStringValueTest(char *stringVal, const char *stateType, int displayMode)
-{
-	nsAutoString retval;
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj) {
-		FormatAndPrintOutput("The input string = ", stringVal, displayMode);
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-
-		rv = cmdParamObj->SetStringValue(stateType, NS_ConvertASCIItoUTF16(stringVal));		
-		rv = cmdParamObj->GetStringValue(stateType, retval);
-		RvTestResult(rv, "GetStringValue test", displayMode);
-//		FormatAndPrintOutput("GetStringValue() return string = ", retval, displayMode);
-	}
-	else
-	    QAOutput("GetStringValueTest: We didn't get nsICommandParams object.", 1);
-}
-
-void CnsICmdParams::GetCStringValueTest(const char *aCommand, const char *stateType, int displayMode)
-{
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj) {
-		FormatAndPrintOutput("The input command name = ", aCommand, displayMode);
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-		cmdMgrObj = CnsICommandMgr::GetCommandMgrObject(qaWebBrowser, displayMode);
-		if (!cmdMgrObj) {
-			QAOutput("We didn't get nsICommandMgr object. Test fails.", displayMode);
-			return;
-		}
-		else
-			cmdMgrObj->GetCommandState(aCommand, nsnull, cmdParamObj);
-		char *tCstringValue = nsnull;
-		rv = cmdParamObj->GetCStringValue(stateType, &tCstringValue);
-		RvTestResult(rv, "GetCStringValue test", displayMode);
-		FormatAndPrintOutput("the CString value = ", tCstringValue, displayMode);
-		if (tCstringValue)
-			nsCRT::free(tCstringValue);		
-	}
-	else
-	    QAOutput("GetCStringValueTest: We didn't get nsICommandParams object.", 1);
-}
-
-// NS_ConvertASCIItoUTF16
-
-void CnsICmdParams::SetBooleanValueTest(PRBool value, const char *stateType, int displayMode)
-{
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj) {
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-		FormatAndPrintOutput("The input value = ", value, displayMode);
-		rv = cmdParamObj->SetBooleanValue(stateType, value);
-		RvTestResult(rv, "SetBooleanValue() test", displayMode);
-	}
-	else
-	    QAOutput("SetBooleanValueTest(): We didn't get nsICommandParams object.", 1);
-}
-
-void CnsICmdParams::SetLongValueTest(PRInt32 value, const char *stateType, int displayMode)
-{
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj) {
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-		FormatAndPrintOutput("The input value = ", value, displayMode);
-		rv = cmdParamObj->SetLongValue(stateType, value);
-		RvTestResult(rv, "SetLongValue() test", displayMode);
-	}
-	else
-	    QAOutput("SetLongValueTest(): We didn't get nsICommandParams object.", 1);
-}
-
-void CnsICmdParams::SetDoubleValueTest(double value, const char *stateType, int displayMode)
-{
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj) {
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-		FormatAndPrintOutput("The input value = ", value, displayMode);
-		rv = cmdParamObj->SetDoubleValue(stateType, value);
-		RvTestResult(rv, "SetDoubleValue() test", displayMode);
-	}
-	else
-	    QAOutput("SetDoubleValueTest(): We didn't get nsICommandParams object.", 1);
-}
-
-void CnsICmdParams::SetStringValueTest(char *value, const char *stateType, int displayMode)
-{
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj) {
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-		FormatAndPrintOutput("The input value = ", value, displayMode);
-		rv = cmdParamObj->SetStringValue(stateType, NS_ConvertASCIItoUTF16(value));
-		RvTestResult(rv, "SetStringValue() test", displayMode);
-	}
-	else
-	    QAOutput("SetStringValueTest(): We didn't get nsICommandParams object.", 1);
-}
-
-void CnsICmdParams::SetCStringValueTest(char *value, const char *stateType, int displayMode)
-{
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj) {
-		FormatAndPrintOutput("The input state type = ", stateType, displayMode);
-		FormatAndPrintOutput("The input value = ", value, displayMode);
-		rv = cmdParamObj->SetCStringValue(stateType, value);
-		RvTestResult(rv, "SetCStringValue() test", displayMode);
-	}
-	else
-	    QAOutput("SetCStringValueTest(): We didn't get nsICommandParams object.", 1);
-}
-
-void CnsICmdParams::OnStartTests(UINT nMenuID)
-{
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSICOMMANDPARAMS_RUNALLTESTS :
-			RunAllTests();
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_GETVALUETYPE :
-			GetValueTypeTest( "cmd_bold", "state_all", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_GETBOOLEANVALUE :
-			GetBooleanValueTest("cmd_bold", "state_mixed", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_GETLONGVALUE  :
-			GetLongValueTest(57000000, "state_attribute", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_GETDOUBLEVALUE :
-			GetDoubleValueTest(5.25, "state_attribute", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_GETSTRINGVALUE :
-			GetStringValueTest("MyString!!", "state_attribute", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_GETCSTRINGVALUE:
-			GetCStringValueTest("cmd_fontColor", "state_attribute", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_GETISUPPORTSVALUE :
-			QAOutput("Not implemented yet.", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_SETBOOLEANVALUE :
-			SetBooleanValueTest(PR_TRUE, "state_attribute", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_SETLONGVALUE :
-			SetLongValueTest(25000000, "state_attribute", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_SETDOUBLEVALUE :
-			SetDoubleValueTest(-3.05, "state_attribute", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_SETSTRINGVALUE :
-			SetStringValueTest("HELLO!", "state_attribute", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_SETCSTRINGVALUE:
-			SetCStringValueTest("#FF0000", "state_attribute", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_SETISUPPORTSVALUE :
-			QAOutput("Not implemented yet.", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_REMOVEVALUE :
-			QAOutput("Not implemented yet.", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_HASMOREELEMENTS :
-			QAOutput("Not implemented yet.", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_FIRST :
-			QAOutput("Not implemented yet.", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDPARAMS_GETNEXT :
-			QAOutput("Not implemented yet.", 2);
-			break;
-	}
-}
-
-void CnsICmdParams::RunAllTests()
-{
-	cmdParamObj = GetCommandParamObject();
-	if (cmdParamObj)
-        QAOutput("We got nsICommandParams object.", 1);
-	else
-	    QAOutput("We didn't get nsICommandParams object.", 1);
-
-	PRInt16 i;
-
-	QAOutput("Run All nsICommandParam Set and Get tests. Check C:/Temp/TestOutput.txt for test results.", 2);
-	for (i=0; i < 50; i++)
-	{
-		FormatAndPrintOutput("loop cnt = ", i, 1);
-		SetBooleanValueTest(CommandTable[i].mBooleanValue, CommandTable[i].mCmdParamState, 1);
-		SetLongValueTest(CommandTable[i].mLongValue, CommandTable[i].mCmdParamState, 1);
-		SetDoubleValueTest(CommandTable[i].mDoubleValue, CommandTable[i].mCmdParamState, 1);
-		SetStringValueTest(CommandTable[i].mStringValue, CommandTable[i].mCmdParamState, 1);
-		SetCStringValueTest(CommandTable[i].mCStringValue, CommandTable[i].mCmdParamState, 1);
-
-		GetValueTypeTest(CommandTable[i].mCmdName, CommandTable[i].mCmdParamState, 1);
-		GetBooleanValueTest(CommandTable[i].mCmdName, CommandTable[i].mCmdParamState, 1);
-		GetLongValueTest(CommandTable[i].mLongValue, CommandTable[i].mCmdParamState, 1);
-		GetDoubleValueTest(CommandTable[i].mDoubleValue, CommandTable[i].mCmdParamState, 1);
-		GetStringValueTest(CommandTable[i].mStringValue, CommandTable[i].mCmdParamState, 1);
-		GetCStringValueTest(CommandTable[i].mCmdName, CommandTable[i].mCmdParamState, 1);
-	}
-	QAOutput("Other tests Not implemented yet.", 2);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// nsICmdParams message handlers
diff --git a/embedding/qa/testembed/nsICmdParams.h b/embedding/qa/testembed/nsICmdParams.h
deleted file mode 100644
index dc040e17f12..00000000000
--- a/embedding/qa/testembed/nsICmdParams.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#if !defined(AFX_NSICMDPARAMS_H__E2105F5B_B953_11D6_9BE4_00C04FA02BE6__INCLUDED_)
-#define AFX_NSICMDPARAMS_H__E2105F5B_B953_11D6_9BE4_00C04FA02BE6__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// nsICmdParams.h : header file
-//
-
-#include "QaUtils.h"
-#include "BrowserFrm.h"
-#include "BrowserImpl.h"
-#include "BrowserView.h"
-#include "Tests.h"
-#include "nsICommandMgr.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// nsICmdParams window
-
-class CnsICommandMgr;
-
-class CnsICmdParams
-{
-// Construction
-public:
-	CnsICmdParams(nsIWebBrowser *mWebBrowser);
-
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser;
-	nsCOMPtr<nsICommandManager> cmdMgrObj;
-	nsCOMPtr<nsICommandParams> cmdParamObj;
-// Attributes
-public:
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CnsICmdParams)
-	//}}AFX_VIRTUAL
-
-// Implementation
-	static nsICommandParams * GetCommandParamObject();
-	void GetValueTypeTest(const char *, const char *, int);
-	void GetBooleanValueTest(const char *, const char *, int);
-	void GetLongValueTest(PRInt32, const char *, int);
-	void GetDoubleValueTest(double, const char *, int);
-	void GetStringValueTest(char *, const char *, int);
-	void GetCStringValueTest(const char *, const char *, int);
-
-	void SetBooleanValueTest(PRBool, const char *, int);
-	void SetLongValueTest(PRInt32, const char *, int);
-	void SetDoubleValueTest(double, const char *, int);
-	void SetStringValueTest(char *, const char *, int);
-	void SetCStringValueTest(char *, const char *, int);
-
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests();
-
-public:
-	virtual ~CnsICmdParams();
-
-	// Generated message map functions
-protected:
-
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_NSICMDPARAMS_H__E2105F5B_B953_11D6_9BE4_00C04FA02BE6__INCLUDED_)
diff --git a/embedding/qa/testembed/nsICommandMgr.cpp b/embedding/qa/testembed/nsICommandMgr.cpp
deleted file mode 100644
index 7a9179b1e44..00000000000
--- a/embedding/qa/testembed/nsICommandMgr.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-// nsICommandMgr.cpp : implementation file
-//
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// nsICommandMgr.cpp : test implementations for nsICommandManager interface
-//
-#include "stdafx.h"
-#include "testembed.h"
-#include "nsICommandMgr.h"
-#include "nsICmdParams.h"
-#include "QaUtils.h"
-#include "BrowserFrm.h"
-#include "BrowserImpl.h"
-#include "BrowserView.h"
-#include "Tests.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// nsICommandMgr
-
-CnsICommandMgr::CnsICommandMgr(nsIWebBrowser *mWebBrowser)
-{
-	qaWebBrowser = mWebBrowser;
-}
-
-CnsICommandMgr::~CnsICommandMgr()
-{
-}
-
-// 1st column: command; 2nd column: DoCommand state, 3rd column: CmdParam state; 
-CommandTest CommandTable[] = {
-	{"cmd_bold",   "",    "state_all", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_italic", "",    "state_all", PR_TRUE, 10000000, 2.27,      "This is a complete sentence", "This isn't!"},
-	{"cmd_underline", "", "state_all", PR_TRUE, 17,		  7839.3480, "A longer string than the previous one.", "Shorter string, but still pretty long."},
-	{"cmd_indent", "",	  "state_enabled", PR_TRUE, 7480, -1.487, "Another string input for testing ...", "How about them Giants?!"},
-	{"cmd_outdent", "",   "state_enabled", PR_FALSE, 0, 24987.2465, "A few numbers: 1 2 3,  A few letters: C A B,  A few characters: Mickey Goofy $%*&@", "nothing here"},
-	{"cmd_increaseFont", "", "state_enabled", PR_TRUE, 500000000, 16, "hi", "HI"},
-	{"cmd_undo", "",	  "state_enabled", PR_TRUE, 987352487, 36.489, "x ", "x"},
-	{"cmd_redo", "",	  "state_enabled", PR_FALSE, 90, -24, "", " "},
-	{"cmd_decreaseFont", "", "", PR_TRUE, 0.0,    0.0,     "hello",						 "HELLO"},
-	{"cmd_fontColor", "state_attribute", "state_attribute", PR_TRUE, 25,    100,     "#FF0000",						 "#000000"},
-	{"cmd_backgroundColor", "state_attribute", "state_attribute", PR_TRUE, -35871678,    15.345363645,     "#FF1234",						 "#001234"},
-	{"cmd_fontFace", "state_attribute", "state_attribute", PR_TRUE, 50000,    5.798,     "Times New Roman, Times, serif",						 "Courier New, Courier, monospace"},
-	{"cmd_align", "state_attribute", "state_attribute", PR_TRUE, 10000,    5.798,     "right",						 "center"},
-	{"cmd_charSet", "state_attribute", "state_attribute", PR_TRUE, 20000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_copy", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_delete", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_deleteCharBackward", "", "state_enabled", PR_TRUE, 30000,    245.2323,     "hello",						 "HELLO"},
-	{"cmd_deleteCharForward", "", "state_enabled", PR_TRUE, 50000,    -24235.2346,     "a very very very very very very very very looooooooooooooooooooong stringgggggggggggggggggggggggggggggggggggggggggggg!!!",						 "HELLO"},
-	{"cmd_deleteWordForward", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_deleteWordBackward", "", "state_enabled", PR_TRUE, 6034600,    5.798,     "hello",						 "HELLO"},
-	{"cmd_deleteToBeginningOfLine", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_deleteToEndOfLine", "", "state_enabled", PR_TRUE, -5434,    5.798,     "hello",						 "HELLO"},
-	{"cmd_scrollTop", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_scrollBottom", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_scrollPageUp", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_scrollPageDown", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_movePageUp", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_movePageDown", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_moveTop", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_moveBottom", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_selectTop", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_selectBottom", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_lineNext", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_linePrevious", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_selectLineNext", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_selectLinePrevious", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_charPrevious", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_charNext", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_selectCharPrevious", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_selectCharNext", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_beginLine", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_endLine", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_selectBeginLine", "", "state_enabled", PR_FALSE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_selectEndLine", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_wordPrevious", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_wordNext", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_selectWordPrevious", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_selectWordNext", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_cut", "", "state_enabled", PR_TRUE, 50000,    5.798,     "hello",						 "HELLO"},
-	{"cmd_cutOrDelete", "", "state_enabled", PR_FALSE, 50000,    5.798,     "hello",						 "HELLO"},
-};
-
-nsICommandManager * CnsICommandMgr::GetCommandMgrObject(nsIWebBrowser *aWebBrowser, PRInt16 displayMethod)
-{
-	nsCOMPtr<nsIWebBrowser> wb(aWebBrowser);
-	nsCOMPtr<nsICommandManager> cmdMgrObj = do_GetInterface(wb, &rv);
-	RvTestResult(rv, "GetCommandMgrObject() test", displayMethod);
-    if (!cmdMgrObj) {
-        QAOutput("Didn't get nsICommandManager object.");
-		return nsnull;
-	}
-	return cmdMgrObj;
-}
-
-nsICommandManager * CnsICommandMgr::GetCommandMgrWithContractIDObject(PRInt16 displayMethod)
-{
-	nsCOMPtr<nsICommandManager> cmdMgrObj = do_CreateInstance(NS_COMMAND_MANAGER_CONTRACTID, &rv);
-	RvTestResult(rv, "GetCommandMgrWithContractIDObject() test", 1); 
-    if (!cmdMgrObj) {
-        QAOutput("Didn't get nsICommandManager object.");
-		return nsnull;
-	}
-	return cmdMgrObj;
-}
-
-void CnsICommandMgr::IsCommandSupportedTest(const char *aCommandName, PRInt16 displayMethod)
-{
-	PRBool isSupported;
-
-	FormatAndPrintOutput("the Command input = ", aCommandName, displayMethod);
-	cmdMgrObj = GetCommandMgrObject(qaWebBrowser, displayMethod);
-	if (!cmdMgrObj) {
-        QAOutput("Didn't get nsICommandManager object. Test failed.");
-		return;
-	}
-	rv = cmdMgrObj->IsCommandSupported(aCommandName, nsnull, &isSupported);
-	RvTestResult(rv, "IsCommandSupported() test", displayMethod);
-	if (displayMethod == 1)
-		RvTestResultDlg(rv, "IsCommandSupported() test", true);
-	FormatAndPrintOutput("isSupported boolean = ", isSupported, displayMethod);
-}
-
-void CnsICommandMgr::IsCommandEnabledTest(const char *aCommandName, PRInt16 displayMethod)
-{
-	PRBool isEnabled;
-
-	FormatAndPrintOutput("the Command input = ", aCommandName, displayMethod);
-	cmdMgrObj = GetCommandMgrObject(qaWebBrowser, displayMethod);
-	if (!cmdMgrObj) {
-        QAOutput("Didn't get nsICommandManager object.");
-		return;
-	}
-	rv = cmdMgrObj->IsCommandEnabled(aCommandName, nsnull, &isEnabled);
-	RvTestResult(rv, "IsCommandEnabled() test", displayMethod);
-	if (displayMethod == 1)
-		RvTestResultDlg(rv, "IsCommandEnabled() test");
-	FormatAndPrintOutput("isEnabled boolean = ", isEnabled, displayMethod);
-}
-
-void CnsICommandMgr::GetCommandStateTest(const char *aCommandName, PRInt16 displayMethod)
-{
-	PRBool enabled = PR_FALSE;
-
-	FormatAndPrintOutput("the Command input = ", aCommandName, displayMethod);
-	cmdMgrObj = GetCommandMgrObject(qaWebBrowser, displayMethod);
-	cmdParamObj = CnsICmdParams::GetCommandParamObject();
-	if (!cmdMgrObj) {
-        QAOutput("Didn't get nsICommandManager object.");
-		return;
-	}
-	rv = cmdMgrObj->GetCommandState(aCommandName, nsnull, cmdParamObj);
-	RvTestResult(rv, "GetCommandState() test", displayMethod);
-	if (displayMethod == 1)
-		RvTestResultDlg(rv, "GetCommandState() test");
-	if (!cmdParamObj) 
-        QAOutput("Didn't get nsICommandParams object for GetCommandStateTest.");
-}
-
-void CnsICommandMgr::DoCommandTest(const char *aCommandName,
-								   const char *doCommandState,
-								   PRInt16 displayMethod)
-{
-	nsCAutoString value;
-
-	FormatAndPrintOutput("the Command input = ", aCommandName, displayMethod);
-	cmdMgrObj = GetCommandMgrObject(qaWebBrowser, displayMethod);
-	cmdParamObj = CnsICmdParams::GetCommandParamObject();
-	if (!cmdMgrObj) {
-        QAOutput("Didn't get nsICommandManager object. Tests fail");
-		return;
-	}
-
-	if (strcmp(doCommandState, "state_attribute") == 0)
-	{
-		if (strcmp(aCommandName,"cmd_fontColor") == 0 ||
-		    strcmp(aCommandName,"cmd_backgroundColor") == 0)
-			value = "#FF0000";
-		else if (strcmp(aCommandName,"cmd_fontFace") == 0)
-			value = "Helvetica, Ariel, san-serif";
-		else
-			value = "left";
-
-		if (cmdParamObj)
-			cmdParamObj->SetCStringValue("state_attribute", value.get());
-		else
-			QAOutput("Didn't get nsICommandParam object for nsICommandMgr test.");
-	}
-	rv = cmdMgrObj->DoCommand(aCommandName, cmdParamObj, nsnull);
-	RvTestResult(rv, "DoCommand() test", displayMethod);
-	if (displayMethod == 1)
-		RvTestResultDlg(rv, "DoCommand() test");
-}
-
-
-void CnsICommandMgr::OnStartTests(UINT nMenuID)
-{
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSICOMMANDMANAGER_RUNALLTESTS :
-			RunAllTests();
-			break;
-		case ID_INTERFACES_NSICOMMANDMANAGER_ADDCOMMANDOBSERVER :
-			QAOutput("Not implemented yet.", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDMANAGER_REMOVECOMMANDOBSERVER :
-			QAOutput("Not implemented yet.", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDMANAGER_ISCOMMANDESUPPORTED  :
-			IsCommandSupportedTest("cmd_bold", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDMANAGER_ISCOMMANDENABLED :
-			IsCommandEnabledTest("cmd_bold", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDMANAGER_GETCOMMANDSTATE :
-			GetCommandStateTest("cmd_charSet", 2);
-			break;
-		case ID_INTERFACES_NSICOMMANDMANAGER_DOCOMMAND :
-			DoCommandTest("cmd_fontColor", "state_attribute", 2);
-			break;
-	}
-}
-
-void CnsICommandMgr::RunAllTests()
-{
-	PRInt16 i;
-
-	QAOutput("Run All nsICommandManager tests. Check C:/Temp/TestOutput.txt for test results.", 2);
-	for (i=0; i < 50; i++)
-	{
-		FormatAndPrintOutput("loop cnt = ", i, 1);
-		IsCommandSupportedTest(CommandTable[i].mCmdName, 1);
-		IsCommandEnabledTest(CommandTable[i].mCmdName, 1);
-		GetCommandStateTest(CommandTable[i].mCmdName, 1);
-		DoCommandTest(CommandTable[i].mCmdName,
-					  CommandTable[i].mDoCmdState, 1);
-	}
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CnsICommandMgr message handlers
diff --git a/embedding/qa/testembed/nsICommandMgr.h b/embedding/qa/testembed/nsICommandMgr.h
deleted file mode 100644
index 9f6bd7dfe0b..00000000000
--- a/embedding/qa/testembed/nsICommandMgr.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// header file for nsIEditingSession interface tests
-//
-#if !defined(AFX_NSICOMMANDMGR_H__574F7B4A_B175_11D6_9BE0_00C04FA02BE6__INCLUDED_)
-#define AFX_NSICOMMANDMGR_H__574F7B4A_B175_11D6_9BE0_00C04FA02BE6__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// nsICommandMgr.h : header file
-//
-
-#include "BrowserView.h"
-#include "BrowserImpl.h"
-#include "StdAfx.h"
-#include "Tests.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// nsICommandMgr window
-
-class CnsICommandMgr// : public nsIObserver, public nsSupportsWeakReference
-{
-// Construction
-public:
-	CnsICommandMgr(nsIWebBrowser *mWebBrowser);
-
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser;
-	nsCOMPtr<nsICommandManager> cmdMgrObj;
-	nsCOMPtr<nsICommandParams> cmdParamObj;
-	// test methods
-public:
-	static nsICommandManager * GetCommandMgrObject(nsIWebBrowser *aWebBrowser, PRInt16);
-	static nsICommandManager * GetCommandMgrWithContractIDObject(PRInt16);
-	void IsCommandSupportedTest(const char *, PRInt16);
-	void IsCommandEnabledTest(const char *, PRInt16);
-	void GetCommandStateTest(const char *, PRInt16);
-	void DoCommandTest(const char *, const char *, PRInt16);
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests();
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CnsICommandMgr)
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CnsICommandMgr();
-
-	// Generated message map functions
-protected:
-
-};
-
-struct CommandTest
-{
-	const char *mCmdName;
-	const char *mDoCmdState;
-	const char *mCmdParamState;
-	PRBool	    mBooleanValue;
-	PRInt32	    mLongValue;
-	double	    mDoubleValue;
-	char	   *mStringValue;
-	char	   *mCStringValue;
-};
-
-extern CommandTest CommandTable[];
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_NSICOMMANDMGR_H__574F7B4A_B175_11D6_9BE0_00C04FA02BE6__INCLUDED_)
diff --git a/embedding/qa/testembed/nsIEditSession.cpp b/embedding/qa/testembed/nsIEditSession.cpp
deleted file mode 100644
index a6745449585..00000000000
--- a/embedding/qa/testembed/nsIEditSession.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// nsIEditSession.cpp : test implementations for nsIEditingSession interface
-//
-
-#include "stdafx.h"
-#include "testembed.h"
-#include "nsIEditSession.h"
-#include "QaUtils.h"
-#include "BrowserFrm.h"
-#include "BrowserImpl.h"
-#include "BrowserView.h"
-#include "Tests.h"
-#include "nsIEditor.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// nsIEditSession
-
-CnsIEditSession::CnsIEditSession(nsIWebBrowser *mWebBrowser)
-{
-	qaWebBrowser = mWebBrowser;
-}
-
-CnsIEditSession::~CnsIEditSession()
-{
-}
-
-nsIEditingSession * CnsIEditSession::GetEditSessionObject()
-{
-    editingSession = do_GetInterface(qaWebBrowser);
-    if (!editingSession) {
-        QAOutput("Didn't get nsIEditingSession object.");
-		return nsnull;
-	}
-
-    return (editingSession);
-}
-
-void CnsIEditSession::InitTest(PRInt16 displayMode)
-{
-	editingSession = GetEditSessionObject();
-	domWindow = GetTheDOMWindow(qaWebBrowser);
-	if (editingSession) {
-		rv = editingSession->Init(domWindow);
-		RvTestResult(rv, "Init() test", displayMode);
-		if (displayMode == 1)
-			RvTestResultDlg(rv, "Init() test", true);
-		if (!domWindow)
-			QAOutput("Didn't get domWindow object for InitTest() test. Test failed.", displayMode);
-	}
-	else
-		QAOutput("Didn't get editingSession object for InitTest() test. Test failed.", displayMode);
-}
-
-void CnsIEditSession::MakeWinEditTest(PRBool afterUriLoad, PRInt16 displayMode)
-{
-	editingSession = GetEditSessionObject();
-	domWindow = GetTheDOMWindow(qaWebBrowser);
-	if (editingSession) {
-		rv= editingSession->MakeWindowEditable(domWindow, "text", afterUriLoad,
-		                                       PR_TRUE, PR_FALSE);
-		RvTestResult(rv, "MakeWindowEditable() test", displayMode);
-		if (displayMode == 1)
-			RvTestResultDlg(rv, "MakeWindowEditable() test");
-		if (!domWindow)
-			QAOutput("Didn't get domWindow object for MakeWindowEditable() test. Test failed.", displayMode);
-	}
-	else
-		QAOutput("Didn't get editingSession object for MakeWindowEditable() test. Test failed.", 1);
-}
-
-void CnsIEditSession::WinIsEditTest(PRBool outIsEditable, PRInt16 displayMode)
-{
-	editingSession = GetEditSessionObject();
-	domWindow = GetTheDOMWindow(qaWebBrowser);
-	if (editingSession) {
-		rv = editingSession->WindowIsEditable(domWindow, &outIsEditable);
-		RvTestResult(rv, "WindowIsEditable() test", displayMode);
-		if (displayMode == 1)
-			RvTestResultDlg(rv, "WindowIsEditable() test");
-		if (!domWindow)
-			QAOutput("Didn't get domWindow object for WindowIsEditable() test. Test failed.", displayMode);
-		FormatAndPrintOutput("the outIsEditable boolean = ", outIsEditable, displayMode);
-	}
-	else
-		QAOutput("Didn't get object(s) for WinIsEditTest() test. Test failed.", 1);
-}
-
-void CnsIEditSession::GetEditorWinTest(PRInt16 displayMode)
-{
-	nsCOMPtr<nsIEditor> theEditor;
-//	nsIEditor *theEditor = nsnull;
-	editingSession = GetEditSessionObject();
-	domWindow = GetTheDOMWindow(qaWebBrowser);
-	if (editingSession) {
-		rv = editingSession->GetEditorForWindow(domWindow, getter_AddRefs(theEditor));
-		RvTestResult(rv, "GetEditorForWindow() test", displayMode);
-		if (displayMode == 1)
-			RvTestResultDlg(rv, "GetEditorForWindow() test");
-		if (!domWindow)
-			QAOutput("Didn't get domWindow object for GetEditorForWindow() test. Test failed.", displayMode);
-
-		if (!theEditor) 
-			QAOutput("Didn't get the Editor object.");
-	}
-	else
-		QAOutput("Didn't get object(s) for WinIsEditTest() test. Test failed.", 1);
-}
-
-void CnsIEditSession::SetEditorWinTest(PRInt16 displayMode)
-{
-	editingSession = GetEditSessionObject();
-	domWindow = GetTheDOMWindow(qaWebBrowser);
-	if (editingSession) {
-		rv = editingSession->SetupEditorOnWindow(domWindow);
-		RvTestResult(rv, "SetupEditorOnWindow() test", displayMode);
-		if (displayMode == 1)
-			RvTestResultDlg(rv, "SetupEditorOnWindow() test");
-		if (!domWindow)
-			QAOutput("Didn't get domWindow object for SetupEditorOnWindow() test. Test failed.", displayMode);
-	}
-	else
-		QAOutput("Didn't get object(s) for SetEditorWinTest() test. Test failed.", 1);
-}
-
-void CnsIEditSession::TearEditorWinTest(PRInt16 displayMode)
-{
-	editingSession = GetEditSessionObject();
-	domWindow = GetTheDOMWindow(qaWebBrowser);
-	if (editingSession) {
-		rv = editingSession->TearDownEditorOnWindow(domWindow);
-		RvTestResult(rv, "TearDownEditorOnWindow() test", displayMode);
-		if (displayMode == 1)
-			RvTestResultDlg(rv, "TearDownEditorOnWindow() test");
-		if (!domWindow)
-			QAOutput("Didn't get domWindow object for TearDownEditorOnWindow() test. Test failed.", displayMode);
-	}
-	else
-		QAOutput("Didn't get object(s) for TearEditorWinTest() test. Test failed.", 1);
-}
-
-void CnsIEditSession::OnStartTests(UINT nMenuID)
-{
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSIEDITINGSESSION_RUNALLTESTS :
-			RunAllTests();
-			break;
-		case ID_INTERFACES_NSIEDITINGSESSION_INIT :
-			InitTest(2);
-			break;
-		case ID_INTERFACES_NSIEDITINGSESSION_MAKEWINDOWEDITABLE :
-			MakeWinEditTest(PR_FALSE, 2);
-			break;
-		case ID_INTERFACES_NSIEDITINGSESSION_WINDOWISEDITABLE  :
-			WinIsEditTest(PR_TRUE, 2);
-			break;
-		case ID_INTERFACES_NSIEDITINGSESSION_GETEDITORFORWINDOW :
-			GetEditorWinTest(2);
-			break;
-		case ID_INTERFACES_NSIEDITINGSESSION_SETUPEDITORONWINDOW :
-			SetEditorWinTest(2);
-			break;
-		case ID_INTERFACES_NSIEDITINGSESSION_TEARDOWNEDITORONWINDOW :
-			TearEditorWinTest(2);
-			break;
-	}
-}
-
-void CnsIEditSession::RunAllTests()
-{
-	InitTest(1);
-	MakeWinEditTest(PR_FALSE, 1);
-	WinIsEditTest(PR_TRUE, 1);
-	GetEditorWinTest(1);
-//	SetEditorWinTest(1);		 
-	TearEditorWinTest(1);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CnsIEditSession message handlers
diff --git a/embedding/qa/testembed/nsIEditSession.h b/embedding/qa/testembed/nsIEditSession.h
deleted file mode 100644
index 241f92eb053..00000000000
--- a/embedding/qa/testembed/nsIEditSession.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// header file for nsIEditingSession interface tests
-//
-
-#if !defined(AFX_NSIEDITSESSION_H__4C854323_B0B8_11D6_9BE0_00C04FA02BE6__INCLUDED_)
-#define AFX_NSIEDITSESSION_H__4C854323_B0B8_11D6_9BE0_00C04FA02BE6__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// nsIEditSession.h : header file
-//
-
-#include "BrowserView.h"
-#include "BrowserImpl.h"
-#include "StdAfx.h"
-#include "Tests.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// nsIEditSession window
-
-class CnsIEditSession
-{
-// Construction
-public:
-	CnsIEditSession(nsIWebBrowser *mWebBrowser);
-
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser;
-// Attributes
-public:
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CnsIEditSession)
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CnsIEditSession();
-
-	// local methods for nsIEditingSession tests
-	nsIEditingSession * GetEditSessionObject();
-	void InitTest(PRInt16);
-	void MakeWinEditTest(PRBool, PRInt16);
-	void WinIsEditTest(PRBool, PRInt16);
-	void SetEditorWinTest(PRInt16);
-	void GetEditorWinTest(PRInt16);
-	void TearEditorWinTest(PRInt16);
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests(void);
-
-	nsCOMPtr<nsIEditingSession> editingSession;
-	nsCOMPtr<nsIDOMWindow> domWindow;
-	// Generated message map functions
-protected:
-
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_NSIEDITSESSION_H__4C854323_B0B8_11D6_9BE0_00C04FA02BE6__INCLUDED_)
diff --git a/embedding/qa/testembed/nsIFile.cpp b/embedding/qa/testembed/nsIFile.cpp
deleted file mode 100644
index d4e28545e10..00000000000
--- a/embedding/qa/testembed/nsIFile.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// Test cases for the nsIClipBoardCommand Interface
-
-
-#include "stdafx.h"
-#include "QaUtils.h"
-#include <stdio.h>
-#include "nsIFile.h"
-
-CNsIFile::CNsIFile()
-{
-
-}
-
-
-CNsIFile::~CNsIFile()
-{
-
-}
-
-void CNsIFile::OnStartTests(UINT nMenuID)
-{
-	// Calls  all or indivdual test cases on the basis of the 
-	// option selected from menu.
-
-   nsCOMPtr<nsILocalFile> theTestFile(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
-   nsCOMPtr<nsILocalFile> theFileOpDir(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
-
-    if (!theTestFile)
- 	{
-		QAOutput("File object doesn't exist. No File tests performed.", 2);
-		return;
-	}
-
-	if (!theFileOpDir)
- 	{
-		QAOutput("File object doesn't exist. No File tests performed.", 2);
-		return;
-	}
-
-	switch(nMenuID)
-	{		
-		case ID_INTERFACES_NSIFILE_RUNALLTESTS	:
-			QAOutput("Begin nsIFile tests.", 1);
-			RunAllTests(theTestFile,theFileOpDir);
-			QAOutput("End nsIFile tests.", 1);
-			break ;
-
-		case ID_INTERFACES_NSIFILE_INITWITHPATH	:
-			InitWithPathTest(theTestFile, 2);
-			break ;
-
-		case ID_INTERFACES_NSIFILE_APPENDRELATICEPATH :
-			AppendRelativePathTest(theTestFile, 2);
-			break ;
-
-		case ID_INTERFACES_NSIFILE_EXISTS :
-			FileCreateTest(theTestFile, 2);
-			break ;
-
-		case ID_INTERFACES_NSIFILE_CREATE :
-			FileExistsTest(theTestFile, 2);
-			break ;
-
-		case ID_INTERFACES_NSIFILE_COPYTO :
-			FileCopyTest(theTestFile, theFileOpDir, 2);	
-			break ;
-
-		case ID_INTERFACES_NSIFILE_MOVETO :
-			FileMoveTest(theTestFile, theFileOpDir, 2);	
-			break ;
-	}
-}
-
-
-// ***********************************************************************
-// ************************** Interface Tests ****************************
-// ***********************************************************************
-
-// nsIFile:
-
-void CNsIFile::RunAllTests(nsILocalFile *theTestFile, nsILocalFile *theFileOpDir)
-{
-	InitWithPathTest(theTestFile, 1);
-	AppendRelativePathTest(theTestFile, 1);
-	FileCreateTest(theTestFile, 1);
-	FileExistsTest(theTestFile, 1);
-	FileCopyTest(theTestFile, theFileOpDir, 1);	
-	FileMoveTest(theTestFile, theFileOpDir, 1);	
-}
-
-// ***********************************************************************
-
-// Individual nsIFile tests
-
-
-
-void CNsIFile::InitWithPathTest(nsILocalFile *theTestFile, PRInt16 displayMode)
-{
-	rv = theTestFile->InitWithNativePath(NS_LITERAL_CSTRING("c:\\temp\\"));
-	RvTestResult(rv, "InitWithNativePath() test (initializing file path)", displayMode);
-	RvTestResultDlg(rv, "InitWithNativePath() test (initializing file path)", true);
-}
-
-void CNsIFile::AppendRelativePathTest(nsILocalFile *theTestFile, PRInt16 displayMode)
-{
-	rv = theTestFile->AppendRelativeNativePath(NS_LITERAL_CSTRING("myFile.txt"));
-	RvTestResult(rv, "AppendRelativeNativePath() test (append file to the path)", displayMode);
-	RvTestResultDlg(rv, "AppendRelativeNativePath() test (append file to the path)");
-}
-
-void CNsIFile::FileCreateTest(nsILocalFile *theTestFile, PRInt16 displayMode)
-{
-	PRBool exists =  PR_TRUE;
-
-	rv = theTestFile->InitWithNativePath(NS_LITERAL_CSTRING("c:\\temp\\"));
-	rv = theTestFile->AppendRelativeNativePath(NS_LITERAL_CSTRING("myFile.txt"));
-
-	rv = theTestFile->Exists(&exists);
-	if (!exists)
-	{
-		QAOutput("File doesn't exist. We'll try creating it.", displayMode);
-		rv = theTestFile->Create(nsIFile::NORMAL_FILE_TYPE, 0777);
-		RvTestResult(rv, "File Create() test ('myFile.txt')", displayMode);
-		RvTestResultDlg(rv, "File Create() test ('myFile.txt')");
-	}
-	else
-		QAOutput("File already exists (myFile.txt). We won't create it.", displayMode);
-}
-
-void CNsIFile::FileExistsTest(nsILocalFile *theTestFile, PRInt16 displayMode)
-{
-	PRBool exists =  PR_TRUE;
-
-	rv = theTestFile->InitWithNativePath(NS_LITERAL_CSTRING("c:\\temp\\"));
-	rv = theTestFile->AppendRelativeNativePath(NS_LITERAL_CSTRING("myFile.txt"));
-
-	rv = theTestFile->Exists(&exists);
-	RvTestResult(rv, "File Exists() test ('myFile.txt')", displayMode);
-	RvTestResultDlg(rv, "File Exists() test ('myFile.txt')");
-	if (!exists)
-		QAOutput("Exists() test Failed. File (myFile.txt) doesn't exist.", displayMode);
-	else
-		QAOutput("Exists() test Passed. File (myFile.txt) exists.", displayMode);
-}
-
-void CNsIFile::FileCopyTest(nsILocalFile *theTestFile, nsILocalFile *theFileOpDir,
-							PRInt16 displayMode)
-{
-	PRBool exists =  PR_TRUE;
-
-	QAOutput("Start File Copy test.", displayMode);
-	rv = theFileOpDir->InitWithNativePath(NS_LITERAL_CSTRING("c:\\temp\\"));
-
-	if (NS_FAILED(rv))
-		QAOutput("The target dir wasn't found.", displayMode);
-	else
-		QAOutput("The target dir was found.", displayMode);
-
-	rv = theTestFile->InitWithNativePath(NS_LITERAL_CSTRING("c:\\temp\\myFile.txt"));
-	if (NS_FAILED(rv))
-		QAOutput("The path wasn't found.", displayMode);
-	else
-		QAOutput("The path was found.", displayMode);
-
-	rv = theTestFile->CopyToNative(theFileOpDir, NS_LITERAL_CSTRING("myFile2.txt"));
-	RvTestResult(rv, "rv CopyToNative() test", displayMode);
-	RvTestResultDlg(rv, "File CopyToNative() test ('myFile.txt')");
-
-	rv = theTestFile->InitWithNativePath(NS_LITERAL_CSTRING("c:\\temp\\myFile2.txt"));
-
-	rv = theTestFile->Exists(&exists);
-	if (!exists)
-		QAOutput("File didn't copy. CopyToNative() test Failed.", displayMode);
-	else
-		QAOutput("File copied. CopyToNative() test Passed.", displayMode);
-}
-
-void CNsIFile::FileMoveTest(nsILocalFile *theTestFile, nsILocalFile *theFileOpDir,
-							PRInt16 displayMode)
-{
-	PRBool exists =  PR_TRUE;
-
-	QAOutput("Start File Move test.", displayMode);
-
-	rv = theFileOpDir->InitWithNativePath(NS_LITERAL_CSTRING("c:\\Program Files\\"));
-	if (NS_FAILED(rv))
-		QAOutput("The target dir wasn't found.", displayMode);
-
-	rv = theTestFile->InitWithNativePath(NS_LITERAL_CSTRING("c:\\temp\\myFile2.txt"));
-	if (NS_FAILED(rv))
-		QAOutput("The path wasn't found.", displayMode);
-
-	rv = theTestFile->MoveToNative(theFileOpDir, NS_LITERAL_CSTRING("myFile2.txt"));
-	RvTestResult(rv, "MoveToNative() test", displayMode);
-	RvTestResultDlg(rv, "File MoveToNative() test ('myFile.txt')");
-
-	rv = theTestFile->InitWithNativePath(NS_LITERAL_CSTRING("c:\\Program Files\\myFile2.txt"));
-
-	rv = theTestFile->Exists(&exists);
-	if (!exists)
-		QAOutput("File wasn't moved. MoveToNative() test Failed.", displayMode);
-	else
-		QAOutput("File was moved. MoveToNative() test Passed.", displayMode);
-}
-
diff --git a/embedding/qa/testembed/nsIFile.h b/embedding/qa/testembed/nsIFile.h
deleted file mode 100644
index 14312c10914..00000000000
--- a/embedding/qa/testembed/nsIFile.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-// File Overview....
-// 
-// Header file for nsIClipBoardCommand interface test cases
-
-
-class CNsIFile
-{	
-public:
-	CNsIFile();
-
-
-public:
-	~CNsIFile();
-
-public:
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests(nsILocalFile*, nsILocalFile *);
-	void InitWithPathTest(nsILocalFile*, PRInt16);
-	void AppendRelativePathTest(nsILocalFile*, PRInt16);
-	void FileCreateTest(nsILocalFile*, PRInt16);
-	void FileExistsTest(nsILocalFile*, PRInt16);
-	void FileCopyTest(nsILocalFile*, nsILocalFile *, PRInt16);	
-	void FileMoveTest(nsILocalFile*, nsILocalFile *, PRInt16);	
-
-protected:
-
-
-};
\ No newline at end of file
diff --git a/embedding/qa/testembed/nsIObserServ.cpp b/embedding/qa/testembed/nsIObserServ.cpp
deleted file mode 100644
index e64be6869a8..00000000000
--- a/embedding/qa/testembed/nsIObserServ.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// nsIObserServ.cpp: implementation of the CnsIObserServ class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "stdafx.h"
-#include "nsIObserServ.h"
-#include "QaUtils.h"
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-CnsIObserServ::CnsIObserServ()
-
-{
-	mRefCnt = 1 ;
-}
-
-
-CnsIObserServ::~CnsIObserServ()
-{
-
-}
-
-ObserverElement ObserverTable[] = {
-	{"profile-before-change", PR_TRUE},
-    {"profile-after-change", PR_FALSE},
-	{"profile-do-change", PR_TRUE},
-	{"text/xml", PR_FALSE},
-	{"application/xml", PR_TRUE},
-	{"htmlparser", PR_FALSE},
-	{"xmlparser", PR_TRUE},	
-	{"memory-pressure", PR_FALSE},
-	{"quit-application", PR_TRUE},
-	{"login-failed", PR_FALSE}	
-}; 
-
-
-void CnsIObserServ::OnStartTests(UINT nMenuID)
-
-{
-	// Calls  all or indivdual test cases on the basis of the 
-	// option selected from menu.
-
-	switch(nMenuID)
-	{
-
-	case ID_INTERFACES_NSIOBSERVERSERVICE_RUNALLTESTS :
-		RunAllTests();
-		break;
-
-	case ID_INTERFACES_NSIOBSERVERSERVICE_ADDOBSERVERS :
-		AddObserversTest(2);
-		break;
-
-	case ID_INTERFACES_NSIOBSERVERSERVICE_ENUMERATEOBSERVERS :
-		QAOutput("Adding observers first", 2);
-		AddObserversTest(1);		
-		EnumerateObserversTest(1);
-		break;
-
-	case ID_INTERFACES_NSIOBSERVERSERVICE_NOTIFYOBSERVERS :
-		NotifyObserversTest(1);
-		break;
-
-	case ID_INTERFACES_NSIOBSERVERSERVICE_REMOVEOBSERVERS :
-		QAOutput("Adding observers first.", 2);
-		AddObserversTest(1);
-		RemoveObserversTest(1);
-		break;
-
-	default :
-		AfxMessageBox("Menu handler not added for this menu item");
-		break;
-	}
-}
-
-void CnsIObserServ::RunAllTests()
-{
-	AddObserversTest(1);
-	EnumerateObserversTest(1);
-	NotifyObserversTest(1);
-	RemoveObserversTest(1);
-}
-
-void CnsIObserServ::AddObserversTest(int displayType)
-{
-	int i;
-
-	nsCOMPtr<nsIObserverService>observerService(do_GetService("@mozilla.org/observer-service;1",&rv));
-	RvTestResult(rv, "nsIObserverService object test", displayType);
-	RvTestResultDlg(rv, "nsIObserverService object test", true);
-
-	QAOutput("\n nsIObserverService::AddObserversTest().");
-	if (!observerService) 
-	{
-		QAOutput("Can't get nsIObserverService object. Tests fail.");
-		return;
-	}
-
-	for (i=0; i<10; i++)
-	{
-		rv = observerService->AddObserver(this, ObserverTable[i].theTopic, 
-									      ObserverTable[i].theOwnsWeak);
-		FormatAndPrintOutput("The observer to be added = ", ObserverTable[i].theTopic, 1);	
-		RvTestResult(rv, "AddObservers() test", displayType);
-		RvTestResultDlg(rv, "AddObservers() test");
-	}
-}
-
-void CnsIObserServ::RemoveObserversTest(int displayType)
-{
-	int i;
-
-	nsCOMPtr<nsIObserverService>observerService(do_GetService("@mozilla.org/observer-service;1",&rv));
-
-	QAOutput("\n nsIObserverService::RemoveObserversTest().");
-	if (!observerService) 
-	{
-		QAOutput("Can't get nsIObserverService object. Tests fail.");
-		return;
-	}
-
-	for (i=0; i<10; i++)
-	{
-		rv = observerService->RemoveObserver(this, ObserverTable[i].theTopic);
-		FormatAndPrintOutput("The observer to be removed = ", ObserverTable[i].theTopic, 1);	
-		RvTestResult(rv, "RemoveObservers() test", displayType);
-		RvTestResultDlg(rv, "RemoveObservers() test");
-	}
-}
-
-
-void CnsIObserServ::NotifyObserversTest(int displayType)
-{
-	PRInt32 i;
-	nsCOMPtr<nsIObserverService>observerService(do_GetService("@mozilla.org/observer-service;1",&rv));
-
-	QAOutput("\n nsIObserverService::NotifyObserversTest().");
-
-	if (!observerService) 
-	{
-		QAOutput("Can't get nsIObserverService object. Tests fail.");
-		return;
-	}
-
-	for (i=0; i<10; i++)
-	{
-		FormatAndPrintOutput("The notified observer = ", ObserverTable[i].theTopic, 1);
-		rv = observerService->NotifyObservers(nsnull, ObserverTable[i].theTopic, 0);
-		RvTestResult(rv, "NotifyObservers() test", displayType);
-		RvTestResultDlg(rv, "NotifyObservers() test");
-	}
-}
-
-
-void CnsIObserServ::EnumerateObserversTest(int displayType)
-{
-	PRInt32 i=0;
-	nsCOMPtr<nsIObserverService> observerService(do_GetService("@mozilla.org/observer-service;1",&rv));
-	nsCOMPtr<nsISimpleEnumerator> simpleEnum;
-
-	QAOutput("\n nsIObserverService::EnumerateObserversTest().");
-	if (!observerService) 
-	{
-		QAOutput("Can't get nsIObserverService object. Tests fail.");
-		return;
-	}
-
-	for (i=0; i<10; i++)
-	{
-		// need to handle Simple Enumerator
-
-		rv = observerService->EnumerateObservers(ObserverTable[i].theTopic, 
-												 getter_AddRefs(simpleEnum));
-
-		RvTestResult(rv, "EnumerateObserversTest() test", displayType);
-		RvTestResultDlg(rv, "EnumerateObserversTest() test");
-		if (!simpleEnum)
-		{
-			QAOutput("Didn't get SimpleEnumerator object. Tests fail.");
-			return;
-		}
-
-		nsCOMPtr<nsIObserver> observer;
-		PRBool theLoop = PR_TRUE;
-		PRBool bLoop = PR_TRUE;
-
-		while( NS_SUCCEEDED(simpleEnum->HasMoreElements(&theLoop)) && bLoop) 
-		{
-			simpleEnum->GetNext(getter_AddRefs(observer));
-
-			if (!observer)
-			{
-				QAOutput("Didn't get the observer object. Tests fail.");
-				return;
-			}
-			rv = observer->Observe(observer, ObserverTable[i].theTopic, 0);
-			RvTestResult(rv, "nsIObserver() test", 1);	
-			RvTestResultDlg(rv, "nsIObserver() test");
-			
-			// compare 'this' with observer object
-			if( this == reinterpret_cast<CnsIObserServ*>(reinterpret_cast<void*>(observer.get())))
-			{
-				QAOutput("observers match. Test passes.");
-				bLoop = PR_FALSE;
-			}
-			else
-				QAOutput("observers don't match. Test fails.");
-		}
-	}
-}
-
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(CnsIObserServ,  nsIObserver,  nsISupportsWeakReference)
-
-
-NS_IMETHODIMP CnsIObserServ::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData)
-{
-    nsresult rv = NS_OK;
-    
-    if (nsCRT::strcmp(aTopic, "profile-before-change") == 0)
-    {
- 		QAOutput("Observed 'profile-before-change'.");
-    }
-    else if (nsCRT::strcmp(aTopic, "profile-after-change") == 0)
-    {
- 		QAOutput("Observed 'profile-after-change'.");
-    }
-	else if (nsCRT::strcmp(aTopic, "profile-do-change") == 0)
-    {
- 		QAOutput("Observed 'profile-do-change'.");
-    }
-    else if (nsCRT::strcmp(aTopic, "text/xml") == 0)
-    {
- 		QAOutput("Observed 'text/xml'.");
-    }
-	else if (nsCRT::strcmp(aTopic, "application/xml") == 0)
-    {
- 		QAOutput("Observed 'application/xml'.");
-    }
-    else if (nsCRT::strcmp(aTopic, "htmlparser") == 0)
-    {
- 		QAOutput("Observed 'htmlparser'.");
-    }
-	else if (nsCRT::strcmp(aTopic, "xmlparser") == 0)
-    {
- 		QAOutput("Observed 'xmlparser'.");
-    }
-	else if (nsCRT::strcmp(aTopic, "memory-pressure") == 0)
-    {
- 		QAOutput("Observed 'memory-pressure'.");
-    }
-	else if (nsCRT::strcmp(aTopic, "quit-application") == 0)
-    {
- 		QAOutput("Observed 'quit-application'.");
-    }
-	else if (nsCRT::strcmp(aTopic, "login-failed") == 0)
-    {
- 		QAOutput("Observed 'login-failed'.");
-    }
-
-    return rv;
-}
diff --git a/embedding/qa/testembed/nsIObserServ.h b/embedding/qa/testembed/nsIObserServ.h
deleted file mode 100644
index 9615837324a..00000000000
--- a/embedding/qa/testembed/nsIObserServ.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// nsIObserServ.h: interface for the CnsIObserServ class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_NSIOBSERSERV_H__96D90A39_FFC1_11D5_9B13_00C04FA02BE6__INCLUDED_)
-#define AFX_NSIOBSERSERV_H__96D90A39_FFC1_11D5_9B13_00C04FA02BE6__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-class CnsIObserServ : public nsIObserver, public nsSupportsWeakReference
- 
-{
-public:
-	CnsIObserServ();
-
-	virtual ~CnsIObserServ();
-
-	NS_DECL_ISUPPORTS
-	NS_DECL_NSIOBSERVER
-
-	//nsCOMPtr<nsIWebBrowser> qaWebBrowser ;
-
-	void RunAllTests();
-	void AddObserversTest(int);
-	void RemoveObserversTest(int);
-	void NotifyObserversTest(int);
-	void EnumerateObserversTest(int);
-	void OnStartTests(UINT nMenuID);
-};
-
-typedef struct
-{
-   char			theTopic[1024];
-   bool			theOwnsWeak;
-} ObserverElement;
-
-#endif // !defined(AFX_NSIOBSERSERV_H__96D90A39_FFC1_11D5_9B13_00C04FA02BE6__INCLUDED_)
diff --git a/embedding/qa/testembed/nsIWebBrow.cpp b/embedding/qa/testembed/nsIWebBrow.cpp
deleted file mode 100644
index 40995ed7483..00000000000
--- a/embedding/qa/testembed/nsIWebBrow.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//
-// test cases for nsIWebBrowser and nsIWebBrowserSetup
-//
-
-#include "Stdafx.h"
-#include "TestEmbed.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "Tests.h"
-#include "domwindow.h"
-#include "QaUtils.h"
-#include <stdio.h>
-#include "nsIWebBrow.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-// constructor for CNsIWebBrowser
-CNsIWebBrowser::CNsIWebBrowser(nsIWebBrowser *mWebBrowser, CBrowserImpl *mpBrowserImpl)
-{
-	qaWebBrowser = mWebBrowser;
-	qaBrowserImpl = mpBrowserImpl;
-}
-
-// destructor for CNsIWebBrowser
-CNsIWebBrowser::~CNsIWebBrowser()
-{
-
-}
-
-void CNsIWebBrowser::WBAddListener(PRInt16 displayMode)
-{
-	// AddWebBrowserListener
-	nsWeakPtr weakling(
-        do_GetWeakReference(static_cast<nsIContextMenuListener*>(qaBrowserImpl)));
-    rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIContextMenuListener));
-	RvTestResult(rv, "AddWebBrowserListener(). nsIContextMenuListener test", displayMode);
-	RvTestResultDlg(rv, "AddWebBrowserListener(). nsIContextMenuListener test", true);
-}
-
-void CNsIWebBrowser::WBRemoveListener(PRInt16 displayMode)
-{
-	// RemoveWebBrowserListener
-	nsWeakPtr weakling(
-        do_GetWeakReference(static_cast<nsIContextMenuListener*>(qaBrowserImpl)));
-
-	rv = qaWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsIContextMenuListener));
-	RvTestResult(rv, "RemoveWebBrowserListener(). nsIContextMenuListener test", displayMode);
-	RvTestResultDlg(rv, "RemoveWebBrowserListener(). nsIContextMenuListener test");
-}
-
-void CNsIWebBrowser::WBGetContainerWindow(PRInt16 displayMode)
-{
-	// GetContainerWindow
-	nsCOMPtr<nsIWebBrowserChrome> qaWebBrowserChrome;
-	rv = qaWebBrowser->GetContainerWindow(getter_AddRefs(qaWebBrowserChrome));
-	RvTestResult(rv, "nsIWebBrowser::GetContainerWindow() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowser::GetContainerWindow() test");
-	if (!qaWebBrowserChrome)
-		QAOutput("Didn't get web browser chrome object.", displayMode);
-	else {
-		rv = qaWebBrowserChrome->ShowAsModal();
-		RvTestResult(rv, "nsIWebBrowserChrome::ShowAsModal() test", displayMode);
-		RvTestResultDlg(rv, "nsIWebBrowserChrome::ShowAsModal() test");
-	}
-}
-
-void CNsIWebBrowser::WBSetContainerWindow(PRInt16 displayMode)
-{
-	// SetContainerWindow
-
-	rv = qaWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(qaBrowserImpl));
-	RvTestResult(rv, "nsIWebBrowser::SetContainerWindow() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowser::SetContainerWindow() test");
-}
-
-void CNsIWebBrowser::WBGetURIContentListener(PRInt16 displayMode)
-{
-	// GetParentURIContentListener
-
-	rv = qaWebBrowser->GetParentURIContentListener(getter_AddRefs(qaURIContentListener));
-	RvTestResult(rv, "nsIWebBrowser::GetParentURIContentListener() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowser::GetParentURIContentListener() test");
-	if (!qaURIContentListener)
-		QAOutput("Didn't get uri content listener object.", displayMode);
-	else {
-		nsCOMPtr<nsISupports> qaSupports;
-		rv = qaURIContentListener->GetLoadCookie(getter_AddRefs(qaSupports));
-		RvTestResult(rv, "nsIURIContentListener::GetLoadCookie() test", displayMode);
-		RvTestResultDlg(rv, "nsIURIContentListener::GetLoadCookie() test");
-	}
-}
-
-void CNsIWebBrowser::WBSetURIContentListener(PRInt16 displayMode)
-{
-	// SetParentURIContentListener
-
-	rv = qaWebBrowser->SetParentURIContentListener(static_cast<nsIURIContentListener*>(qaBrowserImpl));
-	RvTestResult(rv, "nsIWebBrowser::SetParentURIContentListener() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowser::SetParentURIContentListener() test");
-}
-
-void CNsIWebBrowser::WBGetDOMWindow(PRInt16 displayMode)
-{
-	// GetContentDOMWindow
-	nsCOMPtr<nsIDOMWindow> qaDOMWindow;
-	rv = qaWebBrowser->GetContentDOMWindow(getter_AddRefs(qaDOMWindow));
-	RvTestResult(rv, "nsIWebBrowser::GetContentDOMWindow() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowser::GetContentDOMWindow() test");
-	if (!qaDOMWindow)
-		QAOutput("Didn't get dom window object.", displayMode);
-	else {
-		rv = qaDOMWindow->ScrollTo(50,50);
-		RvTestResult(rv, "nsIDOMWindow::ScrollTo() test", displayMode);
-		RvTestResultDlg(rv, "nsIDOMWindow::ScrollTo() test");
-	}
-}
-
-void CNsIWebBrowser::OnStartTests(UINT nMenuID)
-{
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSIWEBBROWSER_RUNALLTESTS :
-			RunAllTests();
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSER_ADDWEBBROWSERLISTENER :
-			WBAddListener(2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSER_REMOVEWEBBROWSERLISTENER :
-			WBRemoveListener(2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSER_GETCONTAINERWINDOW  :
-			WBGetContainerWindow(2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSER_SETCONTAINERWINDOW :
-			WBSetContainerWindow(2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSER_GETPARENTURICONTENTLISTENER :
-			WBGetURIContentListener(2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSER_SETPARENTURICONTENTLISTENER :
-			WBSetURIContentListener(2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSER_GETCONTENTDOMWINDOW  :
-			WBGetDOMWindow(2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSER_NSIWBSETUPSETPROPERTY  :
-			WBSSetupProperty(2);
-			break ;
-	}
-}
-
-void CNsIWebBrowser::RunAllTests()
-{
-	WBAddListener(1);
-	WBRemoveListener(1);
-	WBSetContainerWindow(1);
-	WBGetContainerWindow(1);
-	WBSetURIContentListener(1);
-	WBGetURIContentListener(1);
-	WBGetDOMWindow(1);
-	WBSSetupProperty(1);
-}
-
-void CNsIWebBrowser::WBSSetupProperty(PRInt16 displayMode)
-{
-	// nsIWebBrowserSetup methods
-
-	nsCOMPtr <nsIWebBrowserSetup> qaWBSetup(do_QueryInterface(qaWebBrowser, &rv));
-	RvTestResult(rv, "nsIWebBrowserSetup object test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup object test");
-
-	if (!qaWBSetup) {
-		QAOutput("Didn't get WebBrowser Setup object.", displayMode);
-		return;
-	}
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_ALLOW_PLUGINS, PR_TRUE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_PLUGINS, PR_TRUE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_PLUGINS, PR_TRUE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_ALLOW_PLUGINS, PR_FALSE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_PLUGINS, PR_FALSE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_PLUGINS, PR_FALSE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_ALLOW_JAVASCRIPT, PR_TRUE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_JAVASCRIPT, PR_TRUE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_JAVASCRIPT, PR_TRUE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_ALLOW_JAVASCRIPT, PR_FALSE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_JAVASCRIPT, PR_FALSE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_JAVASCRIPT, PR_FALSE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_ALLOW_META_REDIRECTS, PR_TRUE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_META_REDIRECTS, PR_TRUE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_META_REDIRECTS, PR_TRUE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_ALLOW_META_REDIRECTS, PR_FALSE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_META_REDIRECTS, PR_FALSE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_META_REDIRECTS, PR_FALSE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_ALLOW_SUBFRAMES, PR_TRUE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_SUBFRAMES, PR_TRUE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_SUBFRAMES, PR_TRUE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_ALLOW_SUBFRAMES, PR_FALSE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_SUBFRAMES, PR_FALSE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_SUBFRAMES, PR_FALSE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_ALLOW_IMAGES, PR_TRUE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_IMAGES, PR_TRUE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_IMAGES, PR_TRUE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_ALLOW_IMAGES, PR_FALSE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_IMAGES, PR_FALSE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_ALLOW_IMAGES, PR_FALSE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_FOCUS_DOC_BEFORE_CONTENT, PR_TRUE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_FOCUS_DOC_BEFORE_CONTENT, PR_TRUE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_FOCUS_DOC_BEFORE_CONTENT, PR_TRUE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_FOCUS_DOC_BEFORE_CONTENT, PR_FALSE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_FOCUS_DOC_BEFORE_CONTENT, PR_FALSE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_FOCUS_DOC_BEFORE_CONTENT, PR_FALSE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_USE_GLOBAL_HISTORY, PR_TRUE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_USE_GLOBAL_HISTORY, PR_TRUE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_USE_GLOBAL_HISTORY, PR_TRUE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_USE_GLOBAL_HISTORY, PR_FALSE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_USE_GLOBAL_HISTORY, PR_FALSE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_USE_GLOBAL_HISTORY, PR_FALSE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_IS_CHROME_WRAPPER, PR_TRUE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_IS_CHROME_WRAPPER, PR_TRUE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_IS_CHROME_WRAPPER, PR_TRUE)");
-
-	rv = qaWBSetup->SetProperty(nsIWebBrowserSetup::SETUP_IS_CHROME_WRAPPER, PR_FALSE);
-	RvTestResult(rv, "nsIWebBrowserSetup:SetProperty(SETUP_IS_CHROME_WRAPPER, PR_FALSE)", 1);
-	RvTestResultDlg(rv, "nsIWebBrowserSetup:SetProperty(SETUP_IS_CHROME_WRAPPER, PR_FALSE)");
-}
\ No newline at end of file
diff --git a/embedding/qa/testembed/nsIWebBrow.h b/embedding/qa/testembed/nsIWebBrow.h
deleted file mode 100644
index aaff7d62d7d..00000000000
--- a/embedding/qa/testembed/nsIWebBrow.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// nsIWebBrow.h : header file for nsIWebBrowser test cases
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _NSIWEBBROW_H
-#define _NSIWEBBROW_H
-
-#if _MSC_VER > 1000
-	#pragma once
-#endif
-
-#include "BrowserView.h"
-#include "BrowserImpl.h"
-#include "StdAfx.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CTESTS class
-
-class CBrowserImpl;
-
-class CNsIWebBrowser
-{
-public:
-	CNsIWebBrowser(nsIWebBrowser *mWebBrowser,
-				   CBrowserImpl *mpBrowserImpl);
-	virtual ~CNsIWebBrowser();
-
-	// Mozilla interfaces
-	//
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser;
-	CBrowserImpl	*qaBrowserImpl;
-
-	// local test methods for nsIWebBrowser
-	void WBAddListener(PRInt16);
-	void WBRemoveListener(PRInt16);
-	void WBGetContainerWindow(PRInt16);
-	void WBSetContainerWindow(PRInt16);
-	void WBGetURIContentListener(PRInt16);
-	void WBSetURIContentListener(PRInt16);
-	void WBGetDOMWindow(PRInt16);
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests();
-
-	// local test methods for nsIWebBrowserSetup
-	void WBSSetupProperty(PRInt16);
-
-	// local test variables
-
-	// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CTests)
-	public:
-	//}}AFX_VIRTUAL
-
-private:
-	// Individual interface Objects
-	nsCOMPtr<nsIWebBrowserChrome> qaWebBrowserChrome;
-	nsCOMPtr<nsIURIContentListener> qaURIContentListener;
-	// Generated message map functions
-protected:
-	//{{AFX_MSG(CTests)
-
-	//}}AFX_MSG
-};
-
-#endif //_NSIWEBBROW_H
diff --git a/embedding/qa/testembed/nsIWebBrowFind.cpp b/embedding/qa/testembed/nsIWebBrowFind.cpp
deleted file mode 100644
index 50b171bec4d..00000000000
--- a/embedding/qa/testembed/nsIWebBrowFind.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//
-// test cases for nsIWebBrowserFind
-//
-
-#include "Stdafx.h"
-#include "TestEmbed.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "Tests.h"
-#include "domwindow.h"
-#include "QaUtils.h"
-#include <stdio.h>
-#include "nsIWebBrowFind.h"
-#include "UrlDialog.h"
-#include "QaFindDlg.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-// constructor for CNsIWebBrowFind
-CNsIWebBrowFind::CNsIWebBrowFind(nsIWebBrowser *mWebBrowser, CBrowserImpl *mpBrowserImpl)
-{
-	qaWebBrowser = mWebBrowser;
-	qaBrowserImpl = mpBrowserImpl;
-}
-
-// destructor for CNsIWebBrowFind
-CNsIWebBrowFind::~CNsIWebBrowFind()
-{
-
-}
-
-	// get webBrowserFind object
-nsIWebBrowserFind * CNsIWebBrowFind::GetWebBrowFindObject()
-{
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind(do_GetInterface(qaWebBrowser, &rv));
-	if (!qaWBFind) {
-		QAOutput("Didn't get WebBrowserFind object.", 2);
-		return NULL;
-	}
-	else {
-		RvTestResult(rv, "nsIWebBrowserFind object test", 1);
-		RvTestResultDlg(rv, "nsIWebBrowserFind object test");
-		return(qaWBFind);
-	}
-}
-
-void CNsIWebBrowFind::SetSearchStringTest(PRInt16 displayMode)
-{
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-
-	nsString searchString;
-	if (myDialog.DoModal() == IDOK) {
-
-		// SetSearchString()
-		searchString.AssignWithConversion(myDialog.m_textfield);
-		rv = qaWBFind->SetSearchString(searchString.get());
-	}
-	RvTestResult(rv, "nsIWebBrowserFind::SetSearchString() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::SetSearchString test");
-}
-
-void CNsIWebBrowFind::GetSearchStringTest(PRInt16 displayMode)
-{
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-
-	// GetSearchString()
-	nsXPIDLString stringBuf;
-	CString csSearchStr;
-	rv = qaWBFind->GetSearchString(getter_Copies(stringBuf));
-	RvTestResult(rv, "nsIWebBrowserFind::GetSearchString() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::GetSearchString() test");
-	csSearchStr = stringBuf.get();
-	FormatAndPrintOutput("The searched string = ", csSearchStr, displayMode);
-}
-
-void CNsIWebBrowFind::FindNextTest(PRBool didFind, PRInt16 displayMode)
-{
-	// FindNext()
-
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-
-	rv = qaWBFind->FindNext(&didFind);
-	RvTestResult(rv, "nsIWebBrowserFind::FindNext() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::FindNext() test");
-	FormatAndPrintOutput("returned didFind = ", didFind, displayMode);
-}
-
-void CNsIWebBrowFind::SetFindBackwardsTest(PRBool didFindBackwards, PRInt16 displayMode)
-{
-	// SetFindBackwards()
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-	
-	rv = qaWBFind->SetFindBackwards(didFindBackwards);
-	RvTestResult(rv, "nsIWebBrowserFind::SetFindBackwards() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::SetFindBackwards() test", displayMode);
-}
-
-void CNsIWebBrowFind::GetFindBackwardsTest(PRBool didFindBackwards, PRInt16 displayMode)
-{
-	// GetFindBackwards()
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-	
-	rv = qaWBFind->GetFindBackwards(&didFindBackwards);
-	RvTestResult(rv, "nsIWebBrowserFind::GetFindBackwards() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::GetFindBackwards() test");
-	FormatAndPrintOutput("returned didFindBackwards = ", didFindBackwards, displayMode);
-}
-
-void CNsIWebBrowFind::SetWrapFindTest(PRBool didWrapFind, PRInt16 displayMode)
-{
-	// SetWrapFind()
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-	
-	rv = qaWBFind->SetWrapFind(didWrapFind);
-	RvTestResult(rv, "nsIWebBrowserFind::SetWrapFind() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::SetWrapFind() test");
-}
-
-void CNsIWebBrowFind::GetWrapFindTest(PRBool didWrapFind, PRInt16 displayMode)
-{
-	// GetWrapFind()
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-	
-	rv = qaWBFind->GetWrapFind(&didWrapFind);
-	RvTestResult(rv, "nsIWebBrowserFind::GetWrapFind() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::GetWrapFind() test");
-	FormatAndPrintOutput("returned didWrapFind = ", didWrapFind, displayMode);
-}
-
-void CNsIWebBrowFind::SetEntireWordTest(PRBool didEntireWord, PRInt16 displayMode)
-{
-	// SetEntireWord()
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-	
-	rv = qaWBFind->SetEntireWord(didEntireWord);
-	RvTestResult(rv, "nsIWebBrowserFind::SetEntireWord() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::SetEntireWord() test");
-}
-
-void CNsIWebBrowFind::GetEntireWordTest(PRBool didEntireWord, PRInt16 displayMode)
-{
-	// GetEntireWord()
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-	
-	rv = qaWBFind->GetEntireWord(&didEntireWord);
-	RvTestResult(rv, "nsIWebBrowserFind::GetEntireWord() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::GetEntireWord() test");
-	FormatAndPrintOutput("returned didEntireWord = ", didEntireWord, displayMode);
-}
-
-void CNsIWebBrowFind::SetMatchCase(PRBool didMatchCase, PRInt16 displayMode)
-{
-	// SetMatchCase()
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-	
-	rv = qaWBFind->SetMatchCase(didMatchCase);
-	RvTestResult(rv, "nsIWebBrowserFind::SetMatchCase() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::SetMatchCase() test");
-}
-
-void CNsIWebBrowFind::GetMatchCase(PRBool didMatchCase, PRInt16 displayMode)
-{
-	// GetMatchCase()
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-	
-	rv = qaWBFind->GetMatchCase(&didMatchCase);
-	RvTestResult(rv, "nsIWebBrowserFind::GetMatchCase() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::GetMatchCase() test");
-	FormatAndPrintOutput("returned didMatchCase = ", didMatchCase, displayMode);
-}
-
-void CNsIWebBrowFind::SetSearchFrames(PRBool didSearchFrames, PRInt16 displayMode)
-{
-	// SetSearchFrames()
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-	
-	rv = qaWBFind->SetSearchFrames(didSearchFrames);
-	RvTestResult(rv, "nsIWebBrowserFind::SetSearchFrames() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::SetSearchFrames() test");
-}
-
-void CNsIWebBrowFind::GetSearchFrames(PRBool didSearchFrames, PRInt16 displayMode)
-{
-	// GetSearchFrames()
-	nsCOMPtr<nsIWebBrowserFind> qaWBFind;
-	qaWBFind = GetWebBrowFindObject();
-	
-	rv = qaWBFind->GetSearchFrames(&didSearchFrames);
-	RvTestResult(rv, "nsIWebBrowserFind::GetSearchFrames() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebBrowserFind::GetSearchFrames() test");
-	FormatAndPrintOutput("returned didSearchFrames = ", didSearchFrames, displayMode);
-}
-
-void CNsIWebBrowFind::OnStartTests(UINT nMenuID)
-{
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSIWEBBROWSERFIND_RUNALLTESTS :
-			RunAllTests();
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_SETSEARCHSTRINGTEST :
-			SetSearchStringTest(2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_GETSEARCHSTRINGTEST :
-			GetSearchStringTest(2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_FINDNEXTTEST  :
-			FindNextTest(PR_TRUE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_SETFINDBACKWARDSTEST :
-			SetFindBackwardsTest(PR_TRUE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_GETFINDBACKWARDSTEST :
-			GetFindBackwardsTest(PR_TRUE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_SETWRAPFINDTEST :
-			SetWrapFindTest(PR_TRUE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_GETWRAPFINDTEST  :
-			GetWrapFindTest(PR_TRUE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_SETENTIREWORDTEST  :
-			SetEntireWordTest(PR_TRUE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_GETENTIREWORDTEST :
-			GetEntireWordTest(PR_TRUE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_SETMATCHCASE :
-			SetMatchCase(PR_TRUE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_GETMATCHCASE :
-			GetMatchCase(PR_TRUE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_SETSEARCHFRAMES  :
-			SetSearchFrames(PR_TRUE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBBROWSERFIND_GETSEARCHFRAMES  :
-			GetSearchFrames(PR_TRUE, 2);
-			break ;
-	}
-}
-
-void CNsIWebBrowFind::RunAllTests()
-{
-	QAOutput("Begin WebBrowserFind tests.", 1);
-	GetWebBrowFindObject();
-	SetSearchStringTest(1);
-	GetSearchStringTest(1);
-	FindNextTest(PR_TRUE, 1);
-	FindNextTest(PR_TRUE, 1);  // run a 2nd time to advance it
-	SetFindBackwardsTest(PR_TRUE, 1);
-	GetFindBackwardsTest(PR_TRUE, 1);
-	FindNextTest(PR_TRUE, 1);	// to find backwards
-	SetWrapFindTest(PR_TRUE, 1);
-	GetWrapFindTest(PR_TRUE, 1);
-	FindNextTest(PR_TRUE, 1);  // to wrap around
-	SetEntireWordTest(PR_TRUE, 1);
-	GetEntireWordTest(PR_TRUE, 1);
-	FindNextTest(PR_TRUE, 1);  // entire word
-	SetMatchCase(PR_TRUE, 1);
-	GetMatchCase(PR_TRUE, 1);
-	FindNextTest(PR_TRUE, 1);  // match case
-	SetSearchFrames(PR_TRUE, 1);
-	GetSearchFrames(PR_TRUE, 1);
-	FindNextTest(PR_TRUE, 1);  // frames
-
-	QAOutput("PR_FALSE tests", 1);
-	SetFindBackwardsTest(PR_FALSE, 1);
-	GetFindBackwardsTest(PR_FALSE, 1);
-	FindNextTest(PR_FALSE, 1);		// shouldn't find backwards
-	SetWrapFindTest(PR_FALSE, 1);
-	GetWrapFindTest(PR_FALSE, 1);
-	FindNextTest(PR_FALSE, 1);		// shouldn't find wrap around
-	SetEntireWordTest(PR_FALSE, 1);
-	GetEntireWordTest(PR_FALSE, 1);
-	FindNextTest(PR_FALSE, 1);		// shouldn't find entire word
-	SetMatchCase(PR_FALSE, 1);
-	GetMatchCase(PR_FALSE, 1);
-	FindNextTest(PR_FALSE, 1);		// shouldn't find case
-	SetSearchFrames(PR_FALSE, 1);
-	GetSearchFrames(PR_FALSE, 1);
-	FindNextTest(PR_FALSE, 1);		// shouldn't find frame
-	QAOutput("End WebBrowserFind tests.", 1);
-}
\ No newline at end of file
diff --git a/embedding/qa/testembed/nsIWebBrowFind.h b/embedding/qa/testembed/nsIWebBrowFind.h
deleted file mode 100644
index d93b3ecbc79..00000000000
--- a/embedding/qa/testembed/nsIWebBrowFind.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// nsIWebBrowFind.h : header file for nsIWebBrowserFind test cases
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _NSIWEBBROWFIND_H
-#define _NSIWEBBROWFIND_H
-
-#if _MSC_VER > 1000
-	#pragma once
-#endif
-
-#include "BrowserView.h"
-#include "BrowserImpl.h"
-#include "StdAfx.h"
-#include "UrlDialog.h"
-#include "QaFindDlg.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CTESTS class
-
-class CBrowserImpl;
-class CUrlDialog;
-
-class CNsIWebBrowFind
-{
-public:
-	CNsIWebBrowFind(nsIWebBrowser *mWebBrowser,
-				   CBrowserImpl *mpBrowserImpl);
-	virtual ~CNsIWebBrowFind();
-
-	// Mozilla interfaces
-	//
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser;
-	CBrowserImpl	*qaBrowserImpl;
-
-	// local test methods for nsIWebBrowser
-	nsIWebBrowserFind * GetWebBrowFindObject();
-	void SetSearchStringTest(PRInt16);
-	void GetSearchStringTest(PRInt16);
-	void FindNextTest(PRBool, PRInt16);
-	void SetFindBackwardsTest(PRBool, PRInt16);
-	void GetFindBackwardsTest(PRBool, PRInt16);
-	void SetWrapFindTest(PRBool, PRInt16);
-	void GetWrapFindTest(PRBool, PRInt16);
-	void SetEntireWordTest(PRBool, PRInt16);
-	void GetEntireWordTest(PRBool, PRInt16);
-	void SetMatchCase(PRBool, PRInt16);
-	void GetMatchCase(PRBool, PRInt16);
-	void SetSearchFrames(PRBool, PRInt16);
-	void GetSearchFrames(PRBool, PRInt16);
-
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests();
-
-	// local test variables
-
-	// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CTests)
-	public:
-	//}}AFX_VIRTUAL
-
-private:
-	// Individual interface Objects
-
-	CQaFindDlg myDialog;
-
-protected:
-	//{{AFX_MSG(CTests)
-
-	//}}AFX_MSG
-};
-
-#endif //_NSIWEBBROWFIND_H
diff --git a/embedding/qa/testembed/nsIWebNav.cpp b/embedding/qa/testembed/nsIWebNav.cpp
deleted file mode 100644
index 39becef5874..00000000000
--- a/embedding/qa/testembed/nsIWebNav.cpp
+++ /dev/null
@@ -1,505 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// Test cases for the nsiWebNavigation Interface
-
-
-
-#include "stdafx.h"
-#include "testembed.h"
-#include "qautils.h"
-#include "nsiwebnav.h"
-#include "UrlDialog.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIWebNav 
-
-CNsIWebNav::CNsIWebNav(nsIWebNavigation *mWebNav)
-{
-	qaWebNav = mWebNav ;
-}
-
-CNsIWebNav::~CNsIWebNav()
-{
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIWebNav message handlers
-// ***********************************************************************
-// nsIWebNavigation iface
-// ***********************************************************************
-
-// Url table for web navigation
-NavElement UrlTable[] = {
-   {"http://www.intel.com/", nsIWebNavigation::LOAD_FLAGS_NONE},
-   {"http://www.yahoo.com/", nsIWebNavigation::LOAD_FLAGS_MASK},
-   {"http://www.oracle.com/", nsIWebNavigation::LOAD_FLAGS_IS_LINK},
-   {"http://www.sun.com/", nsIWebNavigation::LOAD_FLAGS_IS_REFRESH},
-   {"ftp://ftp.netscape.com", nsIWebNavigation::LOAD_FLAGS_BYPASS_HISTORY},
-   {"ftp://ftp.mozilla.org/", nsIWebNavigation::LOAD_FLAGS_REPLACE_HISTORY},
-   {"https://www.motorola.com/", nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE},
-   {"https://www.amazon.com", nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY},
-   {"about:plugins", nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE},
-   {"javascript: document.write('Test!')", nsIWebNavigation::LOAD_FLAGS_NONE},
-   {"file://C|/Program Files", nsIWebNavigation::LOAD_FLAGS_NONE}
-};
-
-
-void CNsIWebNav::OnStartTests(UINT nMenuID)
-{
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSIWEBNAV_RUNALLTESTS :
-			RunAllTests();
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_GETCANGOBACK :
-		    CanGoBackTest(2);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_GETCANGOFORWARD :
-			CanGoForwardTest(2);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_GOBACK  :
-			GoBackTest(2);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_GOFORWARD :
-			GoForwardTest(2);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_GOTOINDEX :
-			GoToIndexTest(2);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_LOADURI :
-			LoadURITest(nsnull, nsnull, 2, PR_FALSE);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_RELOAD  :
-			ReloadTest(nsIWebNavigation::LOAD_FLAGS_NONE, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_STOP    :
-			StopURITest("file://C|/Program Files",
-						 nsIWebNavigation::STOP_CONTENT, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_GETDOCUMENT :
-			GetDocumentTest(2);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_GETCURRENTURI :
-			GetCurrentURITest(2);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_GETREFERRINGURI:
-			GetReferringURITest(2);
-			break;
-		case ID_INTERFACES_NSIWEBNAV_GETSESSIONHISTORY :
-			GetSHTest(2);
-			break ;
-		case ID_INTERFACES_NSIWEBNAV_SETSESSIONHISTORY :
-			SetSHTest(2);
-			break ;
-	}
-}
-
-void CNsIWebNav::RunAllTests()
-{
-   int i=0;
-
-   if (qaWebNav)
-	   QAOutput("We have the web nav object.", 1);
-   else {
-	   QAOutput("We don't have the web nav object. No tests performed.", 2);
-	   return;
-   }
-
-   // load a couple of URLs to get things going
-	LoadURITest("http://www.cisco.com", nsIWebNavigation::LOAD_FLAGS_NONE, 2, PR_TRUE);
-	LoadURITest("www.google.com", nsIWebNavigation::LOAD_FLAGS_NONE, 2, PR_TRUE);
-	
-   // canGoBack attribute test
-   CanGoBackTest(1);
-
-   // GoBack test
-   GoBackTest(2);
-
-   // canGoForward attribute test
-   CanGoForwardTest(1);
-
-   // GoForward test
-   GoForwardTest(2);
-
-   // GotoIndex test
-   GoToIndexTest(2);
-
-   // LoadURI() & reload tests
-
-   QAOutput("Run a few LoadURI() tests.", 1);
-
- 	
-   LoadUriandReload(11);
-
- 
-	// Stop() tests
-   StopURITest("http://www.microsoft.com", nsIWebNavigation::STOP_ALL, 1);
-   StopURITest("https://www.microsoft.com/", nsIWebNavigation::STOP_NETWORK, 1);
-   StopURITest("ftp://ftp.microsoft.com/", nsIWebNavigation::STOP_CONTENT, 1);
-
-   // document test
-   GetDocumentTest(1);
-   
-   // uri test
-   GetCurrentURITest(1);
-   GetReferringURITest(1);
-
-   // session history test
-   SetSHTest(1);
-   GetSHTest(1);
-}
-
-void CNsIWebNav::LoadUriandReload(int URItotal)
-{
-   int i=0, j=0;
-   // LoadURI() & reload tests
-
-   QAOutput("Run a few LoadURI() and Reload() tests.", 1);
-
-   for (j=0; j < 9; j++) 
-   {
-	   for (i=0; i < URItotal; i++)
-	   {
-		   LoadURITest(UrlTable[i].theURI, UrlTable[j].theFlag, 2, PR_TRUE);
-		   switch (i)
-		   {
-		   case 0:
-			   ReloadTest(nsIWebNavigation::LOAD_FLAGS_NONE, 1);
-			   break;
-		   case 1:
-			   ReloadTest(nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE, 1);
-			   break;
-		   case 2:
-			   ReloadTest(nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY, 1);
-			   break;
-		   // simulate shift-reload
-		   case 3:
-			   ReloadTest(nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE |
-						  nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY, 1);
-			   break;
-		   case 4:
-			   ReloadTest(nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE, 1);
-			   break;
-		   case 5:
-			   ReloadTest(nsIWebNavigation::LOAD_FLAGS_NONE, 1);
-			   break;
-		   } 
-	   }
-   }
-}
-
-// ***********************************************************************
-// Individual nsIWebNavigation tests
-
-
-void CNsIWebNav::CanGoBackTest(PRInt16 displayMode)
-{
-   PRBool canGoBack = PR_FALSE;
-   rv =  qaWebNav->GetCanGoBack(&canGoBack);
-   RvTestResult(rv, "GetCanGoBack() attribute test", displayMode);
-   FormatAndPrintOutput("canGoBack value = ", canGoBack, displayMode);
-}
-
-void CNsIWebNav::GoBackTest(PRInt16 displayMode)
-{
-   rv =  qaWebNav->GoBack();
-   RvTestResult(rv, "GoBack() test", displayMode);
-}
-
-void CNsIWebNav::CanGoForwardTest(PRInt16 displayMode)
-{
-   PRBool canGoForward = PR_FALSE;
-   rv =  qaWebNav->GetCanGoForward(&canGoForward);
-   RvTestResult(rv, "GetCanGoForward() attribute test", displayMode);
-   FormatAndPrintOutput("canGoForward value = ", canGoForward, displayMode); 
-}
-
-void CNsIWebNav::GoForwardTest(PRInt16 displayMode)
-{
-   rv =  qaWebNav->GoForward();
-   RvTestResult(rv, "GoForward() test", displayMode);
-}
-
-void CNsIWebNav::GoToIndexTest(PRInt16 displayMode)
-{
-   PRInt32 theIndex = 0;
-
-   rv =  qaWebNav->GotoIndex(theIndex);
-   RvTestResult(rv, "GotoIndex() test", displayMode);
-}
-
-void CNsIWebNav::LoadURITest(char *theUrl, PRUint32 theFlag,
-							 PRInt16 displayMode, PRBool runAllTests)
-{
-   char theTotalString[500];
-   char theFlagName[200];
-
-   if (runAllTests == PR_FALSE)	// load just one url from Url dialog
-   {
-	  CUrlDialog myDialog;
-      if (myDialog.DoModal() == IDOK)
-	  {
-		QAOutput("Begin Change URL test.", 1);
-		rv = qaWebNav->LoadURI(NS_ConvertASCIItoUTF16(myDialog.m_urlfield).get(),
-								myDialog.m_flagvalue, nsnull,nsnull, nsnull);
-
-	    RvTestResult(rv, "rv LoadURI() test", 1);
-		FormatAndPrintOutput("The url = ", myDialog.m_urlfield, displayMode);
-		FormatAndPrintOutput("The flag = ", myDialog.m_flagvalue, displayMode);
-		QAOutput("End Change URL test.", 1);
-	  }
-	  return;
-   }
-
-   switch(theFlag)
-   {
-   case nsIWebNavigation::LOAD_FLAGS_NONE:
-	   strcpy(theFlagName, "LOAD_FLAGS_NONE");
-	   break;
-   case nsIWebNavigation::LOAD_FLAGS_MASK:
-	   strcpy(theFlagName, "LOAD_FLAGS_MASK");
-	   break;
-   case nsIWebNavigation::LOAD_FLAGS_IS_REFRESH:
-	   strcpy(theFlagName, "LOAD_FLAGS_IS_REFRESH");
-	   break;
-   case nsIWebNavigation::LOAD_FLAGS_IS_LINK:
-	   strcpy(theFlagName, "LOAD_FLAGS_IS_LINK");
-	   break;
-   case nsIWebNavigation::LOAD_FLAGS_BYPASS_HISTORY:
-	   strcpy(theFlagName, "LOAD_FLAGS_BYPASS_HISTORY");
-	   break;
-   case nsIWebNavigation::LOAD_FLAGS_REPLACE_HISTORY:
-	   strcpy(theFlagName, "LOAD_FLAGS_REPLACE_HISTORY");
-	   break;
-   case nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE:
-	   strcpy(theFlagName, "LOAD_FLAGS_BYPASS_CACHE");
-	   break;
-   case nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY:
-	   strcpy(theFlagName, "LOAD_FLAGS_BYPASS_PROXY");
-	   break;
-   case nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE:
-	   strcpy(theFlagName, "LOAD_FLAGS_CHARSET_CHANGE");
-	   break;
-   }
-
-   rv = qaWebNav->LoadURI(NS_ConvertASCIItoUTF16(theUrl).get(), 
-                          theFlag,
-                          nsnull,
-                          nsnull,
-                          nsnull);
-   sprintf(theTotalString, "%s%s%s%s%s", "LoadURI(): ", theUrl, " w/ ", theFlagName, " test");
-   RvTestResult(rv, theTotalString, displayMode);
-}
-
-void CNsIWebNav::ReloadTest(PRUint32 theFlag, PRInt16 displayMode)
-{
-   char theTotalString[500];
-   char theFlagName[200];
-
-  switch(theFlag)
-  {
-  case nsIWebNavigation::LOAD_FLAGS_NONE:
-      strcpy(theFlagName, "LOAD_FLAGS_NONE");
-      break;
-  case nsIWebNavigation::LOAD_FLAGS_MASK:
-      strcpy(theFlagName, "LOAD_FLAGS_MASK");
-      break;
-  case nsIWebNavigation::LOAD_FLAGS_IS_REFRESH:
-      strcpy(theFlagName, "LOAD_FLAGS_IS_REFRESH");
-      break;
-  case nsIWebNavigation::LOAD_FLAGS_IS_LINK:
-      strcpy(theFlagName, "LOAD_FLAGS_IS_LINK");
-      break;
-  case nsIWebNavigation::LOAD_FLAGS_BYPASS_HISTORY:
-      strcpy(theFlagName, "LOAD_FLAGS_BYPASS_HISTORY");
-      break;
-  case nsIWebNavigation::LOAD_FLAGS_REPLACE_HISTORY:
-      strcpy(theFlagName, "LOAD_FLAGS_REPLACE_HISTORY");
-      break;
-  case nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE:
-      strcpy(theFlagName, "LOAD_FLAGS_BYPASS_CACHE");
-      break;
-  case nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY:
-      strcpy(theFlagName, "LOAD_FLAGS_BYPASS_PROXY");
-      break;
-  case nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE:
-      strcpy(theFlagName, "LOAD_FLAGS_CHARSET_CHANGE");
-      break;
-  case nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE | nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY:
-      strcpy(theFlagName, "cache & proxy");
-      break;
-  } 
-
-   rv =  qaWebNav->Reload(theFlag);
-   sprintf(theTotalString, "%s%s%s%s", "Reload(): ", " w/ ", theFlagName, " test");
-   RvTestResult(rv, theTotalString, displayMode);
-}
-
-void CNsIWebNav::StopURITest(char *theUrl, PRUint32 theFlag,
-							 PRInt16 displayMode)
-{
-   char theTotalString[200];
-   char flagString[100];
-
-   if (theFlag == nsIWebNavigation::STOP_ALL)
-	   strcpy(flagString, "STOP_ALL");
-   else if (theFlag == nsIWebNavigation::STOP_NETWORK)
-	   strcpy(flagString, "STOP_NETWORK");
-   else
-	   strcpy(flagString, "STOP_CONTENT");
-
-   qaWebNav->LoadURI(NS_ConvertASCIItoUTF16(theUrl).get(), 
-                     nsIWebNavigation::LOAD_FLAGS_NONE,
-                     nsnull,
-                     nsnull,
-                     nsnull);
-
-   rv = qaWebNav->Stop(theFlag);
-   sprintf(theTotalString, "%s%s%s%s", "Stop(): ", theUrl, " test: ", flagString);
-   RvTestResult(rv, theTotalString, displayMode);
-}
-
-void CNsIWebNav::GetDocumentTest(PRInt16 displayMode)
-{
-   nsCOMPtr<nsIDOMDocument> theDocument;
-   nsCOMPtr<nsIDOMDocumentType> theDocType;
-   
-   rv =  qaWebNav->GetDocument(getter_AddRefs(theDocument));
-   if (!theDocument) {
-	  QAOutput("We didn't get the document. Test failed.", 2);
-	  return;
-   }
-   else
-	  RvTestResult(rv, "GetDocument() test", displayMode);
-
-   rv = theDocument->GetDoctype(getter_AddRefs(theDocType));
-   RvTestResult(rv, "nsIDOMDocument::GetDoctype() for nsIWebNav test", displayMode);
-}
-
-void CNsIWebNav::GetCurrentURITest(PRInt16 displayMode)
-{
-   nsCOMPtr<nsIURI> theURI;
-
-   rv =  qaWebNav->GetCurrentURI(getter_AddRefs(theURI));
-   if (!theURI) {
-      QAOutput("We didn't get the URI. Test failed.", 2);
-	  return;
-   }
-   else
-	  RvTestResult(rv, "GetCurrentURI() test", displayMode);
-
-   nsCAutoString uriString;
-   rv = theURI->GetSpec(uriString);
-   RvTestResult(rv, "nsIURI::GetSpec() for nsIWebNav test", 1);
-
-   FormatAndPrintOutput("the nsIWebNav uri = ", uriString, displayMode);
-}
-
-void CNsIWebNav::GetReferringURITest(PRInt16 displayMode)
-{
-   nsCOMPtr<nsIURI> theURI;
-   nsCAutoString uriString;
-   CUrlDialog myDialog;
-   if (myDialog.DoModal() == IDOK)
-   {
-	  uriString = myDialog.m_urlfield;
-	  rv = NS_NewURI(getter_AddRefs(theURI), uriString);
-	  if (theURI)
-		 QAOutput("We GOT the URI.", 1);
-	  else
-		 QAOutput("We DIDN'T GET the URI.", 1);
-	  rv = qaWebNav->GetReferringURI(getter_AddRefs(theURI));
-	  RvTestResult(rv, "GetReferringURI() test", displayMode);
-//	  rv = qaWebNav->LoadURI(NS_ConvertASCIItoUTF16(myDialog.m_urlfield).get(),
-//								myDialog.m_flagvalue, theURI, nsnull, nsnull);
-   }
-   if (!theURI) {
-      QAOutput("We didn't get the URI. Test failed.", 2);
-	  return;
-   }
-
-   rv = theURI->GetSpec(uriString);
-   RvTestResult(rv, "nsIURI::GetSpec() for nsIWebNav test", 1);
-
-   FormatAndPrintOutput("the nsIWebNav uri = ", uriString, displayMode);
-}
-
-void CNsIWebNav::GetSHTest(PRInt16 displayMode)
-{
-   PRInt32 numOfElements;
-
-   nsCOMPtr<nsISHistory> theSessionHistory;
-   rv =  qaWebNav->GetSessionHistory(getter_AddRefs(theSessionHistory));
-   if (!theSessionHistory) {
-      QAOutput("We didn't get the session history. Test failed.", 2);
-	  return;
-   }
-   else
-	  RvTestResult(rv, "GetSessionHistory() test", displayMode);
-
-   rv = theSessionHistory->GetCount(&numOfElements);
-   RvTestResult(rv, "nsISHistory::GetCount() for nsIWebNav test", 1);
- 
-   FormatAndPrintOutput("the sHist entry count = ", numOfElements, displayMode);
-}
-
-void CNsIWebNav::SetSHTest(PRInt16 displayMode)
-{
-   nsCOMPtr<nsISHistory> theSessionHistory, tempSHObject;
-   // we want to save the existing session history
-   rv =  qaWebNav->GetSessionHistory(getter_AddRefs(theSessionHistory));
-   // this will create the test session history object
-   tempSHObject = do_CreateInstance(NS_SHISTORY_CONTRACTID);
-   rv = qaWebNav->SetSessionHistory(tempSHObject);
-   RvTestResult(rv, "SetSessionHistory() test", displayMode);
-   if (!tempSHObject)
-      QAOutput("We didn't get the session history test object. Test failed.", 2);
-	// we now reset the previous session history
-   rv =  qaWebNav->SetSessionHistory(theSessionHistory);
-}
diff --git a/embedding/qa/testembed/nsIWebNav.h b/embedding/qa/testembed/nsIWebNav.h
deleted file mode 100644
index 4c2ee330808..00000000000
--- a/embedding/qa/testembed/nsIWebNav.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// 
-// Header file for nsiWebNavigation interface test cases
-
-
-#if !defined(AFX_NSIWEBNAV_H__4E002235_7569_11D5_89E7_00010316305A__INCLUDED_)
-#define AFX_NSIWEBNAV_H__4E002235_7569_11D5_89E7_00010316305A__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIWebNav window
-
-class CNsIWebNav 
-{
-// Construction
-public:
-	CNsIWebNav(nsIWebNavigation *mWebNav);
-
-// Attributes
-public:
-	nsCOMPtr<nsIWebNavigation> qaWebNav;
-// Operations
-public:
-
-	// individual nsIWebNavigation tests
-	void CanGoBackTest(PRInt16);
-	void GoBackTest(PRInt16);
-	void CanGoForwardTest(PRInt16);
-	void GoForwardTest(PRInt16);
-	void GoToIndexTest(PRInt16);
-	void LoadURITest(char *, PRUint32, PRInt16 displayMode=1, 
-					 PRBool runAllTests=PR_FALSE);
-	void ReloadTest(PRUint32, PRInt16);
-	void StopURITest(char *, PRUint32, PRInt16);
-	void GetDocumentTest(PRInt16);
-	void GetCurrentURITest(PRInt16);
-	void GetReferringURITest(PRInt16);
-	void GetSHTest(PRInt16);
-	void SetSHTest(PRInt16);
-	void LoadUriandReload(int);
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests();
-
-
-// Implementation
-public:
-	virtual ~CNsIWebNav();
-
-	// Generated message map functions
-protected:
-};
-
-typedef struct
-{
-  char			theURI[1024];
-  unsigned long theFlag;
-} NavElement;
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_NSIWEBNAV_H__4E002235_7569_11D5_89E7_00010316305A__INCLUDED_)
diff --git a/embedding/qa/testembed/nsIWebProg.cpp b/embedding/qa/testembed/nsIWebProg.cpp
deleted file mode 100644
index 1b1559bfa0c..00000000000
--- a/embedding/qa/testembed/nsIWebProg.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// nsiWebProg.cpp : implementation file
-//
-
-#include "Stdafx.h"
-#include "TestEmbed.h"
-#include "nsIWebProg.h"
-#include "Tests.h"
-#include "QaUtils.h"
-#include "BrowserFrm.h"
-#include "BrowserImpl.h"
-#include "BrowserView.h"
-#include "domwindow.h"
-#include "WebProgDlg.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CnsiWebProg
-
-// constructor for CnsiWebProg
-CnsiWebProg::CnsiWebProg(nsIWebBrowser *mWebBrowser, 
-						 CBrowserImpl *mpBrowserImpl)
-{
-	qaWebBrowser = mWebBrowser;
-	qaBrowserImpl = mpBrowserImpl;
-}
-
-// destructor for CnsiWebProg
-CnsiWebProg::~CnsiWebProg()
-{
-}
-
-	// nsIWebProgress test cases
-
-		// get webProg object
-nsIWebProgress * CnsiWebProg::GetWebProgObject()
-{
-	nsCOMPtr<nsIInterfaceRequestor> qaIReq(do_QueryInterface(qaWebBrowser));
-	nsCOMPtr<nsIWebProgress> qaWebProgress(do_GetInterface(qaIReq));
-
-	if (!qaWebProgress) {
-		QAOutput("Didn't get web progress object.", 2);
-		return NULL;
-	}
-	else {
-		QAOutput("We got web progress object.", 1);
-		return (qaWebProgress);
-	}
-}
-
-void CnsiWebProg::AddWebProgLstnr(PRUint32 theFlag, PRInt16 displayMode)
-{
-	nsCAutoString flagName(NS_LITERAL_CSTRING("xxxx"));
-
-	ConvertWPFlagToString(theFlag, flagName);
-
-			// addWebProgListener
-	qaWebProgress = GetWebProgObject();
-	nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(qaBrowserImpl));
-	rv = qaWebProgress->AddProgressListener(listener, theFlag);
-//	StoreWebProgFlag(theFlag);
-	RvTestResult(rv, "nsIWebProgress::AddProgressListener() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebProgress::AddProgressListener() test", true);
-	FormatAndPrintOutput("WebProgressListener flag = ", flagName, displayMode);
-}
-
-void CnsiWebProg::RemoveWebProgLstnr(PRInt16 displayMode)
-{
-		// removeWebProgListener
-	qaWebProgress = GetWebProgObject();
-	nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(qaBrowserImpl));
-	rv = qaWebProgress->RemoveProgressListener(listener);
-	RvTestResult(rv, "nsIWebProgress::RemoveProgressListener() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebProgress::RemoveProgressListener() test");
-}
-
-void CnsiWebProg::GetTheDOMWindow(PRInt16 displayMode)
-{
-		// getTheDOMWindow
-	qaWebProgress = GetWebProgObject();
-	nsCOMPtr<nsIDOMWindow> qaDOMWindow;
-	rv = qaWebProgress->GetDOMWindow(getter_AddRefs(qaDOMWindow));
-	RvTestResult(rv, "nsIWebProgress::GetDOMWindow() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebProgress::GetDOMWindow() test");
-	if (!qaDOMWindow)
-		QAOutput("Didn't get DOM Window object.", displayMode);
-}
-
-void CnsiWebProg::GetIsLoadingDocTest(PRInt16 displayMode)
-{
-	PRBool docLoading;
-	qaWebProgress = GetWebProgObject();
-	rv = qaWebProgress->GetIsLoadingDocument(&docLoading);
-	RvTestResult(rv, "nsIWebProgress::GetisLoadingDocument() test", displayMode);
-	RvTestResultDlg(rv, "nsIWebProgress::GetisLoadingDocument() test");
-	FormatAndPrintOutput("GetisLoadingDocument return value = ", docLoading, displayMode);
-}
-
-void CnsiWebProg::ConvertWPFlagToString(PRUint32 theFlag,
-										nsCAutoString& flagName)
-{
-	switch(theFlag)
-	{
-	case nsIWebProgress::NOTIFY_STATE_REQUEST:
-		flagName.AssignLiteral("NOTIFY_STATE_REQUEST");
-		break;
-	case nsIWebProgress::NOTIFY_STATE_DOCUMENT:
-		flagName.AssignLiteral("NOTIFY_STATE_DOCUMENT");
-		break;
-	case nsIWebProgress::NOTIFY_STATE_NETWORK:
-		flagName.AssignLiteral("NOTIFY_STATE_NETWORK");
-		break;
-	case nsIWebProgress::NOTIFY_STATE_WINDOW:
-		flagName.AssignLiteral("NOTIFY_STATE_WINDOW");
-		break;
-	case nsIWebProgress::NOTIFY_STATE_ALL:
-		flagName.AssignLiteral("NOTIFY_STATE_ALL");
-		break;
-	case nsIWebProgress::NOTIFY_PROGRESS:
-		flagName.AssignLiteral("NOTIFY_PROGRESS");
-		break;
-	case nsIWebProgress::NOTIFY_STATUS:
-		flagName.AssignLiteral("NOTIFY_STATUS");
-		break;
-	case nsIWebProgress::NOTIFY_SECURITY:
-		flagName.AssignLiteral("NOTIFY_SECURITY");
-		break;
-	case nsIWebProgress::NOTIFY_LOCATION:
-		flagName.AssignLiteral("NOTIFY_LOCATION");
-		break;
-	case nsIWebProgress::NOTIFY_ALL:
-		flagName.AssignLiteral("NOTIFY_ALL");
-		break;
-	case nsIWebProgress::NOTIFY_STATE_DOCUMENT | nsIWebProgress::NOTIFY_STATE_REQUEST:
-		flagName.AssignLiteral("NOTIFY_STATE_DOCUMENT&REQUEST");
-		break;
-	case nsIWebProgress::NOTIFY_STATE_DOCUMENT | nsIWebProgress::NOTIFY_STATE_REQUEST
-					| nsIWebProgress::NOTIFY_STATE_NETWORK	:
-		flagName.AssignLiteral("NOTIFY_STATE_DOCUMENT&REQUEST&NETWORK");
-		break;
-	case nsIWebProgress::NOTIFY_STATE_NETWORK | nsIWebProgress::NOTIFY_STATE_WINDOW:
-		flagName.AssignLiteral("NOTIFY_STATE_NETWORK&WINDOW");
-		break;
-	}
-}
-
-void CnsiWebProg::StoreWebProgFlag(PRUint32 theFlag)
-{
-	theStoredFlag = theFlag;
-}
-
-void CnsiWebProg::RetrieveWebProgFlag()
-{
-	PRUint32 theFlag;
-	nsCAutoString flagName(NS_LITERAL_CSTRING("NOTIFY_ALL"));
-
-	theFlag = theStoredFlag;
-	ConvertWPFlagToString(theFlag, flagName);
-	FormatAndPrintOutput("WebProgressListener flag = ", flagName, 2);
-}
-
-void CnsiWebProg::OnStartTests(UINT nMenuID)
-{
-	CWebProgDlg myDialog;
-
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSIWEBPROGRESS_RUNALLTESTS :
-			RunAllTests();
-			break ;
-		case ID_INTERFACES_NSIWEBPROGRESS_ADDPROGRESSLISTENER :
-			if (myDialog.DoModal() == IDOK)
-				AddWebProgLstnr(myDialog.m_wpFlagValue, 2);
-			break ;
-		case ID_INTERFACES_NSIWEBPROGRESS_REMOVEPROGRESSLISTENER :
-			RemoveWebProgLstnr(2);
-			break ;
-		case ID_INTERFACES_NSIWEBPROGRESS_GETDOMWINDOW  :
-			GetTheDOMWindow(2);
-			break ;
-		case ID_INTERFACES_NSIWEBPROGRESS_ISLOADINGDOCUMENT :
-			GetIsLoadingDocTest(2);
-			break;
-	}
-}
-
-void CnsiWebProg::RunAllTests(void)
-{
-	int i;
-	PRUint32 theFlag = 0x000000ff;
-	for (i = 0; i < 10; i++) {
-		switch(i) {
-		case 0:
-			theFlag = nsIWebProgress::NOTIFY_STATE_REQUEST;
-			break;
-		case 1:
-			theFlag = nsIWebProgress::NOTIFY_STATE_DOCUMENT;
-			break;
-		case 2:
-			theFlag = nsIWebProgress::NOTIFY_STATE_NETWORK;
-			break;
-		case 3:
-			theFlag = nsIWebProgress::NOTIFY_STATE_WINDOW;
-			break;
-		case 4:
-			theFlag = nsIWebProgress::NOTIFY_STATE_ALL;
-			break;
-		case 5:
-			theFlag = nsIWebProgress::NOTIFY_PROGRESS;
-			break;
-		case 6:
-			theFlag = nsIWebProgress::NOTIFY_STATUS;
-			break;
-		case 7:
-			theFlag = nsIWebProgress::NOTIFY_SECURITY;
-			break;
-		case 8:
-			theFlag = nsIWebProgress::NOTIFY_LOCATION;
-			break;
-		case 9:
-			theFlag = nsIWebProgress::NOTIFY_ALL;
-			break;
-		}
-		AddWebProgLstnr(theFlag, 1);
-		RemoveWebProgLstnr(1);
-	}
-	GetTheDOMWindow(1);
-	GetIsLoadingDocTest(1);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CnsiWebProg message handlers
diff --git a/embedding/qa/testembed/nsIWebProg.h b/embedding/qa/testembed/nsIWebProg.h
deleted file mode 100644
index 217367446c5..00000000000
--- a/embedding/qa/testembed/nsIWebProg.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// 
-// Header file for nsiWebProgress interface test cases
-
-#if !defined(AFX_NSIWEBPROG_H__8024AB8F_6DB3_11D6_9BA5_00C04FA02BE6__INCLUDED_)
-#define AFX_NSIWEBPROG_H__8024AB8F_6DB3_11D6_9BA5_00C04FA02BE6__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// nsiWebProg.h : header file
-//
-
-#include "BrowserView.h"
-#include "BrowserImpl.h"
-#include "StdAfx.h"
-#include "Tests.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CnsiWebProg window
-
-class CBrowserImpl;
-
-class CnsiWebProg
-{
-public:
-	// Construction
-	CnsiWebProg(nsIWebBrowser *mWebBrowser,
-				   CBrowserImpl *mpBrowserImpl);
-
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser;
-	CBrowserImpl	*qaBrowserImpl;
-	nsIWebProgress * GetWebProgObject();
-	void AddWebProgLstnr(PRUint32, PRInt16);
-	void RemoveWebProgLstnr(PRInt16);
-	void GetTheDOMWindow(PRInt16);
-	void GetIsLoadingDocTest(PRInt16);
-
-	void ConvertWPFlagToString(PRUint32, nsCAutoString&);
-	void StoreWebProgFlag(PRUint32);
-	void RetrieveWebProgFlag(void);
-
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests(void);
-
-	PRUint32 theStoredFlag;
-
-public:
-// Attributes
-
-// Operations
-public:
-
-
-// Implementation
-public:
-	virtual ~CnsiWebProg();
-
-	// Generated message map functions
-protected:
-
-private:
-	nsCOMPtr<nsIWebProgress> qaWebProgress;
-
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_NSIWEBPROG_H__8024AB8F_6DB3_11D6_9BA5_00C04FA02BE6__INCLUDED_)
diff --git a/embedding/qa/testembed/nsIclipboardcmd.cpp b/embedding/qa/testembed/nsIclipboardcmd.cpp
deleted file mode 100644
index 84cd871ab7f..00000000000
--- a/embedding/qa/testembed/nsIclipboardcmd.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dharma Sirnapalli <dsirnapalli@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// Test cases for the nsIClipBoardCommand Interface
-
-#include "stdafx.h"
-#include "QaUtils.h"
-#include <stdio.h>
-#include "nsIClipboardCmd.h"
-
-CNsIClipBoardCmd::CNsIClipBoardCmd(nsIWebBrowser* mWebBrowser)
-{
-	qaWebBrowser = mWebBrowser;
-}
-
-
-CNsIClipBoardCmd::~CNsIClipBoardCmd()
-{
-}
-
-
-void CNsIClipBoardCmd::OnStartTests(UINT nMenuID)
-{
-	// Calls  all or indivdual test cases on the basis of the 
-	// option selected from menu.
-
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSICLIPBOARDCOMMANDS_PASTE	:
-			OnPasteTest();
-			break ;
-		case ID_INTERFACES_NSICLIPBOARDCOMMANDS_COPYSELECTION :
-			OnCopyTest();
-			break ;
-		case ID_INTERFACES_NSICLIPBOARDCOMMANDS_SELECTALL :
-			OnSelectAllTest();
-			break ;
-		case ID_INTERFACES_NSICLIPBOARDCOMMANDS_SELECTNONE :
-			OnSelectNoneTest();
-			break ;
-		case ID_INTERFACES_NSICLIPBOARDCOMMANDS_CUTSELECTION :
-			OnCutSelectionTest();
-			break ;
-		case ID_INTERFACES_NSICLIPBOARDCOMMANDS_COPYLINKLOCATION :
-			copyLinkLocationTest();
-			break ;
-		case ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANCOPYSELECTION :
-			canCopySelectionTest();
-			break ;
-		case ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANCUTSELECTION :
-			canCutSelectionTest();
-			break ;
-		case ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANPASTE :
-			canPasteTest();
-			break ;
-	}
-
-}
-
-// ***********************************************************************
-//DHARMA	- nsIClipboardCommands
-// Checking the paste() method.
-void CNsIClipBoardCmd::OnPasteTest()
-{
-    QAOutput("testing paste command", 1);
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(qaWebBrowser);
-    if (clipCmds)
-	{
-        rv = clipCmds->Paste();
-		RvTestResult(rv, "nsIClipboardCommands::Paste()' rv test", 1);
-
-	}
-	else
-		QAOutput("We didn't get the clipboard object.", 1);
-}
-
-// Checking the copySelection() method.
-void CNsIClipBoardCmd::OnCopyTest()
-{
-    QAOutput("testing copyselection command");
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(qaWebBrowser);
-    if (clipCmds)
-	{
-        rv = clipCmds->CopySelection();
-		RvTestResult(rv, "nsIClipboardCommands::CopySelection()' rv test", 1);
-	}
-	else
-		QAOutput("We didn't get the clipboard object.", 1);
-}
-
-// Checking the selectAll() method.
-void CNsIClipBoardCmd::OnSelectAllTest()
-{
-    QAOutput("testing selectall method");
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(qaWebBrowser);
-    if (clipCmds)
-	{
-        rv = clipCmds->SelectAll();
-		RvTestResult(rv, "nsIClipboardCommands::SelectAll()' rv test", 1);
-	}
-	else
-		QAOutput("We didn't get the clipboard object.", 1);
-}
-
-// Checking the selectNone() method.
-void CNsIClipBoardCmd::OnSelectNoneTest()
-{
-    QAOutput("testing selectnone method");
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(qaWebBrowser);
-    if (clipCmds)
-	{
-        rv = clipCmds->SelectNone();
-		RvTestResult(rv, "nsIClipboardCommands::SelectNone()' rv test", 1);
-	}
-	else
-		QAOutput("We didn't get the clipboard object.", 1);
-}
-
-// Checking the cutSelection() method.
-void CNsIClipBoardCmd::OnCutSelectionTest()
-{
-    QAOutput("testing cutselection method");
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(qaWebBrowser);
-    if (clipCmds)
-	{
-        rv = clipCmds->CutSelection();
-		RvTestResult(rv, "nsIClipboardCommands::CutSelection()' rv test", 1);
-	}
-	else
-		QAOutput("We didn't get the clipboard object.", 1);
-}
-
-// Checking the copyLinkLocation() method.
-void CNsIClipBoardCmd::copyLinkLocationTest()
-{
-    QAOutput("testing CopyLinkLocation method", 2);
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(qaWebBrowser);
-    if (clipCmds)
-	{
-        rv = clipCmds->CopyLinkLocation();
-		RvTestResult(rv, "nsIClipboardCommands::CopyLinkLocation()' rv test", 1);
-	}
-	else
-		QAOutput("We didn't get the clipboard object.", 1);
-}
-
-// Checking the canCopySelection() method.
-void CNsIClipBoardCmd::canCopySelectionTest()
-{
-    PRBool canCopySelection = PR_FALSE;
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(qaWebBrowser);
-    if (clipCmds)
-	{
-       rv = clipCmds->CanCopySelection(&canCopySelection);
-	   RvTestResult(rv, "nsIClipboardCommands::CanCopySelection()' rv test", 1);
-
-       if(canCopySelection)
-          QAOutput("The selection you made Can be copied", 2);
-       else
-          QAOutput("Either you did not make a selection or The selection you made Cannot be copied", 2);
-	}
-	else
-		QAOutput("We didn't get the clipboard object.", 1);
-}
-
-// Checking the canCutSelection() method.
-void CNsIClipBoardCmd::canCutSelectionTest()
-{
-    PRBool canCutSelection = PR_FALSE;
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(qaWebBrowser);
-    if (clipCmds)
-	{
-       rv = clipCmds->CanCutSelection(&canCutSelection);
-	   RvTestResult(rv, "nsIClipboardCommands::CanCutSelection()' rv test", 1);
-
-	   if(canCutSelection)
-          QAOutput("The selection you made Can be cut", 2);
-       else
-          QAOutput("Either you did not make a selection or The selection you made Cannot be cut", 2);
-	}
-	else
-		QAOutput("We didn't get the clipboard object.", 1);
-}
-
-// Checking the canPaste() method.
-void CNsIClipBoardCmd::canPasteTest()
-{
-    PRBool canPaste = PR_FALSE;
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(qaWebBrowser);
-    if (clipCmds)
-	{
-        rv = clipCmds->CanPaste(&canPaste);
-	    RvTestResult(rv, "nsIClipboardCommands::CanPaste()' rv test", 1);
-
-		if(canPaste)
-			QAOutput("The clipboard contents can be pasted here", 2);
-		else
-			QAOutput("The clipboard contents cannot be pasted here", 2);
-	}
-	else
-		QAOutput("We didn't get the clipboard object.", 1);
-}
-
-//DHARMA
diff --git a/embedding/qa/testembed/nsIclipboardcmd.h b/embedding/qa/testembed/nsIclipboardcmd.h
deleted file mode 100644
index ea15e98dee1..00000000000
--- a/embedding/qa/testembed/nsIclipboardcmd.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dharma Sirnapalli <dsirnapalli@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// 
-// Header file for nsIClipBoardCommand interface test cases
-
-class CNsIClipBoardCmd
-{	
-public:
-
-	CNsIClipBoardCmd(nsIWebBrowser* mWebBrowser);
-
-public:
-	~CNsIClipBoardCmd();
-
-public:
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser ;
-
-	void OnStartTests(UINT nMenuID);
-	void OnPasteTest();
-	void OnCopyTest();
-	void OnSelectAllTest();
-	void OnSelectNoneTest();
-	void OnCutSelectionTest();
-	void copyLinkLocationTest();
-	void canCopySelectionTest();
-	void canCutSelectionTest();
-	void canPasteTest();
-
-protected:
-
-
-};
\ No newline at end of file
diff --git a/embedding/qa/testembed/nsProfile.cpp b/embedding/qa/testembed/nsProfile.cpp
deleted file mode 100644
index 76380e8dec9..00000000000
--- a/embedding/qa/testembed/nsProfile.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// Test cases for the nsISelection Interface
-
-#include "stdafx.h"
-#include "QaUtils.h"
-#include <stdio.h>
-#include "nsProfile.h"
-
-CProfile::CProfile(nsIWebBrowser* mWebBrowser)
-{
-	qaWebBrowser = mWebBrowser;
-}
-
-
-CProfile::~CProfile()
-{
-}
-
-
-void CProfile::OnStartTests(UINT nMenuID)
-{
-	// Calls  all or indivdual test cases on the basis of the 
-	// option selected from menu.
-
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSIPROFILE_RUNALLTESTS	:
-			RunAllTests();
-			break ;
-		case ID_INTERFACES_NSIPROFILE_GETPROFILECOUNT :
-			GetProfileCount();
-			break ;
-		case ID_INTERFACES_NSIPROFILE_GETCURRENTPROFILE :
-			GetCurrentProfile();
-			break ;
-		case ID_INTERFACES_NSIPROFILE_SETCURRENTPROFILE :
-			SetCurrentProfile();
-			break ;
-		case ID_INTERFACES_NSIPROFILE_GETPROFILELIST :
-			GetProfileList();
-			break ;
-		case ID_INTERFACES_NSIPROFILE_PROFILEEXISTS :
-			ProfileExists();
-			break ;
-		case ID_INTERFACES_NSIPROFILE_CREATENEWPROFILE :
-			CreateNewProfile();
-			break ;
-		case ID_INTERFACES_NSIPROFILE_RENAMEPROFILE :
-			RenameProfile();
-			break ;
-		case ID_INTERFACES_NSIPROFILE_DELETEPROFILE :
-			DeleteProfile();
-			break ;
-		case ID_INTERFACES_NSIPROFILE_CLONEPROFILE :
-			CloneProfile();
-			break ;
-		case ID_INTERFACES_NSIPROFILE_SHUTDOWNCURRENTPROFILE :
-			ShutDownCurrentProfile();
-			break ;
-	}
-
-}
-
-void CProfile::RunAllTests()
-{
-    
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
-
-	PRInt32 profileCount;
-    rv = oNsProfile->GetProfileCount(&profileCount);
-    RvTestResultDlg(rv, "nsIProfile::GetProfileCount() ");
-
-    nsXPIDLString   currProfileName;
-    rv = oNsProfile->GetCurrentProfile(getter_Copies(currProfileName));
-    RvTestResultDlg(rv, "nsIProfile::GetCurrentProfile() ");
-
-    rv = oNsProfile->SetCurrentProfile(currProfileName);
-    RvTestResultDlg(rv, "nsIProfile::SetCurrentProfile() ");
-
-
-    PRUint32    listLen;
-    PRUnichar   **profileList;
-
-    rv = oNsProfile->GetProfileList(&listLen, &profileList);
-    RvTestResultDlg(rv, "oNsProfile->GetProfileList");
-
-    for (PRUint32 index = 0; index < listLen; index++)
-    {
-        CString tmpStr(profileList[index]);
-	    RvTestResultDlg(rv, tmpStr);
-	}
-
-    PRBool exists = FALSE;
-    rv = oNsProfile->ProfileExists(currProfileName, &exists);
-    RvTestResultDlg(rv, "oNsProfile->ProfileExists");
-
-	USES_CONVERSION ;
-
-	NS_NAMED_LITERAL_STRING(newProfileName, "nsIProfileTest");
-
-    rv = oNsProfile->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_TRUE);
-    RvTestResultDlg(rv, "oNsProfile->CreateNewProfile");
-
-    rv = oNsProfile->CloneProfile(currProfileName);
-    RvTestResultDlg(rv, "oNsProfile->CloneProfile");
-
-    rv = oNsProfile->RenameProfile(currProfileName, T2W("nsIProfileTestNew"));
-    RvTestResultDlg(rv, "oNsProfile->RenameProfile");
-
-    rv = oNsProfile->DeleteProfile(T2W("nsIProfileTestNew"), PR_TRUE);
-    RvTestResultDlg(rv, "oNsProfile->DeleteProfile");
- 
-}
-
-void CProfile::GetProfileCount()
-{
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
-
-	PRInt32 profileCount;
-    rv = oNsProfile->GetProfileCount(&profileCount);
-    RvTestResultDlg(rv, "nsIProfile::GetProfileCount() ");
-}
-
-void CProfile::GetCurrentProfile()
-{
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
-
-	nsXPIDLString   currProfileName;
-    rv = oNsProfile->GetCurrentProfile(getter_Copies(currProfileName));
-    RvTestResultDlg(rv, "nsIProfile::GetCurrentProfile() ");
-}
-
-void CProfile::SetCurrentProfile()
-{
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
-
-	nsXPIDLString   currProfileName;
-    rv = oNsProfile->GetCurrentProfile(getter_Copies(currProfileName));
-    RvTestResultDlg(rv, "nsIProfile::GetCurrentProfile() ");
-
-    rv = oNsProfile->SetCurrentProfile(currProfileName);
-    RvTestResultDlg(rv, "nsIProfile::SetCurrentProfile() ");
-}
-
-void CProfile::GetProfileList()
-{
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
-
-	PRUint32    listLen;
-    PRUnichar   **profileList;
-
-    rv = oNsProfile->GetProfileList(&listLen, &profileList);
-    RvTestResultDlg(rv, "oNsProfile->GetProfileList");
-
-    for (PRUint32 index = 0; index < listLen; index++)
-    {
-        CString tmpStr(profileList[index]);
-	    RvTestResultDlg(rv, tmpStr);
-	}
-}
-
-void CProfile::ProfileExists()
-{
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
-
-	nsXPIDLString   currProfileName;
-    rv = oNsProfile->GetCurrentProfile(getter_Copies(currProfileName));
-    RvTestResultDlg(rv, "nsIProfile::GetCurrentProfile() ");
-
-	PRBool exists = FALSE;
-    rv = oNsProfile->ProfileExists(currProfileName, &exists);
-    RvTestResultDlg(rv, "oNsProfile->ProfileExists");
-}
-
-void CProfile::CreateNewProfile()
-{
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
-
-	USES_CONVERSION ;
-
-	rv = oNsProfile->CreateNewProfile(T2W("New Test"), nsnull, nsnull, PR_TRUE);
-    RvTestResultDlg(rv, "oNsProfile->CreateNewProfile");
-   
-}
-
-void CProfile::RenameProfile()
-{
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
-
-	USES_CONVERSION ;
-
-	nsXPIDLString   currProfileName;
-    rv = oNsProfile->GetCurrentProfile(getter_Copies(currProfileName));
-    RvTestResultDlg(rv, "nsIProfile::GetCurrentProfile() ");
-
-	rv = oNsProfile->RenameProfile(currProfileName, T2W("New default"));
-    RvTestResultDlg(rv, "oNsProfile->RenameProfile");
-}
-
-void CProfile::DeleteProfile()
-{
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
-
-	USES_CONVERSION ;
-
-	nsXPIDLString   currProfileName;
-    rv = oNsProfile->GetCurrentProfile(getter_Copies(currProfileName));
-    RvTestResultDlg(rv, "nsIProfile::GetCurrentProfile() ");
-
-    rv = oNsProfile->DeleteProfile(currProfileName, PR_TRUE);
-    RvTestResultDlg(rv, "oNsProfile->DeleteProfile");
-}
-
-void CProfile::CloneProfile()
-{
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
- 
-	USES_CONVERSION ;
-
-	nsXPIDLString   currProfileName;
-    rv = oNsProfile->GetCurrentProfile(getter_Copies(currProfileName));
-    RvTestResultDlg(rv, "nsIProfile::GetCurrentProfile() ");
-
-    rv = oNsProfile->CloneProfile(currProfileName);
-    RvTestResultDlg(rv, "oNsProfile->CloneProfile");
-}
-
-void CProfile::ShutDownCurrentProfile()
-{
-	nsCOMPtr<nsIProfile> oNsProfile (do_GetService(NS_PROFILE_CONTRACTID,&rv));
-
-    RvTestResultDlg(rv, "do_GetService",true);
-	if (!oNsProfile)
-	{
-	    RvTestResultDlg(rv, "Cannot get the nsIprofile object");
-	    return ;
-	}
-}
-
diff --git a/embedding/qa/testembed/nsProfile.h b/embedding/qa/testembed/nsProfile.h
deleted file mode 100644
index cf4cdaeb328..00000000000
--- a/embedding/qa/testembed/nsProfile.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// 
-// Header file for nsIProfile interface test cases
-
-class CProfile
-{	
-public:
-
-	CProfile(nsIWebBrowser* mWebBrowser);
-
-public:
-	~CProfile();
-
-public:
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser ;
-
-	// Place Test Cases Here
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests();
-	void GetProfileCount();
-	void GetCurrentProfile();
-	void SetCurrentProfile();
-	void GetProfileList();
-	void ProfileExists();
-	void CreateNewProfile();
-	void RenameProfile();
-	void DeleteProfile();
-	void CloneProfile();
-	void ShutDownCurrentProfile();
-
-private:
-protected:
-
-
-};
\ No newline at end of file
diff --git a/embedding/qa/testembed/nsiDirServ.cpp b/embedding/qa/testembed/nsiDirServ.cpp
deleted file mode 100644
index 299f7919a05..00000000000
--- a/embedding/qa/testembed/nsiDirServ.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// Test cases for the nsiDirectoryService Interface
-
-#include "stdafx.h"
-#include "TestEmbed.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "UrlDialog.h"
-#include "ProfileMgr.h"
-#include "ProfilesDlg.h"
-#include "QaUtils.h"
-#include "nsiDirServ.h"
-#include "nsIDirectoryService.h"
-#include "winEmbedFileLocProvider.h"
-#include <stdio.h>
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIDirectoryService
-
-CNsIDirectoryService::CNsIDirectoryService()
-{
-
-}
-
-/*CNsIDirectoryService::CNsIDirectoryService(nsIWebBrowser* mWebBrowser,
-			   nsIBaseWindow* mBaseWindow,
-			   nsIWebNavigation* mWebNav,
-			   CBrowserImpl *mpBrowserImpl):CTests(mWebBrowser,mBaseWindow,mWebNav,mpBrowserImpl)
-{
-
-}
-*/
-
-CNsIDirectoryService::~CNsIDirectoryService()
-{
-}
-
-/*
-BEGIN_MESSAGE_MAP(CNsIDirectoryService, CTests)
-	//{{AFX_MSG_MAP(CNsIDirectoryService)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-*/
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIDirectoryService message handlers
-// ***********************************************************************
-// ***********************************************************************
-//  NsIDirectoryService iface
-
-
-void CNsIDirectoryService::StartTests(UINT nMenuID)
-{
-
-    QAOutput("------------------------------------------------",1);
-    QAOutput("Start DirectoryService Test",1);
-   	
-	// Calls  all or indivdual test cases on the basis of the 
-	// option selected from menu.
-
-	switch(nMenuID)
-	{
-	case ID_INTERFACES_NSIDIRECTORYSERVICE_RUNALLTESTS :
-			  Init(); 
-			  RegisterProvider(); 	
-			  UnRegisterProvider(); 	
-			  break ;
-	case ID_INTERFACES_NSIDIRECTORYSERVICE_INIT :
-			  Init(); 
-			  break ;
-	case ID_INTERFACES_NSIDIRECTORYSERVICE_REGISTERPROVIDER :
-			  RegisterProvider(); 	
-			  break ;
-	case ID_INTERFACES_NSIDIRECTORYSERVICE_UNREGISTERPROVIDER :
-			  UnRegisterProvider(); 	
-			  break ;
-	default :  
-			AfxMessageBox("Menu handler not added for this menu item");
-			break ;
-	}	
-}
-
-void CNsIDirectoryService::Init()
-{
-   nsCOMPtr<nsIDirectoryService> theDirService(do_CreateInstance(NS_DIRECTORY_SERVICE_CONTRACTID));
-
-    if (!theDirService)
- 	{
-		QAOutput("Directory Service object doesn't exist.", 0);
-		return;
-	}
-
-	rv = theDirService->Init();
-	RvTestResult(rv, "rv Init() test", 1);
-	RvTestResultDlg(rv, "rv Init() test", true);
-}
-void CNsIDirectoryService::RegisterProvider()
-{
-   nsCOMPtr<nsIDirectoryService> theDirService(do_CreateInstance(NS_DIRECTORY_SERVICE_CONTRACTID));
-   winEmbedFileLocProvider *provider = new winEmbedFileLocProvider("TestEmbed");
-    if (!theDirService)
- 	{
-		QAOutput("Directory Service object doesn't exist.", 0);
-		return;
-	}
-    if (!provider)
- 	{
-		QAOutput("Directory Service Provider object doesn't exist.", 0);
-		return;
-	}
-	rv= theDirService->RegisterProvider(provider);
-	RvTestResult(rv, "rv RegisterProvider() test", 1);
-	RvTestResultDlg(rv, "rv RegisterProvider() test");
-}
-void CNsIDirectoryService::UnRegisterProvider()
-{
-   nsCOMPtr<nsIDirectoryService> theDirService(do_CreateInstance(NS_DIRECTORY_SERVICE_CONTRACTID));
-   winEmbedFileLocProvider *provider = new winEmbedFileLocProvider("TestEmbed");
-    if (!theDirService)
- 	{
-		QAOutput("Directory Service object doesn't exist.", 0);
-		return;
-	}
-    if (!provider)
- 	{
-		QAOutput("Directory Service Provider object doesn't exist.", 0);
-		return;
-	}
-	rv= theDirService->RegisterProvider(provider);
-	rv= theDirService->UnregisterProvider(provider);
-	RvTestResult(rv, "rv UnRegisterProvider() test", 1);
-	RvTestResultDlg(rv, "rv UnRegisterProvider() test");
-}
-
-
diff --git a/embedding/qa/testembed/nsiDirServ.h b/embedding/qa/testembed/nsiDirServ.h
deleted file mode 100644
index 5561fe290cb..00000000000
--- a/embedding/qa/testembed/nsiDirServ.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// 
-// Header file for NsIDirectoryService interface test cases
-
-//#include "Tests.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIDirectoryService window
-
-class CNsIDirectoryService
-{
-// Construction
-public:
-	CNsIDirectoryService();
-
-/*	CNsIDirectoryService(nsIWebBrowser* mWebBrowser,
-			   nsIBaseWindow* mBaseWindow,
-			   nsIWebNavigation* mWebNav,
-			   CBrowserImpl *mpBrowserImpl);
-*/	
-public:
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CNsIDirectoryService)
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CNsIDirectoryService();
-
-public:
-	// Place the test cases here
-	void StartTests(UINT nMenuID);
-	void Init() ;
-	void RegisterProvider();
-	void UnRegisterProvider();
-
-
-	// Generated message map functions
-protected:
-
-};
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/embedding/qa/testembed/nsiHistory.cpp b/embedding/qa/testembed/nsiHistory.cpp
deleted file mode 100644
index ac55c2e92f0..00000000000
--- a/embedding/qa/testembed/nsiHistory.cpp
+++ /dev/null
@@ -1,533 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// 
-// Test cases for the nsiHistory Interface
-
-#include "stdafx.h"
-#include "TestEmbed.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "UrlDialog.h"
-#include "ProfileMgr.h"
-#include "ProfilesDlg.h"
-#include "QaUtils.h"
-#include "nsihistory.h"
-#include <stdio.h>
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIHistory
-
-CNsIHistory::CNsIHistory(nsIWebNavigation *mWebNav)
-{
-	//qaTests = mTests;
-	qaWebNav = mWebNav ;
-}
-
-
-CNsIHistory::~CNsIHistory()
-{
-}
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIHistory message handlers
-// ***********************************************************************
-// ***********************************************************************
-//  nsIHistory iface
-
-// ***********************************************************************
-// ***********************************************************************
-// nsISHistory & nsIHistoryEntry ifaces:
-
-void CNsIHistory::OnStartTests(UINT nMenuID)
-{
-
-	// Calls  all or indivdual test cases on the basis of the 
-	// option selected from menu.
-   PRInt32 numEntries = 5;
-   PRInt32 theIndex;
-   PRInt32 theMaxLength = 100;
-
-   CString shString;
-
-   nsCOMPtr<nsISHistory> theSessionHistory;
-   nsCOMPtr<nsIHistoryEntry> theHistoryEntry;
-   nsCOMPtr<nsISimpleEnumerator> theSimpleEnum;
-
-
-   //nsCOMPtr<nsIURI> theURI;
-   // do_QueryInterface
-   // NS_HISTORYENTRY_CONTRACTID
-
-	// get Session History through web nav iface
-   if (qaWebNav) {
-	  rv = qaWebNav->GetSessionHistory(getter_AddRefs(theSessionHistory));
-	  RvTestResult(rv, "GetSessionHistory() object", 1);
-	  RvTestResultDlg(rv, "GetSessionHistory() object", true);
-   }
-
-   if (!theSessionHistory)
-   {
-	   QAOutput("theSessionHistory object wasn't created. No session history tests performed.", 2);
-	   return;
-   }
-   else {
-	   QAOutput("theSessionHistory object was created.", 1);
-	   theSessionHistory->GetCount(&numEntries);
-   }
-
-	theSessionHistory->GetEntryAtIndex(0, PR_FALSE, getter_AddRefs(theHistoryEntry));
-	if (!theHistoryEntry)
-		QAOutput("We didn't get the History Entry object.", 1);
-	else 
-		QAOutput("We have the History Entry object!", 1);	
-
-
-
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSISHISTORY_RUNALLTESTS :
-			QAOutput("Begin nsISHistory tests.", 1);
-			RunAllTests();
-			QAOutput("End nsISHistory tests.", 1);
-			break ;
-		case ID_INTERFACES_NSISHISTORY_GETCOUNT :
-			GetCountTest(theSessionHistory, &numEntries, 2);
-			break ;
-		case ID_INTERFACES_NSISHISTORY_GETINDEX :
-			GetIndexTest(theSessionHistory, &theIndex, 2);
-			break ;
-		case ID_INTERFACES_NSISHISTORY_GETMAXLENGTH :
-			GetMaxLengthTest(theSessionHistory, &theMaxLength, 2);
-			break ;
-		case ID_INTERFACES_NSISHISTORY_SETMAXLENGTH :
-			SetMaxLengthTest(theSessionHistory, theMaxLength, 2);
-			break ;
-		case ID_INTERFACES_NSISHISTORY_GETENTRYATINDEX :
-			//GetEntryAtIndex(0, PR_FALSE, getter_AddRefs(theHistoryEntry));
-			for (theIndex = 0; theIndex < numEntries; theIndex++)
-			{ 
-				FormatAndPrintOutput("the index = ", theIndex, 1); 
-
-				rv = theSessionHistory->GetEntryAtIndex(theIndex, PR_FALSE, getter_AddRefs(theHistoryEntry));
-				RvTestResult(rv, "GetEntryAtIndex() test", 1);
-				RvTestResultDlg(rv, "GetEntryAtIndex() test");
-				if (!theHistoryEntry)
-				{
-					QAOutput("We didn't get the History Entry object. No more tests performed.", 1);
-					return;
-				}
-				GetURIHistTest(theHistoryEntry, 2);
-				GetTitleHistTest(theHistoryEntry, 2);
-				GetIsSubFrameTest(theHistoryEntry, 2);
-			}	// end for loop
-
-			break ;
-		case ID_INTERFACES_NSISHISTORY_PURGEHISTORY :
-			PurgeHistoryTest(theSessionHistory, numEntries, 2);
-			break ;
-		case ID_INTERFACES_NSISHISTORY_GETSHISTORYENUMERATOR :
-			//GetSHistoryEnumerator(getter_AddRefs(theSimpleEnum));
-
-			rv = theSessionHistory->GetSHistoryEnumerator(getter_AddRefs(theSimpleEnum));
-			RvTestResult(rv, "GetSHistoryEnumerator() (SHistoryEnumerator attribute) test", 1);
-			RvTestResultDlg(rv, "GetSHistoryEnumerator() test");
-
-			if (!theSimpleEnum) {
-  			   QAOutput("theSimpleEnum for GetSHistoryEnumerator() invalid. Test failed.", 1);
-			   return;
-			}
-			SimpleEnumTest(theSimpleEnum, 2);
-			break ;
-
-		case ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_RUNALLTESTS :
-			RunAllHistoryEntryTests(2);
-			break ;
-		case ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETURI :
-			GetURIHistTest(theHistoryEntry, 2);
-			break ;
-		case ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETTITLE :
-			GetTitleHistTest(theHistoryEntry, 2);
-			break ;
-		case ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETISSUBFRAME :
-			GetIsSubFrameTest(theHistoryEntry, 2);
-			break ;
-	}
-
-}
-
-void CNsIHistory::RunAllTests() 
-{
-   //nsresult rv;  
-
-   PRInt32 numEntries = 5;
-   PRInt32 theIndex;
-   PRInt32 theMaxLength = 100;
-
-   CString shString;
-
-   nsCOMPtr<nsISHistory> theSessionHistory;
-   nsCOMPtr<nsIHistoryEntry> theHistoryEntry;
-
-	// get Session History through web nav iface
-   if (qaWebNav)
-		qaWebNav->GetSessionHistory( getter_AddRefs(theSessionHistory));
-
-   if (!theSessionHistory)
-   {
-	   QAOutput("theSessionHistory object wasn't created. No session history tests performed.", 2);
-	   return;
-   }
-   else {
-	   QAOutput("theSessionHistory object was created.", 1);
-	   theSessionHistory->GetCount(&numEntries);
-   }
-
-		// test count attribute in nsISHistory.idl
-   GetCountTest(theSessionHistory, &numEntries, 1);
-
-		// test index attribute in nsISHistory.idl
-   GetIndexTest(theSessionHistory, &theIndex, 1);
-
-		// test maxLength attribute in nsISHistory.idl
-   SetMaxLengthTest(theSessionHistory, theMaxLength, 1);
-   GetMaxLengthTest(theSessionHistory, &theMaxLength, 1);
-
-	QAOutput("Start nsiHistoryEntry tests.", 1); 
-
-		// get theHistoryEntry object
-	rv = theSessionHistory->GetEntryAtIndex(0, PR_FALSE, getter_AddRefs(theHistoryEntry));
-	RvTestResult(rv, "GetEntryAtIndex() test", 1);
-	RvTestResultDlg(rv, "GetEntryAtIndex() test");
-
-	if (!theHistoryEntry)
-		QAOutput("We didn't get the History Entry object.", 1);
-	else 
-	{
-		QAOutput("We have the History Entry object!", 1);	
-
-			    // getEntryAtIndex() tests
-		if (theMaxLength < numEntries)
-		{
-			QAOutput("Setting number of entries to maximum length!", 1);
-			numEntries = theMaxLength;
-		}
-
-		for (theIndex = 0; theIndex < numEntries; theIndex++)
-		{ 
-			FormatAndPrintOutput("the index = ", theIndex, 1); 
-
-			//GetEntryAtIndexTest(theSessionHistory,theHistoryEntry, theIndex);
-
-			theSessionHistory->GetEntryAtIndex(theIndex, PR_FALSE, getter_AddRefs(theHistoryEntry));
-			if (!theHistoryEntry)
-			{
-				QAOutput("We didn't get the History Entry object. No more tests performed.", 1);
-				return;
-			}
-			// nsiHistoryEntry.idl tests	
-
-			// test URI attribute in nsIHistoryEntry.idl
-			GetURIHistTest(theHistoryEntry, 1);
-
-			// test title attribute in nsIHistoryEntry.idl
-			GetTitleHistTest(theHistoryEntry, 1);
-
-			// test isSubFrame attribute in nsIHistoryEntry.idl
-			GetIsSubFrameTest(theHistoryEntry, 1);
-
-		}	// end for loop
-	}		// end outer else
-
-
-	// test SHistoryEnumerator attribute in nsISHistory.idl
-	nsCOMPtr<nsISimpleEnumerator> theSimpleEnum;
-
-//	GetSHEnumTest(theSessionHistory, theSimpleEnum);
-
-	rv = theSessionHistory->GetSHistoryEnumerator(getter_AddRefs(theSimpleEnum));
-	RvTestResult(rv, "GetSHistoryEnumerator() (SHistoryEnumerator attribute) test", 1);
-	RvTestResultDlg(rv, "GetSHistoryEnumerator() (SHistoryEnumerator attribute) test");
-
-	if (!theSimpleEnum)
-  	   QAOutput("theSimpleEnum for GetSHistoryEnumerator() invalid. Test failed.", 1);
-	else
-		SimpleEnumTest(theSimpleEnum, 1);
-
-	// PurgeHistory() test
-
-	PurgeHistoryTest(theSessionHistory, numEntries, 1);
-}
-
-// ***********************************************************************
-// Individual nsISHistory tests
-
-void CNsIHistory::GetCountTest(nsISHistory *theSessionHistory, PRInt32 *numEntries,
-							   PRInt16 displayMode)
-{
-    rv = theSessionHistory->GetCount(numEntries);
-	if (*numEntries < 0) 
-		QAOutput("numEntries for GetCount() < 0. Test failed.", 1);
-	else {
-		FormatAndPrintOutput("GetCount():number of entries = ", *numEntries, displayMode);
-		RvTestResult(rv, "GetCount() (count attribute) test", 1);
-		RvTestResultDlg(rv, "GetCount() (count attribute) test");
-	}
-}
-
-void CNsIHistory::GetIndexTest(nsISHistory *theSessionHistory, PRInt32 *theIndex,
-							   PRInt16 displayMode)
-{
-	rv = theSessionHistory->GetIndex(theIndex);
-	if (*theIndex <0) 
-		QAOutput("theIndex for GetIndex() < 0. Test failed.", 1);
-	else {
-		FormatAndPrintOutput("GetIndex():the index = ", *theIndex, displayMode);
-		RvTestResult(rv, "GetIndex() (index attribute) test", 1);
-		RvTestResultDlg(rv, "GetIndex() (index attribute) test");
-	}
-}
-
-void CNsIHistory::SetMaxLengthTest(nsISHistory *theSessionHistory, PRInt32 theMaxLength,
-								   PRInt16 displayMode)
-{
-	rv = theSessionHistory->SetMaxLength(theMaxLength);
-	if (theMaxLength < 0)
-		QAOutput("theMaxLength for SetMaxLength() < 0. Test failed.", 1);
-	else {
-		RvTestResult(rv, "SetMaxLength() (MaxLength attribute) test", displayMode);
-		RvTestResultDlg(rv, "SetMaxLength() (MaxLength attribute) test");
-	}
-}
-
-void CNsIHistory::GetMaxLengthTest(nsISHistory *theSessionHistory, PRInt32 *theMaxLength,
-								   PRInt16 displayMode)
-{
-	rv = theSessionHistory->GetMaxLength(theMaxLength);
-	if (*theMaxLength<0)
-		QAOutput("theMaxLength for GetMaxLength() < 0. Test failed.", 1);
-	else {
-		FormatAndPrintOutput("GetMaxLength():theMaxLength = ", *theMaxLength, displayMode); 
-		RvTestResult(rv, "GetMaxLength() (MaxLength attribute) test", 1);
-		RvTestResultDlg(rv, "GetMaxLength() (MaxLength attribute) test");
-	}
-}
-
-
-/*void CNsIHistory::GetEntryAtIndexTest(nsISHistory *theSessionHistory, 
-								 nsIHistoryEntry *theHistoryEntry, 
-								 PRInt32 theIndex)
-{
-	theSessionHistory->GetEntryAtIndex(theIndex, PR_FALSE,&theHistoryEntry);
-
-	// test URI attribute in nsIHistoryEntry.idl
-	//GetURIHistTest(theHistoryEntry);
-
-	// test title attribute in nsIHistoryEntry.idl
-	//GetTitleHistTest(theHistoryEntry);
-
-	// test isSubFrame attribute in nsIHistoryEntry.idl
-	//GetIsSubFrameTest(theHistoryEntry);
-
-}*/
-
-
-void CNsIHistory::GetURIHistTest(nsIHistoryEntry* theHistoryEntry,
-								 PRInt16 displayMode)
-{
-	rv = theHistoryEntry->GetURI(getter_AddRefs(theURI));
-	RvTestResult(rv, "GetURI() (URI attribute) test", 1);
-	RvTestResultDlg(rv, "GetURI() (URI attribute) test");
-	if (!theURI)
-		QAOutput("theURI for GetURI() invalid. Test failed.", 1);
-	else
-	{
-		nsCAutoString uriString;
-		rv = theURI->GetSpec(uriString);
-		if (NS_FAILED(rv))
-			QAOutput("We didn't get the uriString.", 1);
-		else
-			FormatAndPrintOutput("The SH Url = ", uriString, displayMode);
-	}
-}
-
-void CNsIHistory::GetTitleHistTest(nsIHistoryEntry* theHistoryEntry,
-								   PRInt16 displayMode)
-{
-   nsXPIDLString theTitle;
-
-	rv = theHistoryEntry->GetTitle(getter_Copies(theTitle));
-	RvTestResult(rv, "GetTitle() (title attribute) test", 1);
-	RvTestResultDlg(rv, "GetTitle() (title attribute) test");
-	if (!theTitle) {
-		QAOutput("theTitle for GetTitle() is blank. Test failed.", 1);
-		return;
-	}
-
-	FormatAndPrintOutput("The title = ",
-                        NS_ConvertUTF16toUTF8(theTitle).get(), displayMode);
-}
-
-void CNsIHistory::GetIsSubFrameTest(nsIHistoryEntry* theHistoryEntry,
-									PRInt16 displayMode)
-{
-	PRBool isSubFrame;
-
-	rv = theHistoryEntry->GetIsSubFrame(&isSubFrame);
-	
-	RvTestResult(rv, "GetIsSubFrame() (isSubFrame attribute) test", 1);
-	RvTestResultDlg(rv, "GetIsSubFrame() (isSubFrame attribute) test");
-	FormatAndPrintOutput("The subFrame boolean value = ", isSubFrame, displayMode);
-}
-
-/*
-void CNsIHistory::GetSHEnumTest(nsISHistory *theSessionHistory,
-						   nsISimpleEnumerator *theSimpleEnum)
-{
-	rv = theSessionHistory->GetSHistoryEnumerator(getter_AddRefs(theSimpleEnum));
-	if (!theSimpleEnum)
-  	   QAOutput("theSimpleEnum for GetSHistoryEnumerator() invalid. Test failed.", 1);
-	else
-	   RvTestResult(rv, "GetSHistoryEnumerator() (SHistoryEnumerator attribute) test", 2);
-}
-*/
-
-void CNsIHistory::SimpleEnumTest(nsISimpleEnumerator *theSimpleEnum,
-								 PRInt16 displayMode)
-{
-  PRBool bMore = PR_FALSE;
-  nsCOMPtr<nsISupports> nextObj;
-  nsCOMPtr<nsIHistoryEntry> nextHistoryEntry;
-
-  while (NS_SUCCEEDED(theSimpleEnum->HasMoreElements(&bMore)) && bMore)
-  {
-	 theSimpleEnum->GetNext(getter_AddRefs(nextObj));
-	 if (!nextObj)
-		continue;
-	 nextHistoryEntry = do_QueryInterface(nextObj);
-	 if (!nextHistoryEntry)
-		continue;
-	 rv = nextHistoryEntry->GetURI(getter_AddRefs(theURI));
-	 RvTestResult(rv, "theSimpleEnum nsIHistoryEntry->GetURI() test", 1);
-	 RvTestResultDlg(rv, "theSimpleEnum nsIHistoryEntry->GetURI() test");
-	 nsCAutoString uriString;
-	 rv = theURI->GetSpec(uriString);
-	 if (NS_FAILED(rv))
-		QAOutput("uriString for GetSpec() invalid. Test failed.", 1);
-	 else
-		FormatAndPrintOutput("The SimpleEnum URL = ", uriString, displayMode);		 
-  } 
-}
-
-void CNsIHistory::PurgeHistoryTest(nsISHistory* theSessionHistory, PRInt32 numEntries,
-								   PRInt16 displayMode)
-{
-   rv = theSessionHistory->PurgeHistory(numEntries);
-   RvTestResult(rv, "PurgeHistory() test", 1);
-   RvTestResultDlg(rv, "PurgeHistory() test");
-   FormatAndPrintOutput("PurgeHistory(): num requested entries for removal = ", numEntries, 1);		 
-}
-
-void CNsIHistory::RunAllHistoryEntryTests(PRInt16 displayMode) 
-{
-   PRInt32 numEntries = 5;
-   PRInt32 theIndex;
-   PRInt32 theMaxLength = 100;
-
-   CString shString;
-
-   nsCOMPtr<nsISHistory> theSessionHistory;
-   nsCOMPtr<nsIHistoryEntry> theHistoryEntry;
-
-	// get Session History through web nav iface
-   if (qaWebNav)
-		qaWebNav->GetSessionHistory( getter_AddRefs(theSessionHistory));
-
-   if (!theSessionHistory)
-   {
-	   QAOutput("theSessionHistory object wasn't created. No session history tests performed.", displayMode);
-	   return;
-   }
-   else
-	   QAOutput("theSessionHistory object was created.", 1);
-
-	theSessionHistory->GetEntryAtIndex(0, PR_FALSE, getter_AddRefs(theHistoryEntry));
-	if (!theHistoryEntry)
-		QAOutput("We didn't get the History Entry object.", 1);
-	else 
-	{
-		QAOutput("We have the History Entry object!", 1);	
-
-			    // getEntryAtIndex() tests
-		if (theMaxLength < numEntries)
-		{
-			QAOutput("Setting number of entries to maximum length!", 1);
-			numEntries = theMaxLength;
-		}
-
-		for (theIndex = 0; theIndex < numEntries; theIndex++)
-		{ 
-			FormatAndPrintOutput("the index = ", theIndex, displayMode); 
-
-			//GetEntryAtIndexTest(theSessionHistory,theHistoryEntry, theIndex);
-
-			theSessionHistory->GetEntryAtIndex(theIndex, PR_FALSE, getter_AddRefs(theHistoryEntry));
-			if (!theHistoryEntry)
-			{
-				QAOutput("We didn't get the History Entry object. No more tests performed.", 1);
-				return;
-			}
-			// nsiHistoryEntry.idl tests	
-
-			// test URI attribute in nsIHistoryEntry.idl
-			GetURIHistTest(theHistoryEntry, displayMode);
-
-			// test title attribute in nsIHistoryEntry.idl
-			GetTitleHistTest(theHistoryEntry, displayMode);
-
-			// test isSubFrame attribute in nsIHistoryEntry.idl
-			GetIsSubFrameTest(theHistoryEntry, displayMode);
-
-		}	// end for loop
-	}		// end outer else
-}
diff --git a/embedding/qa/testembed/nsiHistory.h b/embedding/qa/testembed/nsiHistory.h
deleted file mode 100644
index 5c05afa9658..00000000000
--- a/embedding/qa/testembed/nsiHistory.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// 
-// Header file for nsiHistory interface test cases
-
-#include "nsIHistoryEntry.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIHistory window
-
-class CNsIHistory
-{
-// Construction
-public:
-	CNsIHistory(nsIWebNavigation *mWebNav);
-
-// Attributes
-public:
-	// Mozilla interfaces
-	//
-	nsCOMPtr<nsIWebNavigation> qaWebNav;
-	nsCOMPtr<nsIURI> theURI;
-	//CTests *qaTests ;
-
-public:
-
-// Implementation
-public:
-	virtual ~CNsIHistory();
-
-public:
-
-	// individual nsISHistory tests
-	void GetCountTest(nsISHistory *, PRInt32 *, PRInt16);
-	void GetIndexTest(nsISHistory *, PRInt32 *, PRInt16);
-	void GetMaxLengthTest(nsISHistory *, PRInt32 *, PRInt16);
-	void SetMaxLengthTest(nsISHistory *, PRInt32, PRInt16);
-	void GetEntryAtIndexTest(nsISHistory *, nsIHistoryEntry *, PRInt32 theIndex, PRInt16);
-	void GetURIHistTest(nsIHistoryEntry *, PRInt16);
-	void GetTitleHistTest(nsIHistoryEntry *, PRInt16);
-	void GetIsSubFrameTest(nsIHistoryEntry *, PRInt16);
-	void GetSHEnumTest(nsISHistory*, nsISimpleEnumerator *, PRInt16);
-	void SimpleEnumTest(nsISimpleEnumerator *, PRInt16);
-	void PurgeHistoryTest(nsISHistory *, PRInt32, PRInt16);
-	void RunAllTests();
-	void OnStartTests(UINT nMenuID);
-	void RunAllHistoryEntryTests(PRInt16);
-	// Generated message map functions
-protected:
-
-};
-
-
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/embedding/qa/testembed/nsichanneltests.cpp b/embedding/qa/testembed/nsichanneltests.cpp
deleted file mode 100644
index fdc79e5267b..00000000000
--- a/embedding/qa/testembed/nsichanneltests.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// nsIChannelTests.h : implementation file for nsIChannel test cases
-
-// nsIChannelTests.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "testembed.h"
-#include "nsIChannelTests.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "UrlDialog.h"
-#include "ProfileMgr.h"
-#include "ProfilesDlg.h"
-#include "QaUtils.h"
-#include "Tests.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// nsIChannelTests
-
-CnsIChannelTests::CnsIChannelTests(nsIWebBrowser *mWebBrowser,
-								   CBrowserImpl *mpBrowserImpl)
-{
-	qaWebBrowser = mWebBrowser;
-	qaBrowserImpl = mpBrowserImpl;
-}
-
-CnsIChannelTests::~CnsIChannelTests()
-{
-}
-
-ChannelRow ChannelTable[] = {
-	{"http://www.netscape.com/", "text/plain"},
-	{"https://www.sun.com/",    "text/html"},
-	{"ftp://ftp.mozilla.org/",  "image/gif"},
-	{"gopher://gopher.tc.umn.edu/", "application/vnd.mozilla.xul+xml"},
-	{"http://www.mozilla.org/projects/embedding", "text/plain"},
-	{"file://C|/Program Files",  "image/jpeg"},
-	{"about:mozilla",   ""},
-	{"javascript:document.write('hi')", ""},
-	{"data:text/plain;charset=iso-8859-7,%be%fg%be", ""},
-	{"jar:resource:///chrome/toolkit.jar!/content/global/plugins.html",  ""},
-}; 
-
-/////////////////////////////////////////////////////////////////////////////
-// nsIChannelTests message handlers
-
-nsIChannel * CnsIChannelTests::GetChannelObject(nsCAutoString theSpec)
-{
-	theURI = GetURIObject(theSpec);
-	if (!theURI) 	
-	{
-	   QAOutput("Didn't get URI object. Test failed.", 2);
-	   return nsnull;
-	}
-	rv = NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
-	RvTestResult(rv, "NS_NewChannel", 1);
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get Channel object. GetChannelObject Test failed.", 2);
-	   return nsnull;
-	}
-	return theChannel;
-}
-
-nsIURI * CnsIChannelTests::GetURIObject(nsCAutoString theSpec)
-{
-	rv = NS_NewURI(getter_AddRefs(theURI), theSpec);
-	RvTestResult(rv, "NS_NewURI", 1);
-	if (!theURI)
-	{
-	   QAOutput("Didn't get URI object. GetURIObject Test failed.", 2);
-	   return nsnull;
-	}
-//	nsIURI *retVal = theURI;
-//	NS_ADDREF(retVal);
-//	return retVal;
-	return theURI;
-}
-
-void CnsIChannelTests::SetOriginalURITest(nsIChannel *theChannel, nsCAutoString theSpec,
-										  PRInt16 displayMode)
-{
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get Channel object. SetOriginalURITest failed.", 2);
-	   return;
-	}
-	theURI = GetURIObject(theSpec);
-	rv = theChannel->SetOriginalURI(theURI);
-	RvTestResult(rv, "SetOriginalURITest", displayMode);
-	if (displayMode == 1)
-		RvTestResultDlg(rv, "SetOriginalURITest", true);
-	if (!theURI)
-	   QAOutput("Didn't get URI object. SetOriginalURITest failed.", displayMode);
-}
-
-void CnsIChannelTests::GetOriginalURITest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get Channel object. GetOriginalURITest failed.", 2);
-	   return;
-	}
-	rv = theChannel->GetOriginalURI(getter_AddRefs(theURI));
-	RvTestResult(rv, "GetOriginalURITest", displayMode);
-	if (displayMode == 1)
-		RvTestResultDlg(rv, "GetOriginalURITest");
-	if (!theURI)
-	{
-	   QAOutput("Didn't get URI object. GetOriginalURITest failed.", displayMode);
-	   return;
-	}
-	GetTheURI(theURI);
-}
-
-void CnsIChannelTests::GetURITest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get Channel object. GetURITest failed.", 2);
-	   return;
-	}
-	rv = theChannel->GetURI(getter_AddRefs(theURI));
-	RvTestResult(rv, "GetURITest", displayMode);
-	if (displayMode == 1)
-		RvTestResultDlg(rv, "GetURITest");
-	if (!theURI)
-	{
-	   QAOutput("Didn't get URI object. GetURITest failed.", displayMode);
-	   return;
-	}
-	GetTheURI(theURI);
-}
-
-void CnsIChannelTests::SetOwnerTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get Channel object. SetOwnerTest failed.", 2);
-	   return;
-	}
-	theSupports = do_QueryInterface(qaWebBrowser);
-	rv = theChannel->SetOwner(theChannel);
-	RvTestResult(rv, "SetOwner", displayMode);
-	if (displayMode == 1)
-		RvTestResultDlg(rv, "SetOwner");
-	if (!theSupports)
-	   QAOutput("Didn't get nsISupports object. SetOwnerTest failed.", displayMode);
-}
-
-void CnsIChannelTests::GetOwnerTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get Channel object. GetOwnerTest failed.", 2);
-	   return;
-	}
-	rv = theChannel->GetOwner(getter_AddRefs(theSupports));
-	RvTestResult(rv, "GetOwner", displayMode);
-	if (displayMode == 1)
-		RvTestResultDlg(rv, "GetOwner");
-	if (!theSupports)
-	   QAOutput("Didn't get nsISupports object. GetOwnerTest failed.", displayMode);
-}
-
-void CnsIChannelTests::SetNotificationsTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get Channel object. SetNotificationsTest failed.", 2);
-	   return;
-	}
-	if (!qaWebBrowser)
-	{
-	   QAOutput("Didn't get nsIWebBrowser object. SetNotificationsTest failed.", displayMode);
-	   return;
-	}
-	theIRequestor = do_QueryInterface(qaWebBrowser);
-	rv = theChannel->SetNotificationCallbacks(theIRequestor);
-	RvTestResult(rv, "SetNotificationCallbacks", displayMode);
-	if (displayMode == 1)
-		RvTestResultDlg(rv, "SetNotificationCallbacks");
-	if (!theIRequestor)
-	   QAOutput("Didn't get nsIInterfaceRequestor object. SetNotificationsTest failed.", displayMode);
-}
-
-void CnsIChannelTests::GetNotificationsTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get Channel object. GetNotificationsTest failed.", 2);
-	   return;
-	}
-	rv = theChannel->GetNotificationCallbacks(getter_AddRefs(theIRequestor));
-	RvTestResult(rv, "GetNotificationCallbacks", displayMode);
-	if (displayMode == 1)
-		RvTestResultDlg(rv, "GetNotificationCallbacks");
-	if(!theIRequestor)
-	   QAOutput("Didn't get nsIInterfaceRequestor object. GetNotificationsTest failed.", displayMode);
-}
-
-void CnsIChannelTests::GetSecurityInfoTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. GetSecurityInfoTest failed.", displayMode);
-	   return;
-	}
-	theSupports = do_QueryInterface(qaWebBrowser);
-	rv = theChannel->GetSecurityInfo(getter_AddRefs(theSupports));	
-	RvTestResult(rv, "GetSecurityInfo", displayMode);
-	if (!theSupports)
-	   QAOutput("Didn't get nsISupports object for GetSecurityInfoTest.", displayMode);
-}
-
-void CnsIChannelTests::SetContentTypeTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. SetContentTypeTest failed.", displayMode);
-	   return;
-	}
-	rv = theChannel->SetContentType(NS_LITERAL_CSTRING("text/plain"));
-	RvTestResult(rv, "SetContentType", displayMode);	
-}
-
-void CnsIChannelTests::GetContentTypeTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	nsCAutoString contentType;
-
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. GetContentTypeTest failed.", displayMode);
-	   return;
-	}
-	rv = theChannel->GetContentType(contentType);
-	RvTestResult(rv, "GetContentType", displayMode);
-	FormatAndPrintOutput("the content type = ", contentType, displayMode);
-}
-
-void CnsIChannelTests::SetContentCharsetTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	nsCAutoString charsetType;
-
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. SetContentCharsetTest failed.", displayMode);
-	   return;
-	}
-	rv = theChannel->SetContentCharset(NS_LITERAL_CSTRING("ISO-8859-1"));
-	RvTestResult(rv, "SetContentCharset", displayMode);
-}
-
-void CnsIChannelTests::GetContentCharsetTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	nsCAutoString charsetType;
-
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. GetContentCharsetTest failed.", displayMode);
-	   return;
-	}
-	rv = theChannel->GetContentCharset(charsetType);
-	RvTestResult(rv, "GetContentCharset", displayMode);
-	FormatAndPrintOutput("the charset type = ", charsetType, displayMode);
-}
-
-void CnsIChannelTests::SetContentLengthTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	PRInt32 contentLength;
-
-	contentLength = 10000;
-
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. SetContentLengthTest failed.", displayMode);
-	   return;
-	}
-	rv = theChannel->SetContentLength(contentLength);
-	RvTestResult(rv, "SetContentLength", displayMode);
-}
-
-void CnsIChannelTests::GetContentLengthTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	PRInt32 contentLength;
-
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. GetContentLengthTest failed.", displayMode);
-	   return;
-	}
-	rv = theChannel->GetContentLength(&contentLength);
-	RvTestResult(rv, "GetContentLength", displayMode);
-	FormatAndPrintOutput("the content length = ", contentLength, displayMode);
-}
-
-void CnsIChannelTests::OpenTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. OpenTest failed.", displayMode);
-	   return;
-	}
-	rv =  theChannel->Open(getter_AddRefs(theInputStream));
-	RvTestResult(rv, "OpenTest", displayMode);
-	if (!theInputStream)
-	   QAOutput("Didn't get theInputStream object. OpenTest failed.", displayMode);
-}
-
-void CnsIChannelTests::AsyncOpenTest(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	nsCOMPtr<nsIStreamListener> listener(static_cast<nsIStreamListener*>(qaBrowserImpl));
-	nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
-	qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener));
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. AsyncOpenTest failed.", displayMode);
-	   return;
-	}
-	if (!listener) {
-	   QAOutput("Didn't get the stream listener object. AsyncOpenTest failed.", displayMode);
-	   return;
-	}
-	// this calls nsIStreamListener::OnDataAvailable()
-	theSupports = do_QueryInterface(theChannel);
-	if (!theSupports)
-	   QAOutput("Didn't get the nsISupports object. AsyncOpen() failed.", displayMode);
-
-	SaveObject(theSupports);
-
-	rv = theChannel->AsyncOpen(listener, theSupports);
-	RvTestResult(rv, "AsyncOpen()", displayMode);
-	if (displayMode == 1)
-		RvTestResultDlg(rv, "AsyncOpen()");
-}
-
-void CnsIChannelTests::PostAsyncOpenTests(nsIChannel *theChannel, PRInt16 displayMode)
-{
-	// These tests are run after the channel is opened (using AsyncOpen())
-	// To run them in TestEmbed, select Tests > asyncOpen menu and enter complete URL with protocol
-		GetOriginalURITest(theChannel, displayMode);
-		GetURITest(theChannel, displayMode);
-		SetOwnerTest(theChannel, displayMode);
-		GetOwnerTest(theChannel, displayMode);
-		SetNotificationsTest(theChannel, displayMode);
-		GetNotificationsTest(theChannel, displayMode);
-		GetSecurityInfoTest(theChannel, displayMode);
-		SetContentTypeTest(theChannel, displayMode);
-		GetContentTypeTest(theChannel, displayMode);
-		SetContentCharsetTest(theChannel, displayMode);
-		GetContentCharsetTest(theChannel, displayMode);
-		SetContentLengthTest(theChannel, displayMode);
-		GetContentLengthTest(theChannel, displayMode);
-}
-
-void CnsIChannelTests::OnStartTests(UINT nMenuID)
-{
-	theSpec = "http://www.netscape.com";
-	theChannel = GetChannelObject(theSpec);
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. Test not run.", 1);
-	   return;
-	}
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSICHANNEL_RUNALLTESTS :
-			RunAllTests();
-			break ;
-		case ID_INTERFACES_NSICHANNEL_SETORIGINALURI :
-			SetOriginalURITest(theChannel, theSpec, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_GETORIGINALURI :
-			GetOriginalURITest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_GETURI  :
-			GetURITest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_SETOWNER :
-			SetOwnerTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_GETOWNER :
-			GetOwnerTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_SETNOTIFICATIONS :
-			SetNotificationsTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_GETNOTIFICATIONS  :
-			GetNotificationsTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_GETSECURITYINFO  :
-			AsyncOpenTest(theChannel, 1);
-			GetSecurityInfoTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_SETCONTENTTYPE :
-			AsyncOpenTest(theChannel, 1);
-			SetContentTypeTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_GETCONTENTTYPE :
-			AsyncOpenTest(theChannel, 1);
-			GetContentTypeTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_SETCONTENTCHARSET  :
-			AsyncOpenTest(theChannel, 1);
-			SetContentCharsetTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_GETCONTENTCHARSET :
-			AsyncOpenTest(theChannel, 1);
-			GetContentCharsetTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_SETCONTENTLENGTH :
-			AsyncOpenTest(theChannel, 1);
-			SetContentLengthTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_GETCONTENTLENGTH :
-			AsyncOpenTest(theChannel, 1);
-			GetContentLengthTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_OPEN  :
-			OpenTest(theChannel, 2);
-			break ;
-		case ID_INTERFACES_NSICHANNEL_ASYNCOPEN  :
-			AsyncOpenTest(theChannel, 2);
-			break ;
-	}
-}
-
-void CnsIChannelTests::RunAllTests()
-{
-	int i;
-
-	for (i=0; i<10; i++)
-	{
-		theSpec = ChannelTable[i].theURL;
-		theChannel = GetChannelObject(theSpec);
-		if (!theChannel)
-		{
-		   QAOutput("Didn't get nsIChannel object. RunAllTests not run.", 2);
-		   return;
-		}
-		QAOutput("\nStart nsIChannel Tests: ");
-		SetOriginalURITest(theChannel, theSpec, 1);
-		GetOriginalURITest(theChannel, 1);
-		GetURITest(theChannel, 1);
-		SetOwnerTest(theChannel, 1);
-		GetOwnerTest(theChannel, 1);
-		SetNotificationsTest(theChannel, 1);
-		GetNotificationsTest(theChannel, 1);
-		AsyncOpenTest(theChannel, 1);
-	 // PostAsyncOpenTests() called from nsIRequestObserver::OnStartRequest (in BrowserImpl.cpp)
-		QAOutput("\n");
-	}
-}
\ No newline at end of file
diff --git a/embedding/qa/testembed/nsichanneltests.h b/embedding/qa/testembed/nsichanneltests.h
deleted file mode 100644
index 3b7b5ac7016..00000000000
--- a/embedding/qa/testembed/nsichanneltests.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// nsIChannelTests.h : header file for nsIChannel test cases
-
-#include "Tests.h"
-
-#if !defined(AFX_NSICHANNELTESTS_H__33C5EBD3_0178_11D7_9C13_00C04FA02BE6__INCLUDED_)
-#define AFX_NSICHANNELTESTS_H__33C5EBD3_0178_11D7_9C13_00C04FA02BE6__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-// nsIChannelTests.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// nsIChannelTests window
-
-class CnsIChannelTests
-{
-// Construction
-public:
-	CnsIChannelTests(nsIWebBrowser* mWebBrowser, CBrowserImpl *mpBrowserImpl);
-
-// Attributes
-public:
-
-// Operations
-public:
-
-// Implementation
-	nsIChannel * GetChannelObject(nsCAutoString);
-	nsIURI * GetURIObject(nsCAutoString);
-	void SetOriginalURITest(nsIChannel *, nsCAutoString, PRInt16);
-	void GetOriginalURITest(nsIChannel *, PRInt16);
-	void GetURITest(nsIChannel *, PRInt16);
-	void SetOwnerTest(nsIChannel *, PRInt16);
-	void GetOwnerTest(nsIChannel *, PRInt16);
-	void SetNotificationsTest(nsIChannel *, PRInt16);
-	void GetNotificationsTest(nsIChannel *, PRInt16);
-	void GetSecurityInfoTest(nsIChannel *, PRInt16);
-	void SetContentTypeTest(nsIChannel *, PRInt16);
-	void GetContentTypeTest(nsIChannel *, PRInt16);
-	void SetContentCharsetTest(nsIChannel *, PRInt16);
-	void GetContentCharsetTest(nsIChannel *, PRInt16);
-	void SetContentLengthTest(nsIChannel *, PRInt16);
-	void GetContentLengthTest(nsIChannel *, PRInt16);
-	void OpenTest(nsIChannel *, PRInt16);
-	void AsyncOpenTest(nsIChannel *, PRInt16);
-	void PostAsyncOpenTests(nsIChannel *, PRInt16);
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests();
-public:
-	virtual ~CnsIChannelTests();
-
-	// Generated message map functions
-protected:
-
-private:
-	CBrowserImpl *qaBrowserImpl;
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser;
-	nsCOMPtr<nsIChannel> theChannel;
-	nsCOMPtr<nsIURI> theURI;
-	nsCOMPtr<nsISupports> theSupports;
-	nsCOMPtr<nsIInterfaceRequestor> theIRequestor;
-	nsCOMPtr<nsIInputStream> theInputStream;
-	nsCAutoString theSpec;
-};
-
-typedef struct
-{
-	char		theURL[1024];
-	char		contentType[1024];	
-} ChannelRow;
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_NSICHANNELTESTS_H__33C5EBD3_0178_11D7_9C13_00C04FA02BE6__INCLUDED_)
diff --git a/embedding/qa/testembed/nsihttpchanneltests.cpp b/embedding/qa/testembed/nsihttpchanneltests.cpp
deleted file mode 100644
index 1580af669ee..00000000000
--- a/embedding/qa/testembed/nsihttpchanneltests.cpp
+++ /dev/null
@@ -1,530 +0,0 @@
-// nsIHttpChannelTests.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "testembed.h"
-#include "nsIHttpChannelTests.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "UrlDialog.h"
-#include "ProfileMgr.h"
-#include "ProfilesDlg.h"
-#include "QaUtils.h"
-#include "Tests.h"
-#include "nsichanneltests.h"
-#include "nsIHttpHeaderVisitor.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// nsIHttpChannelTests
-
-CnsIHttpChannelTests::CnsIHttpChannelTests(nsIWebBrowser *mWebBrowser,
-								   CBrowserImpl *mpBrowserImpl)
-{
-	qaWebBrowser = mWebBrowser;
-	qaBrowserImpl = mpBrowserImpl;
-}
-
-CnsIHttpChannelTests::~CnsIHttpChannelTests()
-{
-}
-
-class HeaderVisitor : public nsIHttpHeaderVisitor
-{
-public:
-   NS_DECL_ISUPPORTS
-   NS_DECL_NSIHTTPHEADERVISITOR
- 
-   HeaderVisitor() { }
-   virtual ~HeaderVisitor() {}
- };
-
-NS_IMPL_ISUPPORTS1(HeaderVisitor, nsIHttpHeaderVisitor)
-
-NS_IMETHODIMP
-HeaderVisitor::VisitHeader(const nsACString &header, const nsACString &value)
-{
-   FormatAndPrintOutput("VisitHeader header = ", PromiseFlatCString(header).get(), 1);
-   FormatAndPrintOutput("VisitHeader value = ", PromiseFlatCString(value).get(), 1);
-return NS_OK;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CnsIHttpChannelTests message handlers
-
-nsIHttpChannel * CnsIHttpChannelTests::GetHttpChannelObject(nsCAutoString theSpec)
-{
-	NS_NewURI(getter_AddRefs(theURI), theSpec);
-	if (!theURI) 	
-	   QAOutput("Didn't get URI object. Test failed.", 2);
-	NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
-	if (!theChannel)
-	   QAOutput("Didn't get Channel object. GetChannelObject Test failed.", 2);
-
-	theHttpChannel = do_QueryInterface(theChannel);
-	if (!theHttpChannel)
-	   QAOutput("Didn't get httpChannel object. Test failed.", 2);
-
-	return theHttpChannel;
-}
-
-void CnsIHttpChannelTests::OnStartTests(UINT nMenuID)
-{
-	theSpec = "http://www.netscape.com";
-	theHttpChannel = GetHttpChannelObject(theSpec);
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. Test not run.", 1);
-	   return;
-	}
-	switch(nMenuID)
-	{
-		case ID_INTERFACES_NSIHTTPCHANNEL_RUNALLTESTS :
-			RunAllTests();
-			break ;
-		case ID_INTERFACES_NSIHTTPCHANNEL_SETREQUESTMETHOD :
-			SetRequestMethodTest(theHttpChannel, "PUT", 2);
-			break ;
-		case ID_INTERFACES_NSIHTTPCHANNEL_GETREQUESTMETHOD :
-			GetRequestMethodTest(theHttpChannel, 2);
-			break ;
-		case ID_INTERFACES_NSIHTTPCHANNEL_SETREFERRER :
-			SetReferrerTest(theHttpChannel, "https://www.sun.com", 2);
-			break ;
-		case ID_INTERFACES_NSIHTTPCHANNEL_GETREFERRER :
-			GetReferrerTest(theHttpChannel, 2);
-			break ;
-		case ID_INTERFACES_NSIHTTPCHANNEL_SETREQUESTHEADER :
-			SetRequestHeaderTest(theHttpChannel, "Content-Type", "text/html", 2);
-			break ;
-		case ID_INTERFACES_NSIHTTPCHANNEL_GETREQUESTHEADER :
-			GetRequestHeaderTest(theHttpChannel, "Content-Type", 2);
-			break ;
-		case ID_INTERFACES_NSIHTTPCHANNEL_VISITREQUESTHEADERS :
-			VisitRequestHeadersTest(theHttpChannel, 2);
-			break;
-		case ID_INTERFACES_NSIHTTPCHANNEL_SETALLOWPIPELINING :
-			SetAllowPipeliningTest(theHttpChannel, PR_FALSE, 2);
-			break;
-		case ID_INTERFACES_NSIHTTPCHANNEL_GETALLOWPIPELINING :
-			GetAllowPipeliningTest(theHttpChannel, 2);
-			break;
-		case ID_INTERFACES_NSIHTTPCHANNEL_SETREDIRECTIONLIMIT :
-			SetRedirectionLimitTest(theHttpChannel, 100, 2);
-			break;
-		case ID_INTERFACES_NSIHTTPCHANNEL_GETREDIRECTIONLIMIT :
-			GetRedirectionLimitTest(theHttpChannel, 2);
-			break;
-
-			// response methods
-
-		case ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUS :
-			GetResponseStatusTest(theHttpChannel, 2);
-			break;
-		case ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUSTEXT :
-			GetResponseStatusTextTest(theHttpChannel, 2);
-			break;
-	}
-}
-
-void CnsIHttpChannelTests::RunAllTests()
-{
-	theSpec = "http://www.netscape.com";
-	theHttpChannel = GetHttpChannelObject(theSpec);
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. RunAllTests not run.", 1);
-	   return;
-	}
-	QAOutput("   nsIHttpChannel request tests:");
-	SetRequestMethodTest(theHttpChannel, "get", 1);
-	GetRequestMethodTest(theHttpChannel, 1);
-	SetRequestMethodTest(theHttpChannel, "PUT", 1);
-	GetRequestMethodTest(theHttpChannel, 1);
-	SetRequestMethodTest(theHttpChannel, "POST", 1);
-	GetRequestMethodTest(theHttpChannel, 1);
-	SetRequestMethodTest(theHttpChannel, "HEAD", 1);
-	GetRequestMethodTest(theHttpChannel, 1);
-	SetReferrerTest(theHttpChannel, "http://www.cisco.com", 1);
-	GetReferrerTest(theHttpChannel, 1);
-	SetRequestHeaderTest(theHttpChannel, "Cookie", "TheCookie", 1);
-	GetRequestHeaderTest(theHttpChannel, "Cookie", 1);
-	SetRequestHeaderTest(theHttpChannel, "Content-Type", "text/xml", 1);
-	GetRequestHeaderTest(theHttpChannel, "Content-Type", 1);
-	SetRequestHeaderTest(theHttpChannel, "Content-Length", "10000", 1);
-	GetRequestHeaderTest(theHttpChannel, "Content-Length", 1);
-	VisitRequestHeadersTest(theHttpChannel, 1);
-	SetAllowPipeliningTest(theHttpChannel, PR_FALSE, 1);
-	SetAllowPipeliningTest(theHttpChannel, PR_TRUE, 1);
-	GetAllowPipeliningTest(theHttpChannel, 1);
-	SetRedirectionLimitTest(theHttpChannel, 0, 1);
-	SetRedirectionLimitTest(theHttpChannel, 5, 1);
-	GetRedirectionLimitTest(theHttpChannel, 1);
-
-	// see nsIRequestObserver->OnStartRequest for response tests
-	CnsIChannelTests *channelObj = new CnsIChannelTests(qaWebBrowser, qaBrowserImpl);
-	if (!channelObj)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. GetChannelObject will not be run.", 1);
-	   return;
-	}
-	theChannel = channelObj->GetChannelObject(theSpec);
-	if (!theChannel)
-	{
-	   QAOutput("Didn't get nsIChannel object. AsyncOpenTest will not be run.", 1);
-	   return;
-	}
-	// this will open the channel and run the httpChannel response tests
-	channelObj->AsyncOpenTest(theChannel, 1);
-	QAOutput("\n");
-}
-
-void  CnsIHttpChannelTests::SetRequestMethodTest(nsIHttpChannel *theHttpChannel,
-												 const char * requestType,
-												 PRInt16 displayMode)
-{ 
-	// SetRequestMethod
-	// try "GET", "PUT", "HEAD", or "POST"
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. SetRequestMethodTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->SetRequestMethod(nsDependentCString(requestType));
-	RvTestResult(rv, "SetRequestMethod()", displayMode);
-	RvTestResultDlg(rv, "SetRequestMethod() test", true);
-}
-
-void  CnsIHttpChannelTests::GetRequestMethodTest(nsIHttpChannel *theHttpChannel,
-												 PRInt16 displayMode)
-{
-	// GetRequestMethod
-	nsCAutoString method;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. GetRequestMethodTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->GetRequestMethod(method);
-	RvTestResult(rv, "GetRequestMethod()", displayMode);
-	RvTestResultDlg(rv, "GetRequestMethod() test");
-	// if (method.Equals("POST")
-	FormatAndPrintOutput("GetRequestMethod method = ", method, displayMode);
-}
-
-void CnsIHttpChannelTests::SetReferrerTest(nsIHttpChannel *theHttpChannel,
-												 const char *theUrl,
-												 PRInt16 displayMode)
-{
-	// SetReferrer
-	nsCAutoString theSpec;
-	theSpec = theUrl;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. SetReferrerTest failed.", displayMode);
-	   return;
-	}
-	NS_NewURI(getter_AddRefs(theURI), theSpec);
-	if (!theURI) 	
-	   QAOutput("Didn't get URI object. Test failed.", 2);
-	rv = theHttpChannel->SetReferrer(theURI);
-	RvTestResult(rv, "SetReferrer()", displayMode);
-	RvTestResultDlg(rv, "SetReferrer() test");
-}
-
-void CnsIHttpChannelTests::GetReferrerTest(nsIHttpChannel *theHttpChannel,
-												 PRInt16 displayMode)
-{
-	// GetReferrer
-	nsCAutoString theSpec;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. GetReferrerTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->GetReferrer(getter_AddRefs(theURI));
-	RvTestResult(rv, "GetReferrer()", displayMode);
-	RvTestResultDlg(rv, "GetReferrer() test");
-	if (!theURI)
-	   QAOutput("Didn't get nsIURI object. Test failed.", displayMode);
-	else {
-	   theURI->GetSpec(theSpec);
-	   FormatAndPrintOutput("GetReferrerTest uri = ", theSpec, displayMode);	   
-	}
-}
-
-void  CnsIHttpChannelTests::SetRequestHeaderTest(nsIHttpChannel *theHttpChannel,
-												 const char *requestType,
-												 const char *headerVal,
-												 PRInt16 displayMode)
-{
-	// SetRequestHeader
-	// try {"Content-Type","text/xml"}, {"Content-Length", 10000}, and
-	//     {"Accept"), NS_LITERAL_CSTRING("text/xml,application/xml,application/xhtml+xml,*/*;q=0.1"),
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. SetRequestHeaderTest failed.", displayMode);
-	   return;
-	}
-    rv = theHttpChannel->SetRequestHeader(nsDependentCString(requestType),
-                                         nsDependentCString(headerVal),
-                                         PR_FALSE);
-	RvTestResult(rv, "SetRequestHeader()", displayMode);
-	RvTestResultDlg(rv, "SetRequestHeader() test");
-}
-
-void  CnsIHttpChannelTests::GetRequestHeaderTest(nsIHttpChannel *theHttpChannel,
-												 const char *requestType,
-												 PRInt16 displayMode)
-{
-	// GetRequestHeader
-	nsCAutoString header;
-	// could be set to "referrer"
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. GetRequestHeaderTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->GetRequestHeader(nsDependentCString(requestType), header);
-	RvTestResult(rv, "GetRequestHeader()", displayMode);
-	RvTestResultDlg(rv, "GetRequestHeader() test");
-	FormatAndPrintOutput("GetRequestHeader type = ", header, displayMode);
-}
-
-void  CnsIHttpChannelTests::VisitRequestHeadersTest(nsIHttpChannel *theHttpChannel,
-												    PRInt16 displayMode)
-{
-	// visitRequestHeaders()
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. VisitRequestHeadersTest failed.", displayMode);
-	   return;
-	}
-	HeaderVisitor *theVisitor = new HeaderVisitor();
-	if (!theVisitor)
-	   QAOutput("Didn't get nsIHttpHeaderVisitor object. Test failed.", displayMode);
-
-	rv = theHttpChannel->VisitRequestHeaders(theVisitor);
-	RvTestResult(rv, "VisitRequestHeaders()", displayMode);
-	RvTestResultDlg(rv, "VisitRequestHeaders() test");
-}
-
-void  CnsIHttpChannelTests::SetAllowPipeliningTest(nsIHttpChannel *theHttpChannel,
-											   PRBool mAllowPipelining,
-											   PRInt16 displayMode)
-{
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. SetAllowPipeliningTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->SetAllowPipelining(mAllowPipelining);
-	RvTestResult(rv, "SetAllowPipelining()", displayMode);
-	RvTestResultDlg(rv, "SetAllowPipelining() test");
-	FormatAndPrintOutput("SetAllowPipelining value = ", mAllowPipelining, displayMode);
-
-	rv = theHttpChannel->GetAllowPipelining(&mAllowPipelining);
-	FormatAndPrintOutput("GetAllowPipelining value = ", mAllowPipelining, displayMode);
-}
-
-void  CnsIHttpChannelTests::GetAllowPipeliningTest(nsIHttpChannel *theHttpChannel,
-												   PRInt16 displayMode)
-{
-	PRBool mAllowPipelining;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. GetAllowPipeliningTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->GetAllowPipelining(&mAllowPipelining);
-	RvTestResult(rv, "GetAllowPipelining()", displayMode);
-	RvTestResultDlg(rv, "GetAllowPipelining() test");
-	FormatAndPrintOutput("GetAllowPipelining value = ", mAllowPipelining, displayMode);
-}
-
-void  CnsIHttpChannelTests::SetRedirectionLimitTest(nsIHttpChannel *theHttpChannel,
-												   PRUint32 mRedirectionLimit,
-												   PRInt16 displayMode)
-{
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. SetRedirectionLimitTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->SetRedirectionLimit(mRedirectionLimit);
-	RvTestResult(rv, "SetRedirectionLimit()", displayMode);
-	RvTestResultDlg(rv, "SetRedirectionLimit() test");
-}
-
-void  CnsIHttpChannelTests::GetRedirectionLimitTest(nsIHttpChannel *theHttpChannel,
-												    PRInt16 displayMode)
-{
-	PRUint32 mRedirectionLimit;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. GetRedirectionLimitTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->GetRedirectionLimit(&mRedirectionLimit);
-	RvTestResult(rv, "GetRedirectionLimit()", displayMode);
-	RvTestResultDlg(rv, "GetRedirectionLimit() test");
-	FormatAndPrintOutput("GetRedirectionLimit value = ", mRedirectionLimit, displayMode);
-}
-
-// Response tests
-// called from OnStartRequest
-
-void CnsIHttpChannelTests::CallResponseTests(nsIHttpChannel *theHttpChannel,
-												 PRInt16 displayMode)
-{
-	GetResponseStatusTest(theHttpChannel, displayMode);
-	GetResponseStatusTextTest(theHttpChannel, displayMode);
-	GetRequestSucceededTest(theHttpChannel, displayMode);
-	SetResponseHeaderTest(theHttpChannel, "Refresh", "1001", PR_TRUE, displayMode);
-	GetResponseHeaderTest(theHttpChannel, "Refresh", displayMode);
-	SetResponseHeaderTest(theHttpChannel, "Set-Cookie", "MyCookie", PR_TRUE, displayMode);
-	GetResponseHeaderTest(theHttpChannel, "Set-Cookie", displayMode);
-	SetResponseHeaderTest(theHttpChannel, "Cache-control", "no-cache", PR_FALSE, displayMode);
-	GetResponseHeaderTest(theHttpChannel, "Cache-control", displayMode);
-	VisitResponseHeaderTest(theHttpChannel, displayMode);
-	IsNoStoreResponseTest(theHttpChannel, displayMode);
-	IsNoCacheResponseTest(theHttpChannel, displayMode);
-}
-
-void CnsIHttpChannelTests::GetResponseStatusTest(nsIHttpChannel *theHttpChannel,
-												 PRInt16 displayMode)
-{
-	PRUint32 mResponseStatus;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. GetResponseStatusTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->GetResponseStatus(&mResponseStatus);
-	RvTestResult(rv, "GetResponseStatus()", displayMode);
-	FormatAndPrintOutput("GetResponseStatus value = ", mResponseStatus, displayMode);
-}
-
-void CnsIHttpChannelTests::GetResponseStatusTextTest(nsIHttpChannel *theHttpChannel,
-												 PRInt16 displayMode)
-{
-	nsCAutoString mText;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. GetResponseStatusTextTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->GetResponseStatusText(mText);
-	RvTestResult(rv, "GetResponseStatusText()", displayMode);
-	FormatAndPrintOutput("GetResponseStatusText = ", mText, displayMode);
-}
-
-
-void CnsIHttpChannelTests::GetRequestSucceededTest(nsIHttpChannel *theHttpChannel,
-												 PRInt16 displayMode)
-{
-	PRBool mRequest;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. GetRequestSucceededTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->GetRequestSucceeded(&mRequest);
-	RvTestResult(rv, "GetRequestSucceeded()", displayMode);
-	FormatAndPrintOutput("GetRequestSucceeded = ", mRequest, displayMode);
-}
-
-void CnsIHttpChannelTests::GetResponseHeaderTest(nsIHttpChannel *theHttpChannel,
-												 const char * responseType,
-												 PRInt16 displayMode)
-{
-	nsCAutoString mResponse;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. GetResponseHeaderTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->GetResponseHeader(nsDependentCString(responseType), mResponse);
-	RvTestResult(rv, "GetResponseHeader()", displayMode);
-	FormatAndPrintOutput("GetResponseHeader = ", mResponse, displayMode);
-	FormatAndPrintOutput("GetResponseHeader response type = ", responseType, displayMode);
-}
- 
-void CnsIHttpChannelTests::SetResponseHeaderTest(nsIHttpChannel *theHttpChannel,
-												 const char * responseType,
-												 const char * value,
-												 PRBool merge, PRInt16 displayMode)
-{
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. SetResponseHeaderTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->SetResponseHeader(nsDependentCString(responseType),
-                                           nsDependentCString(value), merge);
-	RvTestResult(rv, "SetResponseHeader()", displayMode);
-	FormatAndPrintOutput("SetResponseHeader value = ", value, displayMode);
-	FormatAndPrintOutput("SetResponseHeader response type = ", responseType, displayMode);
-}
-
-void CnsIHttpChannelTests::VisitResponseHeaderTest(nsIHttpChannel *theHttpChannel,
-												   PRInt16 displayMode)
-{
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. VisitResponseHeaderTest failed.", displayMode);
-	   return;
-	}
-	// visitResponseHeaders()
-	HeaderVisitor *theVisitor = new HeaderVisitor();
-	if (!theVisitor)
-	   QAOutput("Didn't get nsIHttpHeaderVisitor object. Test failed.", displayMode);
-
-	rv = theHttpChannel->VisitResponseHeaders(theVisitor);
-	RvTestResult(rv, "VisitResponseHeaders()", displayMode);
-}
-
-void CnsIHttpChannelTests::IsNoStoreResponseTest(nsIHttpChannel *theHttpChannel,
-												 PRInt16 displayMode)
-{
-	PRBool mNoResponse;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. IsNoStoreResponseTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->IsNoStoreResponse(&mNoResponse);
-	RvTestResult(rv, "IsNoStoreResponse()", displayMode);
-	FormatAndPrintOutput("IsNoStoreResponse = ", mNoResponse, displayMode);
-}
-
-void CnsIHttpChannelTests::IsNoCacheResponseTest(nsIHttpChannel *theHttpChannel,
-												 PRInt16 displayMode)
-{
-	PRBool mNoResponse;
-
-	if (!theHttpChannel)
-	{
-	   QAOutput("Didn't get nsIHttpChannel object. IsNoCacheResponseTest failed.", displayMode);
-	   return;
-	}
-	rv = theHttpChannel->IsNoCacheResponse(&mNoResponse);
-	RvTestResult(rv, "IsNoCacheResponse()", displayMode);
-	FormatAndPrintOutput("IsNoCacheResponse = ", mNoResponse, displayMode);
-}
\ No newline at end of file
diff --git a/embedding/qa/testembed/nsihttpchanneltests.h b/embedding/qa/testembed/nsihttpchanneltests.h
deleted file mode 100644
index 3204f291d96..00000000000
--- a/embedding/qa/testembed/nsihttpchanneltests.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#if !defined(AFX_NSIHTTPCHANNELTESTS_H__A7985BC6_9A57_453F_BEE4_17A083131427__INCLUDED_)
-#define AFX_NSIHTTPCHANNELTESTS_H__A7985BC6_9A57_453F_BEE4_17A083131427__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// nsIHttpChannelTests.h : header file
-//
-
-#include "Tests.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// nsIHttpChannelTests window
-
-class CnsIHttpChannelTests
-{
-// Construction
-public:
-	CnsIHttpChannelTests(nsIWebBrowser* mWebBrowser, CBrowserImpl *mpBrowserImpl);
-
-// Attributes
-
-	nsIHttpChannel * GetHttpChannelObject(nsCAutoString);
-	void OnStartTests(UINT nMenuID);
-	void RunAllTests();
-	void SetRequestMethodTest(nsIHttpChannel *, const char *, PRInt16);
-	void GetRequestMethodTest(nsIHttpChannel *, PRInt16);
-	void SetReferrerTest(nsIHttpChannel *, const char *, PRInt16);
-	void GetReferrerTest(nsIHttpChannel *, PRInt16);
-	void SetRequestHeaderTest(nsIHttpChannel *, const char *, const char *, PRInt16);
-	void GetRequestHeaderTest(nsIHttpChannel *, const char *, PRInt16);
-	void VisitRequestHeadersTest(nsIHttpChannel *, PRInt16);
-	void SetAllowPipeliningTest(nsIHttpChannel *, PRBool, PRInt16);
-	void GetAllowPipeliningTest(nsIHttpChannel *, PRInt16);
-	void SetRedirectionLimitTest(nsIHttpChannel *, PRUint32, PRInt16);
-	void GetRedirectionLimitTest(nsIHttpChannel *, PRInt16);
-
-	// response methods
-	void CallResponseTests(nsIHttpChannel *, PRInt16);
-	void GetResponseStatusTest(nsIHttpChannel *, PRInt16);
-	void GetResponseStatusTextTest(nsIHttpChannel *, PRInt16);
-	void GetRequestSucceededTest(nsIHttpChannel *, PRInt16);
-	void GetResponseHeaderTest(nsIHttpChannel *, const char *, PRInt16);
-	void SetResponseHeaderTest(nsIHttpChannel *, const char *, const char *, PRBool, PRInt16);
-	void VisitResponseHeaderTest(nsIHttpChannel *, PRInt16);
-	void IsNoStoreResponseTest(nsIHttpChannel *, PRInt16);
-	void IsNoCacheResponseTest(nsIHttpChannel *, PRInt16);
-public:
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(nsIHttpChannelTests)
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CnsIHttpChannelTests();
-
-	// Generated message map functions
-protected:
-
-private:
-	CBrowserImpl *qaBrowserImpl;
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser;
-	nsCOMPtr<nsIChannel> theChannel;
-	nsCOMPtr<nsIURI> theURI;
-	nsCOMPtr<nsIHttpChannel> theHttpChannel;
-	nsCAutoString theSpec;
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_NSIHTTPCHANNELTESTS_H__A7985BC6_9A57_453F_BEE4_17A083131427__INCLUDED_)
diff --git a/embedding/qa/testembed/nsirequest.cpp b/embedding/qa/testembed/nsirequest.cpp
deleted file mode 100644
index a951cf195ef..00000000000
--- a/embedding/qa/testembed/nsirequest.cpp
+++ /dev/null
@@ -1,354 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-//
-// Test cases for the nsiRequest Interface
-
-#include "stdafx.h"
-#include "TestEmbed.h"
-#include "BrowserImpl.h"
-#include "BrowserFrm.h"
-#include "UrlDialog.h"
-#include "ProfileMgr.h"
-#include "ProfilesDlg.h"
-#include "QaUtils.h"
-#include "nsirequest.h"
-#include <stdio.h>
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIRequest
-
-
-CNsIRequest::CNsIRequest(nsIWebBrowser* mWebBrowser,CBrowserImpl *mpBrowserImpl)
-{
-	qaWebBrowser = mWebBrowser ;
-	qaBrowserImpl = mpBrowserImpl ;
-}
-
-
-CNsIRequest::~CNsIRequest()
-{
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIRequest message handlers
-// ***********************************************************************
-// ***********************************************************************
-//  nsIRequest iface
-
-//  table columns corrsp to: pending, status, suspend, resume, cancel,
-//  setLoadGroup & getLoadGroup tests respectively.
-
-Element ReqTable[] = {
-	{"http://www.netscape.com/", 1, 1, 0, 0, 0, 1, 1},
-	{"http://www.yahoo.com/",    0, 0, 1, 1, 0, 0, 0},
-	{"http://www.cisco.com/",    0, 0, 0, 0, 1, 0, 0},
-	{"http://www.sun.com/",      0, 0, 0, 0, 0, 1, 1},
-	{"http://www.intel.com/",    1, 1, 1, 0, 0, 0, 0},
-	{"http://www.aol.com/",      0, 1, 0, 0, 0, 1, 1},
-	{"https://www.yahoo.com/",   1, 1, 1, 1, 0, 1, 1},
-	{"data:text/plain;charset=iso-8859-7,%be%fg%be",
-								 1, 1, 1, 1, 0, 1, 1},
-	{"file://C|/Program Files/", 1, 1, 1, 1, 0, 1, 1},
-	{"ftp://ftp.netscape.com/",  1, 1, 1, 1, 0, 1, 1},
-	{"ftp://ftp.mozilla.org/",   0, 0, 0, 0, 1, 0, 0},
-};
-
-void CNsIRequest::OnStartTests(UINT nMenuID)
-{
-	if (nMenuID == ID_INTERFACES_NSIREQUEST_RUNALLTESTS)
-		RunAllTests(9);
-	else
-		RunIndividualTests(nMenuID, 9);
-}
- 
-void CNsIRequest::RunIndividualTests(UINT nMenuID, int reqTotal)
-{
-	nsCOMPtr<nsIChannel> theChannel;
-	nsCOMPtr<nsILoadGroup> theLoadGroup(do_CreateInstance(NS_LOADGROUP_CONTRACTID));
-	nsCOMPtr<nsIURI> theURI;
-	if (!theLoadGroup)
-	{
-		QAOutput("We didn't get the Load Group. Test failed.", 2);
-		return;
-	}
-	int i=0;
-
-    QAOutput("Start selected nsIRequest test.", 2);	
-
-	for (i=0; i<reqTotal; i++)
-	{
-		// nsIRequest individual tests
-
-		QAOutput("********** Individual nsIRequest test begins. **********");
-
-		theChannel = GetTheChannel(i, theLoadGroup);
-		nsCOMPtr<nsIRequest> theRequest = do_QueryInterface(theChannel);
-
-		switch(nMenuID)
-		{
-			
-		case ID_INTERFACES_NSIREQUEST_GETNAME :
-			break;
-		case ID_INTERFACES_NSIREQUEST_ISPENDING :
-			IsPendingReqTest(theRequest);
-			break;
-		case ID_INTERFACES_NSIREQUEST_GETSTATUS :
-			GetStatusReqTest(theRequest);
-			break;
-		case ID_INTERFACES_NSIREQUEST_CANCEL :
-			CancelReqTest(theRequest);	
-			break;
-		case ID_INTERFACES_NSIREQUEST_SUSPEND :
-			SuspendReqTest(theRequest);	
-			break;
-		case ID_INTERFACES_NSIREQUEST_RESUME :
-			ResumeReqTest(theRequest);	
-			break;
-		case ID_INTERFACES_NSIREQUEST_GETLOADGROUP :
-			GetLoadGroupTest(theRequest);
-			break;
-		case ID_INTERFACES_NSIREQUEST_SETLOADGROUP :
-			SetLoadGroupTest(theRequest, theLoadGroup);	
-			break;
-		case ID_INTERFACES_NSIREQUEST_GETLOADFLAGS :
-			break;
-		case ID_INTERFACES_NSIREQUEST_SETLOADFLAGS :
-			break;
-		}
-
-	} // end for loop
-}
-
-
-void CNsIRequest::RunAllTests(int reqTotal) 
-{
-	// note: nsIRequest tests are called:
-	// 1) in BrowserImpl.cpp, nsIStreamListener::OnDataAvailable()
-	// 2) as individual tests below
-
-	nsCOMPtr<nsIChannel> theChannel;
-	nsCOMPtr<nsILoadGroup> theLoadGroup(do_CreateInstance(NS_LOADGROUP_CONTRACTID));
-	if (!theLoadGroup)
-	{
-		QAOutput("We didn't get the Load Group. Test failed.", 2);
-		return;
-	}
-
-	int i=0;
-
-    QAOutput("Start nsIRequest tests.", 1);	
-
-	for (i=0; i<reqTotal; i++)
-	{
-		// nsIRequest individual tests
-
-		QAOutput("********** Individual nsIRequest test begins. **********");
-
-		theChannel = GetTheChannel(i, theLoadGroup);
-		nsCOMPtr<nsIRequest> theRequest = do_QueryInterface(theChannel);
-
-		if (ReqTable[i].reqPend == TRUE)
-			IsPendingReqTest(theRequest);
-
-		if (ReqTable[i].reqStatus == TRUE)
-			GetStatusReqTest(theRequest);
-
-		if (ReqTable[i].reqSuspend == TRUE)
-			SuspendReqTest(theRequest);	
-
-		if (ReqTable[i].reqResume == TRUE)
-			ResumeReqTest(theRequest);	
-
-		if (ReqTable[i].reqCancel == TRUE)
-			CancelReqTest(theRequest);	
-
-		if (ReqTable[i].reqSetLoadGroup == TRUE)
-			SetLoadGroupTest(theRequest, theLoadGroup);	
-
-		if (ReqTable[i].reqGetLoadGroup == TRUE)
-			GetLoadGroupTest(theRequest);
-
-		QAOutput("- - - - - - - - - - - - - - - - - - - - -", 1);
-	} // end for loop
-    QAOutput("End nsIRequest tests.", 1);
-}
-
-
-nsIChannel * CNsIRequest::GetTheChannel(int i, nsILoadGroup *theLoadGroup)
-{
-	nsCAutoString theSpec, retURI;
-	nsCOMPtr<nsIURI> theURI;
-	nsCOMPtr<nsIChannel> theChannel;
-
-	theSpec = ReqTable[i].theUrl;
-	FormatAndPrintOutput("the input uri = ", theSpec, 1);
-
-	rv = NS_NewURI(getter_AddRefs(theURI), theSpec);
-
-	if (!theURI)
-	{
-	   QAOutput("We didn't get the URI. Test failed.", 1);
-	   return nsnull;
-	}
-	else {
-	   retURI = GetTheURI(theURI, 1);
-	   // simple string compare to see if input & output URLs match
-	   if (strcmp(ReqTable[i].theUrl, retURI.get()) == 0)
-		  QAOutput("The in/out URIs MATCH.", 1);
-	   else
-		  QAOutput("The in/out URIs don't MATCH.", 1);
-	   RvTestResult(rv, "NS_NewURI", 1);
-	   RvTestResultDlg(rv, "NS_NewURI", true);
-	}
-
-	rv = NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, theLoadGroup);
-	if (!theChannel)
-	{
-	   QAOutput("We didn't get the Channel. Test failed.", 1);
-	   return nsnull;
-	}
-	else {
-	   RvTestResult(rv, "NS_NewChannel", 1);
-	   RvTestResultDlg(rv, "NS_NewChannel");
-	}
-
-	nsCOMPtr<nsIStreamListener> listener(static_cast<nsIStreamListener*>(qaBrowserImpl));
-	nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
-	qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener));
-
-	if (!listener) {
-	   QAOutput("We didn't get the listener for AsyncOpen(). Test failed.", 1);
-	   return nsnull;
-	}
-	// this calls nsIStreamListener::OnDataAvailable()
-	rv = theChannel->AsyncOpen(listener, nsnull);
-	RvTestResult(rv, "AsyncOpen()", 1);
-	RvTestResultDlg(rv, "AsyncOpen()");
-
-	return theChannel;
-}
-
-
-void CNsIRequest::IsPendingReqTest(nsIRequest *request)
-{
-	PRBool	  reqPending;
-	nsresult rv;  
-
-	rv = request->IsPending(&reqPending);
-    RvTestResult(rv, "nsIRequest::IsPending() rv test", 1);
-	RvTestResultDlg(rv, "nsIRequest::IsPending() rv test()");
-
-	if (!reqPending)
-		QAOutput("Pending request = false.", 1);
-	else
-		QAOutput("Pending request = true.", 1);
-}
-
-void CNsIRequest::GetStatusReqTest(nsIRequest *request)
-{
-	nsresult	theStatusError;
-	nsresult rv;
-
-	rv = request->GetStatus(&theStatusError);
-    RvTestResult(rv, "nsIRequest::GetStatus() test", 1);
-	RvTestResultDlg(rv, "nsIRequest::GetStatus() test");
-    RvTestResult(theStatusError, "the returned status error test", 1);
-    RvTestResultDlg(theStatusError, "the returned status error test");
-} 
-
-void CNsIRequest::SuspendReqTest(nsIRequest *request)
-{
-	nsresult	rv;
-
-	rv = request->Suspend();
-    RvTestResult(rv, "nsIRequest::Suspend() test", 1);
-    RvTestResultDlg(rv, "nsIRequest::Suspend() test");
-}
-
-void CNsIRequest::ResumeReqTest(nsIRequest *request)
-{
-	nsresult	rv;
-
-	rv = request->Resume();
-    RvTestResult(rv, "nsIRequest::Resume() test", 1);
-    RvTestResultDlg(rv, "nsIRequest::Resume() test");
-}
-
-void CNsIRequest::CancelReqTest(nsIRequest *request)
-{
-	nsresult	rv;
-	nsresult	status = NS_BINDING_ABORTED;
-
-	rv = request->Cancel(status);
-    RvTestResult(rv, "nsIRequest::Cancel() rv test", 1);
-    RvTestResultDlg(rv, "nsIRequest::Cancel() test");
-    RvTestResult(status, "nsIRequest::Cancel() status test", 1);
-    RvTestResultDlg(status, "nsIRequest::Cancel() status test");
-}
-
-void CNsIRequest::SetLoadGroupTest(nsIRequest *request,
-							  nsILoadGroup *theLoadGroup)
-{
-	nsresult	rv;
-	nsCOMPtr<nsISimpleEnumerator> theSimpEnum;
-
-	rv = request->SetLoadGroup(theLoadGroup);
-    RvTestResult(rv, "nsIRequest::SetLoadGroup() rv test", 1);
-    RvTestResultDlg(rv, "nsIRequest::SetLoadGroup() rv test");
-}
-
-void CNsIRequest::GetLoadGroupTest(nsIRequest *request)
-{
-	nsCOMPtr<nsILoadGroup> theLoadGroup;
-	nsresult	rv;
-	nsCOMPtr<nsISimpleEnumerator> theSimpEnum;
-
-	rv = request->GetLoadGroup(getter_AddRefs(theLoadGroup));
-    RvTestResult(rv, "nsIRequest::GetLoadGroup() rv test", 1);
-    RvTestResultDlg(rv, "nsIRequest::GetLoadGroup() rv test");
-
-	rv = theLoadGroup->GetRequests(getter_AddRefs(theSimpEnum));
-    RvTestResult(rv, "nsIRequest:: LoadGroups' GetRequests() rv test", 1);
-    RvTestResultDlg(rv, "nsIRequest:: LoadGroups' GetRequests() rv test");
-}
-
diff --git a/embedding/qa/testembed/nsirequest.h b/embedding/qa/testembed/nsirequest.h
deleted file mode 100644
index 89a892a58f4..00000000000
--- a/embedding/qa/testembed/nsirequest.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Epstein <depstein@netscape.com>
- *   Ashish Bhatt <ashishbhatt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// File Overview....
-// 
-// Header file for nsiRequest interface test cases
-
-#include "Tests.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CNsIRequest window
-
-class CNsIRequest //: public CTests
-{
-// Construction
-public:	
-
-	CNsIRequest(nsIWebBrowser* mWebBrowser,CBrowserImpl *mpBrowserImpl);
-
-// Attributes
-public:
-	// Mozilla interfaces
-	//
-	nsCOMPtr<nsIWebBrowser> qaWebBrowser;
-	CBrowserImpl *qaBrowserImpl;
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CNsIRequest)
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CNsIRequest();
-
-public:
-	void OnInterfacesNsirequest();
-	// individual nsIRequest tests
-	void static IsPendingReqTest(nsIRequest *);
-	void static GetStatusReqTest(nsIRequest *);
-	void static SuspendReqTest(nsIRequest *);
-	void static ResumeReqTest(nsIRequest *);
-	void static CancelReqTest(nsIRequest *);
-	void static SetLoadGroupTest(nsIRequest *, nsILoadGroup *);
-	void static GetLoadGroupTest(nsIRequest *);
-    void OnStartTests(UINT nMenuID);
-	void RunAllTests(int);
-	void RunIndividualTests(UINT nMenuID, int);
-	nsIChannel * GetTheChannel(int, nsILoadGroup *);
-	// Generated message map functions
-protected:
-/*	//{{AFX_MSG(CNsIRequest)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()*/
-};
-
-
-typedef struct
-{
-	char		theUrl[1024];
-	bool		reqPend;
-	bool		reqStatus;
-	bool		reqSuspend;
-	bool		reqResume;
-	bool		reqCancel;
-	bool		reqSetLoadGroup;
-	bool		reqGetLoadGroup;	
-} Element;
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/embedding/qa/testembed/res/Toolbar.bmp b/embedding/qa/testembed/res/Toolbar.bmp
deleted file mode 100644
index 9a1ab9cb61124a6be1c05a1480c0fdb40564e79c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 838
zcmbtSJ5B>J5H+7-rF5Kvb08~rgO-AV10cZxtau6v7bAHjBIPP6k<z3~iWD3sMLP35
z8z)Od$7JXKJbq*4;c<FnRA#XE&?o2}^vc}A8uNXv?hliU!Dmt$94ta;GVApkjiR3^
zrAAQvY6(XEFOe>0l#3kcJPO<RyB^25ti3#S<g%-AYSf0b9d&xyvoLw_wK!RJ)rkZ>
zHpC)&S@yCa4-09y+`AYlf=ecev9AMJxboApsZ%H6V67#KwsmZ+-{VA-iry$-a^%+|
z<3NF!LO6&lKx3N$MzI2qI7UmD3lmgvdl5ee<hbv7UMYKCVBR8dDTm^LW5U9s1KS>4
z`H4l>dhqKp4)>Da`ns@5t40vnS^Ap2WbEMb7O%YQP6KP_B>EUpJ}7VJ?}`I-==#Bp
v5~dtB5>UadZQdBwVvtjIc$QV;*Lq{mv#-xrE#Pn5jXM|d+is_?d@BC{I=p{=

diff --git a/embedding/qa/testembed/res/testembed.ico b/embedding/qa/testembed/res/testembed.ico
deleted file mode 100644
index 7eef0bcbe6580a6f464d688906172c2d9de44262..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1078
zcmc&zF>b>!3}jLb9s)T}@Kod(893@u8ajANzT`op9^o+)<I$UPq~xXr0<=JfGNQ;k
zQZi{XL_6BkFdRwcwkLXrJsvAQ?TGvv(FxoDJwtcoutSjhS|Sk^#aIn?xHL@@tOklL
zDn&ggeo86+QC8||PNXZG6&Dzx_g)PeF^Ula7SfF(H+32&f2*!E<`OlExYUd-uR+Z+
z>S?=nU(FD@%<cR&)_X=RO$0@P@G@Gh3XQOuS8D;p*m_!XjZ5um%~^@4&qjtq5SLm@
zS7FYrCYN(cIpiRI21PEU5K`u};S^E|oEbfSkBc|V90FsL*?M(~0w>0s)Sg^oyC8{H
z9myetc;MEP)59v(LMa~xK8Yu^jIR*H22uCFiq5%C{s7(PJi>o15i^bmX4(vPxWAio
z9ryY#AU_jfnd047-@`)XzL?%iS$gQyFP{44kS9X)fN{{QoL~hO-&=q&20Zr*cxFAt
PkaNE{wR~2C$NfnjhSXWT

diff --git a/embedding/qa/testembed/res/testembed.rc2 b/embedding/qa/testembed/res/testembed.rc2
deleted file mode 100644
index 339464a26a1..00000000000
--- a/embedding/qa/testembed/res/testembed.rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// MFCEMBED.RC2 - resources Microsoft Visual C++ does not edit directly
-//
-
-#ifdef APSTUDIO_INVOKED
-	#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Add manually edited resources here...
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/embedding/qa/testembed/res/toolbar1.bmp b/embedding/qa/testembed/res/toolbar1.bmp
deleted file mode 100644
index 7016676b81e5a605857b71bfa8ee7c22e38eef01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 238
zcmZ?rea8R+Wk5;;hy{R{ABY(lSb!u0Lj{<`Ml>)m01-n&1B3#SKqkY10|$UKNa8;j
tG5r4zVgWG_f`ouX0Ti&8qksZJe4yU%ARSP;VAZPiU_O+_$NvDb5&-<mSHl1R

diff --git a/embedding/qa/testembed/resource.h b/embedding/qa/testembed/resource.h
deleted file mode 100644
index 0fc6995e229..00000000000
--- a/embedding/qa/testembed/resource.h
+++ /dev/null
@@ -1,333 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by testembed.rc
-//
-#define IDD_ABOUTBOX                    100
-#define IDR_MAINFRAME                   128
-#define IDR_MOZEMBTYPE                  129
-#define IDR_CTXMENU_DOCUMENT            130
-#define IDR_CTXMENU_LINK                131
-#define IDR_CTXMENU_TEXT                132
-#define IDR_CTXMENU_IMAGE               133
-#define IDD_PROMPT_DIALOG               134
-#define IDD_PROMPT_PASSWORD_DIALOG      135
-#define IDD_PROMPT_USERPASS_DIALOG      136
-#define IDD_PROFILES                    137
-#define IDD_PROFILE_NEW                 138
-#define IDD_PROFILE_RENAME              139
-#define IDD_FINDDLG                     140
-#define IDD_PRINT_PROGRESS_DIALOG       141
-#define IDD_PREFS_START_PAGE            142
-#define IDD_URLDIALOG                   144
-#define IDD_DIALOG1                     145
-#define IDD_RUNTESTSDLG                 145
-#define IDD_QAFINDDLG                   147
-#define IDD_WEBPROGDLG                  148
-#define ID_URL_BAR                      1001
-#define ID_PROG_BAR                     1002
-#define IDC_PROMPT_ANSWER               1003
-#define IDC_PROMPT_QUESTION             1004
-#define IDC_PROMPT_TEXT                 1005
-#define IDC_USERNAME                    1006
-#define IDC_PASSWORD                    1007
-#define IDC_CHECK_SAVE_PASSWORD         1008
-#define IDC_USERNAME_LABEL              1009
-#define IDC_PASSWORD_LABEL              1010
-#define IDC_LIST1                       1011
-#define IDC_PROF_RENAME                 1012
-#define IDC_PROF_DELETE                 1013
-#define IDC_PROF_NEW                    1014
-#define IDC_CHECK_ASK_AT_START          1015
-#define IDC_NEW_PROF_NAME               1016
-#define IDC_LOCALE_COMBO                1017
-#define IDC_NEW_NAME                    1018
-#define IDC_PPD_DOC_TXT                 1020
-#define IDC_PPD_DOC_TITLE_STATIC        1021
-#define IDC_ENTER_URLTEXT               1022
-#define IDC_URLFIELD                    1023
-#define IDC_COMBO1                      1025
-#define IDC_CHECK1                      1027
-#define IDC_CHKURLFLAG                  1027
-#define IDC_TEXTFIELD                   1028
-#define IDC_WPCOMBO                     1031
-#define IDC_COMBO2                      1032
-#define IDC_MATCH_WHOLE_WORD            1040
-#define IDC_MATCH_CASE                  1041
-#define IDC_WRAP_AROUND                 1042
-#define IDC_SEARCH_BACKWARDS            1043
-#define IDC_FIND_EDIT                   1152
-#define IDC_RADIO_BLANK_PAGE            1153
-#define IDC_RADIO_HOME_PAGE             1154
-#define IDC_EDIT_HOMEPAGE               1155
-#define ID_NAV_BACK                     32773
-#define ID_NAV_FORWARD                  32774
-#define ID_NAV_HOME                     32775
-#define ID_NAV_STOP                     32776
-#define ID_NAV_RELOAD                   32777
-#define ID_EDIT_SELECT_NONE             32778
-#define ID_NEW_BROWSER                  32779
-#define ID_VIEW_SOURCE                  32780
-#define ID_VIEW_INFO                    32781
-#define ID_VIEW_IMAGE                   32782
-#define ID_OPEN_LINK_IN_NEW_WINDOW      32783
-#define ID_SAVE_LINK_AS                 32784
-#define ID_SAVE_IMAGE_AS                32785
-#define ID_COPY_LINK_LOCATION           32786
-#define ID_MANAGE_PROFILES              32787
-#define ID_EDIT_PREFERENCES             32788
-#define ID_TESTS_CHANGEURL              32789
-#define ID_TESTS_GLOBALHISTORY          32790
-#define ID_TOOLS_REMOVEGHPAGE           32791
-#define ID_TESTS_CREATEFILE             32792
-#define ID_INTERFACES_NSIFILE           32793
-#define ID_TESTS_CREATEPROFILE          32794
-#define ID_INTERFACES_NSISHISTORY       32795
-#define ID_VERIFYBUGS_70228             32796
-#define ID_TOOLS_REMOVEALLGH            32797
-#define ID_TESTS_ADDWEBPROGLISTENER     32798
-#define ID_TESTS_ADDHISTORYLISTENER     32799
-#define ID_INTERFACES_NSIWEBNAV         32800
-#define ID_TOOLS_TESTYOURMETHOD         32801
-#define ID_TOOLS_TESTYOURMETHOD2        32802
-#define ID_INTERFACES_NSIREQUEST        32803
-#define ID_INTERFACES_TEMP              32804
-#define ID_TOOLS_VIEWLOGFILE			32805
-#define ID_TOOLS_DELETELOGFILE			32806
-#define ID_INTERFACES_NSIDOMWINDOW_RUNALLTESTS 32808
-#define ID_INTERFACES_NSIDOMWINDOW_GETDOMDOCUMENT 32809
-#define ID_INTERFACES_NSIDOMWINDOW_GETPARENT 32810
-#define ID_INTERFACES_NSIDOMWINDOW_GETSCROLLBARS 32811
-#define ID_INTERFACES_NSIDOMWINDOW_GETFRAMES 32812
-#define ID_INTERFACES_NSIDOMWINDOW_GETNAME 32813
-#define ID_INTERFACES_NSIDOMWINDOW_GETSCSOLLX 32814
-#define ID_INTERFACES_NSIDOMWINDOW_GETSCROLLY 32815
-#define ID_INTERFACES_NSIDOMWINDOW_SCROLLTO 32816
-#define ID_INTERFACES_NSIDOMWINDOW_SCROLLBY 32817
-#define ID_INTERFACES_NSIDOMWINDOW_GETSELECTION 32818
-#define ID_INTERFACES_NSIDOMWINDOW_SCROLLBYLINES 32819
-#define ID_INTERFACES_NSIDOMWINDOW_SCROLLBYPAGES 32820
-#define ID_INTERFACES_NSIDOMWINDOW_SIZETOCONTENT 32821
-#define ID_INTERFACES_NSIDIRECTORYSERVICE_RUNALLTESTS 32826
-#define ID_INTERFACES_NSIDIRECTORYSERVICE_INIT 32827
-#define ID_INTERFACES_NSIDIRECTORYSERVICE_REGISTERPROVIDER 32828
-#define ID_INTERFACES_NSIDIRECTORYSERVICE_UNREGISTERPROVIDER 32829
-#define ID_INTERFACES_NSISELECTION_RUNALLTESTS 32832
-#define ID_VERIFYBUGS_90195             32833
-#define ID_INTERFACES_CALLBACKS_NSISTREAMLISTENER 32834
-#define ID_INTERFACES_CALLBACKS_NSIREQUESTOBSERVER 32835
-#define ID_INTERFACES_CALLBACKS_NSISTREAMOBSERVER 32836
-#define ID_INTERFACES_NSISELECTION_GETANCHORNODE 32837
-#define ID_INTERFACES_NSISELECTION_GETANCHOROFFSET 32838
-#define ID_INTERFACES_NSISELECTION_GETFOCUSNODE 32839
-#define ID_INTERFACES_NSISELECTION_GETFOCUSOFFSET 32840
-#define ID_INTERFACES_NSISELECTION_GETISCOLLAPSED 32841
-#define ID_INTERFACES_NSISELECTION_GETRANGECOUNT 32842
-#define ID_INTERFACES_NSISELECTION_GETRANGEAT 32843
-#define ID_INTERFACES_NSISELECTION_COLLAPSE 32844
-#define ID_INTERFACES_NSISELECTION_EXTEND 32845
-#define ID_INTERFACES_NSISELECTION_COLLAPSETOSTART 32846
-#define ID_INTERFACES_NSISELECTION_COLLAPSETOEND 32847
-#define ID_INTERFACES_NSISELECTION_CONTAINSNODE 32848
-#define ID_INTERFACES_NSISELECTION_SELECTALLCHILDREN 32849
-#define ID_INTERFACES_NSISELECTION_ADDRANGE 32850
-#define ID_INTERFACES_NSISELECTION_REMOVERANGE 32851
-#define ID_INTERFACES_NSISELECTION_REMOVEALLRANGES 32852
-#define ID_INTERFACES_NSISELECTION_DELETEFROMDOCUMENT 32853
-#define ID_INTERFACES_NSISELECTION_SELECTIONLANGUAGECHANGE 32854
-#define ID_INTERFACES_NSISELECTION_TOSTRING 32855
-#define ID_INTERFACES_NSISELECTION_A    32857
-#define ID_INTERFACES_NSIPROFILE_RUNALLTESTS 32858
-#define ID_INTERFACES_NSIPROFILE_GETPROFILECOUNT 32859
-#define ID_INTERFACES_NSIPROFILE_GETCURRENTPROFILE 32860
-#define ID_INTERFACES_NSIPROFILE_SETCURRENTPROFILE 32861
-#define ID_INTERFACES_NSIPROFILE_GETPROFILELIST 32862
-#define ID_INTERFACES_NSIPROFILE_PROFILEEXISTS 32863
-#define ID_INTERFACES_NSIPROFILE_CREATENEWPROFILE 32864
-#define ID_INTERFACES_NSIPROFILE_RENAMEPROFILE 32865
-#define ID_INTERFACES_NSIPROFILE_DELETEPROFILE 32866
-#define ID_INTERFACES_NSIPROFILE_CLONEPROFILE 32867
-#define ID_INTERFACES_NSIPROFILE_SHUTDOWNCURRENTPROFILE 32868
-#define ID_INTERFACES_NSISHISTORY_GETCOUNT 32870
-#define ID_INTERFACES_NSISHISTORY_GETINDEX 32871
-#define ID_INTERFACES_NSISHISTORY_GETMAXLENGTH 32872
-#define ID_INTERFACES_NSISHISTORY_SETMAXLENGTH 32873
-#define ID_INTERFACES_NSISHISTORY_GETENTRYATINDEX 32874
-#define ID_INTERFACES_NSISHISTORY_PURGEHISTORY 32875
-#define ID_INTERFACES_NSISHISTORY_GETSHISTORYENUMERATOR 32878
-#define ID_INTERFACES_NSISHISTORY_RUNALLTESTS 32879
-#define ID_TESTS_REMOVEHISTORYLISTENER  32880
-#define ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_RUNALLTESTS 32881
-#define ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETURI 32882
-#define ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETTITLE 32883
-#define ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETISSUBFRAME 32884
-#define ID_INTERFACES_NSIREQUEST_GETNAME 32885
-#define ID_INTERFACES_NSIREQUEST_ISPENDING 32886
-#define ID_INTERFACES_NSIREQUEST_GETSTATUS 32887
-#define ID_INTERFACES_NSIREQUEST_CANCEL 32888
-#define ID_INTERFACES_NSIREQUEST_SUSPEND 32889
-#define ID_INTERFACES_NSIREQUEST_RESUME 32890
-#define ID_INTERFACES_NSIREQUEST_GETLOADGROUP 32891
-#define ID_INTERFACES_NSIREQUEST_SETLOADGROUP 32892
-#define ID_INTERFACES_NSIREQUEST_GETLOADFLAGS 32893
-#define ID_INTERFACES_NSIREQUEST_SETLOADFLAGS 32894
-#define ID_INTERFACES_NSIWEBNAV_GETCANGOBACK 32895
-#define ID_INTERFACES_NSIWEBNAV_GETCANGOFORWARD 32896
-#define ID_INTERFACES_NSIWEBNAV_GOBACK  32897
-#define ID_INTERFACES_NSIWEBNAV_GOFORWARD 32898
-#define ID_INTERFACES_NSIWEBNAV_GOTOINDEX 32899
-#define ID_INTERFACES_NSIWEBNAV_LOADURI 32900
-#define ID_INTERFACES_NSIWEBNAV_RELOAD  32901
-#define ID_INTERFACES_NSIWEBNAV_STOP    32902
-#define ID_INTERFACES_NSIWEBNAV_GETDOCUMENT 32903
-#define ID_INTERFACES_NSIWEBNAV_GETCURRENTURI 32904
-#define ID_INTERFACES_NSIWEBNAV_GETSESSIONHISTORY 32905
-#define ID_INTERFACES_NSIWEBNAV_SETSESSIONHISTORY 32906
-#define ID_INTERFACES_NSIWEBNAV_RUNALLTESTS 32907
-#define ID_INTERFACES_NSIREQUEST_RUNALLTESTS 32908
-#define ID_INTERFACES_NSIDOMWINDOW_GETTEXTZOOM 32910
-#define ID_INTERFACES_NSIDOMWINDOW_SETTEXTZOOM 32911
-#define ID_INTERFACES_NSICLIPBOARDCOMMANDS_PASTE 32912
-#define ID_INTERFACES_NSICLIPBOARDCOMMANDS_COPYSELECTION 32913
-#define ID_INTERFACES_NSICLIPBOARDCOMMANDS_SELECTALL 32914
-#define ID_INTERFACES_NSICLIPBOARDCOMMANDS_SELECTNONE 32915
-#define ID_INTERFACES_NSICLIPBOARDCOMMANDS_CUTSELECTION 32916
-#define ID_INTERFACES_NSICLIPBOARDCOMMANDS_COPYLINKLOCATION 32917
-#define ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANCOPYSELECTION 32918
-#define ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANCUTSELECTION 32919
-#define ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANPASTE 32920
-#define ID_INTERFACES_NSIOBSERVERSERVICE_RUNALLTESTS 32922
-#define ID_INTERFACES_NSIOBSERVERSERVICE_ADDOBSERVERS 32923
-#define ID_INTERFACES_NSIOBSERVERSERVICE_ENUMERATEOBSERVERS 32924
-#define ID_INTERFACES_NSIOBSERVERSERVICE_NOTIFYOBSERVERS 32925
-#define ID_INTERFACES_NSIOBSERVERSERVICE_REMOVEOBSERVERS 32926
-#define ID_INTERFACES_NSIFILE_INITWITHPATH 32927
-#define ID_INTERFACES_NSIFILE_APPENDRELATICEPATH 32928
-#define ID_INTERFACES_NSIFILE_EXISTS    32929
-#define ID_INTERFACES_NSIFILE_CREATE    32930
-#define ID_INTERFACES_NSIFILE_COPYTO    32931
-#define ID_INTERFACES_NSIFILE_MOVETO    32932
-#define ID_INTERFACES_NSIFILE_RUNALLTESTS 32933
-#define ID_INTERFACES_NSIWEBBROWSER     32934
-#define ID_INTERFACES_NSIWEBBROWSER_RUNALLTESTS 32935
-#define ID_INTERFACES_NSIWEBBROWSER_ADDWEBBROWSERLISTENER 32938
-#define ID_INTERFACES_NSIWEBBROWSER_REMOVEWEBBROWSERLISTENER 32939
-#define ID_INTERFACES_NSIWEBBROWSER_GETCONTAINERWINDOW 32940
-#define ID_INTERFACES_NSIWEBBROWSER_SETCONTAINERWINDOW 32941
-#define ID_INTERFACES_NSIWEBBROWSER_GETPARENTURICONTENTLISTENER 32942
-#define ID_INTERFACES_NSIWEBBROWSER_SETPARENTURICONTENTLISTENER 32943
-#define ID_INTERFACES_NSIWEBBROWSER_GETCONTENTDOMWINDOW 32944
-#define ID_INTERFACES_NSIWEBBROWSER_NSIWBSETUPSETPROPERTY 32945
-#define ID_INTERFACES_NSIWEBPROGRESS_RUNALLTESTS 32947
-#define ID_INTERFACES_NSIWEBPROGRESS_ADDPROGRESSLISTENER 32948
-#define ID_INTERFACES_NSIWEBPROGRESS_REMOVEPROGRESSLISTENER 32949
-#define ID_INTERFACES_NSIWEBPROGRESS_GETDOMWINDOW 32950
-#define ID_INTERFACES_NSIWEBBROWSERFIND_RUNALLTESTS 32951
-#define ID_INTERFACES_NSIWEBBROWSERFIND_SETSEARCHSTRINGTEST 32952
-#define ID_INTERFACES_NSIWEBBROWSERFIND_GETSEARCHSTRINGTEST 32953
-#define ID_INTERFACES_NSIWEBBROWSERFIND_FINDNEXTTEST 32954
-#define ID_INTERFACES_NSIWEBBROWSERFIND_SETFINDBACKWARDSTEST 32955
-#define ID_INTERFACES_NSIWEBBROWSERFIND_GETFINDBACKWARDSTEST 32956
-#define ID_INTERFACES_NSIWEBBROWSERFIND_SETWRAPFINDTEST 32957
-#define ID_INTERFACES_NSIWEBBROWSERFIND_GETWRAPFINDTEST 32958
-#define ID_INTERFACES_NSIWEBBROWSERFIND_SETENTIREWORDTEST 32959
-#define ID_INTERFACES_NSIWEBBROWSERFIND_GETENTIREWORDTEST 32960
-#define ID_INTERFACES_NSIWEBBROWSERFIND_SETMATCHCASE 32961
-#define ID_INTERFACES_NSIWEBBROWSERFIND_GETMATCHCASE 32962
-#define ID_INTERFACES_NSIWEBBROWSERFIND_SETSEARCHFRAMES 32963
-#define ID_INTERFACES_NSIWEBBROWSERFIND_GETSEARCHFRAMES 32964
-#define ID_INTERFACES_NSIEDITINGSESSION_RUNALLTESTS 32966
-#define ID_INTERFACES_NSIEDITINGSESSION_INIT 32967
-#define ID_INTERFACES_NSIEDITINGSESSION_MAKEWINDOWEDITABLE 32968
-#define ID_INTERFACES_NSIEDITINGSESSION_WINDOWISEDITABLE 32969
-#define ID_INTERFACES_NSIEDITINGSESSION_GETEDITORFORWINDOW 32970
-#define ID_INTERFACES_NSIEDITINGSESSION_SETUPEDITORONWINDOW 32971
-#define ID_INTERFACES_NSIEDITINGSESSION_TEARDOWNEDITORONWINDOW 32972
-#define ID_INTERFACES_NSICOMMANDMANAGER_RUNALLTESTS 32973
-#define ID_INTERFACES_NSICOMMANDMANAGER_ADDCOMMANDOBSERVER 32974
-#define ID_INTERFACES_NSICOMMANDMANAGER_REMOVECOMMANDOBSERVER 32975
-#define ID_INTERFACES_NSICOMMANDMANAGER_ISCOMMANDESUPPORTED 32976
-#define ID_INTERFACES_NSICOMMANDMANAGER_ISCOMMANDENABLED 32977
-#define ID_INTERFACES_NSICOMMANDMANAGER_GETCOMMANDSTATE 32978
-#define ID_INTERFACES_NSICOMMANDMANAGER_DOCOMMAND 32979
-#define ID_INTERFACES_NSICOMMANDPARAMS_RUNALLTESTS 32980
-#define ID_INTERFACES_NSICOMMANDPARAMS_GETVALUETYPE 32981
-#define ID_INTERFACES_NSICOMMANDPARAMS_GETBOOLEANVALUE 32982
-#define ID_INTERFACES_NSICOMMANDPARAMS_GETLONGVALUE 32983
-#define ID_INTERFACES_NSICOMMANDPARAMS_GETDOUBLEVALUE 32984
-#define ID_INTERFACES_NSICOMMANDPARAMS_GETSTRINGVALUE 32985
-#define ID_INTERFACES_NSICOMMANDPARAMS_GETISUPPORTSVALUE 32986
-#define ID_INTERFACES_NSICOMMANDPARAMS_SETBOOLEANVALUE 32987
-#define ID_INTERFACES_NSICOMMANDPARAMS_SETLONGVALUE 32988
-#define ID_INTERFACES_NSICOMMANDPARAMS_SETDOUBLEVALUE 32989
-#define ID_INTERFACES_NSICOMMANDPARAMS_SETSTRINGVALUE 32990
-#define ID_INTERFACES_NSICOMMANDPARAMS_SETISUPPORTSVALUE 32991
-#define ID_INTERFACES_NSICOMMANDPARAMS_REMOVEVALUE 32992
-#define ID_INTERFACES_NSICOMMANDPARAMS_HASMOREELEMENTS 32993
-#define ID_INTERFACES_NSICOMMANDPARAMS_FIRST 32994
-#define ID_INTERFACES_NSICOMMANDPARAMS_GETNEXT 32995
-#define ID_INTERFACES_NSICOMMANDPARAMS_GETCSTRINGVALUE 32996
-#define ID_INTERFACES_NSICOMMANDPARAMS_SETCSTRINGVALUE 32997
-#define ID_TESTS_ADDURICONTENTLISTENER_ADDFROMNSIWEBBROWSER 32998
-#define ID_TESTS_ADDURICONTENTLISTENER_ADDFROMNSIURILOADER 32999
-#define ID_TESTS_ADDURICONTENTLISTENER_OPENURI 33000
-#define ID_TESTS_NSNEWCHANNEL           33001
-#define ID_VERIFYBUGS_169617            33002
-#define ID_VERIFYBUGS_170274            33003
-#define ID_TESTS_NSIIOSERVICENEWURI     33005
-#define ID_TESTS_NSIPROTOCOLHANDLERNEWURI 33006
-#define ID_INTERFACES_NSIWEBPROGRESS_ISLOADINGDOCUMENT 33007
-#define ID_INTERFACES_RUNALLTESTCASES   33008
-#define ID_INTERFACES_NSICHANNEL_RUNALLTESTS 33009
-#define ID_INTERFACES_NSICHANNEL_SETORIGINALURI 33012
-#define ID_INTERFACES_NSICHANNEL_GETORIGINALURI 33013
-#define ID_INTERFACES_NSICHANNEL_GETURI 33014
-#define ID_INTERFACES_NSICHANNEL_SETOWNER 33015
-#define ID_INTERFACES_NSICHANNEL_GETOWNER 33016
-#define ID_INTERFACES_NSICHANNEL_SETNOTIFICATIONS 33017
-#define ID_INTERFACES_NSICHANNEL_GETNOTIFICATIONS 33018
-#define ID_INTERFACES_NSICHANNEL_GETSECURITYINFO 33019
-#define ID_INTERFACES_NSICHANNEL_SETCONTENTTYPE 33020
-#define ID_INTERFACES_NSICHANNEL_GETCONTENTTYPE 33021
-#define ID_INTERFACES_NSICHANNEL_SETCONTENTCHARSET 33022
-#define ID_INTERFACES_NSICHANNEL_GETCONTENTCHARSET 33023
-#define ID_INTERFACES_NSICHANNEL_SETCONTENTLENGTH 33024
-#define ID_INTERFACES_NSICHANNEL_GETCONTENTLENGTH 33025
-#define ID_INTERFACES_NSICHANNEL_OPEN   33026
-#define ID_INTERFACES_NSICHANNEL_ASYNCOPEN 33027
-#define ID_INTERFACES_NSIHTTPCHANNEL_RUNALLTESTS 33031
-#define ID_INTERFACES_NSIHTTPCHANNEL_SETREQUESTMETHOD 33032
-#define ID_INTERFACES_NSIHTTPCHANNEL_GETREQUESTMETHOD 33033
-#define ID_INTERFACES_NSIHTTPCHANNEL_SETREFERRER 33034
-#define ID_INTERFACES_NSIHTTPCHANNEL_GETREFERRER 33035
-#define ID_INTERFACES_NSIHTTPCHANNEL_SETREQUESTHEADER 33036
-#define ID_INTERFACES_NSIHTTPCHANNEL_GETREQUESTHEADER 33038
-#define ID_INTERFACES_NSIHTTPCHANNEL_VISITREQUESTHEADERS 33039
-#define ID_INTERFACES_NSIHTTPCHANNEL_SETALLOWPIPELINING 33040
-#define ID_INTERFACES_NSIHTTPCHANNEL_GETALLOWPIPELINING 33041
-#define ID_INTERFACES_NSIHTTPCHANNEL_SETREDIRECTIONLIMIT 33042
-#define ID_INTERFACES_NSIHTTPCHANNEL_GETREDIRECTIONLIMIT 33043
-#define ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUS 33044
-#define ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUSTEXT 33045
-#define ID_TESTS_ADDTOOLTIPLISTENER     33046
-#define ID_INTERFACES_NSIWEBNAV_GETREFERRINGURI 33047
-#define ID_CLIPBOARDCMD_PASTE           42789
-#define ID_CLIPBOARDCMD_COPYSELECTION   42790
-#define ID_CLIPBOARDCMD_SELECTALL       42791
-#define ID_CLIPBOARDCMD_SELECTNONE      42792
-#define ID_CLIPBOARDCMD_CUTSELECTION    42793
-#define ID_CLIPBOARDCMD_COPYLINKLOCATION 42794
-#define ID_CLIPBOARDCMD_CANCOPYSELECTION 42795
-#define ID_CLIPBOARDCMD_CANCUTSELECTION 42796
-#define ID_CLIPBOARDCMD_CANPASTE        42797
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        153
-#define _APS_NEXT_COMMAND_VALUE         33048
-#define _APS_NEXT_CONTROL_VALUE         1033
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/embedding/qa/testembed/testembed.aps b/embedding/qa/testembed/testembed.aps
deleted file mode 100644
index 33ea9b62fe464373497bf6f7cff41a37fba00465..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 101408
zcmd4437q6bc{g4QD=eVg-Z2iS2p%xqbGBFLbEe&y>7l!4mn9^fg<WtX?Bebs>k%`n
zDC-e5m$~m-b7)S_gczbGA#Y-0%x%CUL5&L<R5ZqYzu)Jn`c>8M>L&32y#I#TnXcz~
z>Uip@r=EJM>M3K4nZnPB6Z(TcqfZ^*o{FDkv(q&2`^1SY7Jk}R`-i#wwOdT{Iaj~v
zz>Rya-m~|nLx=b7+kf?q2VTDKh8uQYz4yjz_U_rUZ~ygIzhw8-hxY==1pn8i2d`y5
zmmf@*^AX8@+W2xVkdzC|!M%qL+<frby_deopfcT7YgBLaHinJfm8LR1Z63k2{%Ez{
zUF-Dgt8G)ME}BzpV(+T<YGb%-ovAf*s-`xFSFX0#Hb$*pa|3@2O=V`<Y>Qzl-L>sV
zub9)~^kMr-;#bY-ae8;PzJx+%X3QA`v_|Xw-s<{r)auq(dP@Mznny-}_4;72v)6BV
zj5+hD2xDW=?i0&n%$qY4j81o@JwUz-=By}fwAS8<<VACKoZN4(33Fy@<{X7|x@)c0
z3hFjHZO(Pb-L)aBzSM6A1<zK@c@Cl78H@(QdLL-g;@PS>Utt^l71!F?S@UR3)RYPe
znKO^kr2fX*uss+KwCp+aSWUj7?klul9;b;r+YQ!6Q5VhQnL0v2qei{Y-mjP^ND`4;
zTGc#}X-(G!^|isywqVbgZ;2pRY@i<9-Wqe7HBX9Q+R@X~bLLw$o!y}<oSvRHPqxUm
z7n#F?nbO4Oa=W>GG^p=rgGbuSgfALMH0$MZ8m-hD?G=J*=E69?1XP(ePf^fHcQ6DW
zrz;hXP}{!F$o1=VrD~oQq_^5D?I9#`x-w%f3erV9rYp1N>6)mOtq-=3>O<{V(#)BQ
z6%2Ipu`{wwugsfE6tdE5)>qo2W^c98Bguk!h9_~@i{_b{xV{ca?=?q54xj1jw0Tx4
zy*or^5UgRhNrZ}dwjyABw)^aI+acAexl|!Y>vY>IEuznu%QR7{LpD|C%(P8ncSzEL
zsko%=q+Y2*`lqW4rmD#-BFS>m%xLP)b=O9ygISvaTU`Y)G{KxEt=5Ol<<ZXN9@@cy
z4Il>Ad<bmT2ka3Hrv;mJzrH@I_j?;_f?hR?nm%aP`^c<OZ*JdN@3%0{r)OtOO@SOH
zqjswcMpovk<~f?$ueZ9rQDddPw%v}*%G`{3ZU|iNtx_VXrz&%^=6MQZP9uUGWX?RF
z5cK#CsezfPE-cKL7bJ<DUZ1s+^jY(5Njfu;#5r?$k~kRl)+KS?)RV-1d!<*`3>G-g
zpfst*07Bawj@Ei>n$e<ZDh;Ht(eLfV5R|-XrX}e+x&RD%8~vu>FHW1bPse=FBlcp&
zbb?e-)J(3LB}wkBx7SA0_oMC_wdZIj7~I<_q%)WaSvwibf>R#|VAga!K$QQ;Lgvg1
z1=8%T@6v2JQbf(L)OoXAz^nB&^n{Ep(d2|Jm=%EuFV_3*P8*}U2{ljPqFEK7=+04d
zxxTj4h7b#^X4V4O(n_yUUs;B}==FCIUYj;Oh4*?Z1E`GE-j4RtvUE7X6|)|YH~a1S
zu+8~JXshN50b*uo_d9h|XS6oxCg2&<&(Km~IPzID$RQtuwVN|TLD|vncRRZp8%u-H
z!gLk0IO{fVHZ=dB>h+bCrDcIGm>ogs^;XMH7*v++HI<gyB8(Y!qH+#Mw(tn4X08;Z
zxS7Zf!vIAs!qV6kRD^l$g5a&Ths!-m@*?J<s|pdSf>AZ!o>NA@E%T6I%$Tdw7{m4|
z2hbvBsP72!r|847uzX&`JoTLcRJDHypEsj)&gjNgZ&jszgjpGE6&6Wpi{`sZ@t4{|
z5GN)SD_AqT$C0epA<;t?fQjvzaoB@qzqhi2sh%TX5fdM5NAzRdMZO8Bl30L>T{U~g
zVaqJVoM+75akzu#0Cl-iDl%)X8;{PabM!4@GQGYOU7I<ivRcIa`l1Pt8=CWi*;k4T
zj;Kndk;B{<&3Bg)SdQ<4suQ)dSgDy8PeegwB8<n}enUA$_p0`=*X%)`s3>5vzcG)Z
z+s9-86$Y)pquXq!MYK9^_D@3AUBgs~#$%p8FbRIYy+rNNhZft>ZHW$9gfhBm655Tm
zT<V&6Ne*?=HR+bYsKELNk{)Qp+H|Eh$7W!OaVVV`EHMm|=5|rdgCP|7YM|T}vG_P#
zN@7(|uR&I8i)ZG{&80M2OhhtoUYaI>j`7WeIM&yi%f0?uuf@q_5v!M5CZp(eI)k=!
zBbGKt#?f@JvKu6Y)Xd8!BJgFvaC`YUlJ2015nf*(v_<{HsC&gYl0N6`CagVa2v$z7
zoQR^X=riVfO3__)$XG1EUR8<=OScW9lc;m%drMJWzQdlZ`-EoRY)(kyN?9;R$55;d
zv4l^0ZFbSTx|Bf03WDEU?yj^jtw_ac<~5~MnEj;}h&(rKZY@PtL&@V;%xfpWN0o#`
zv>^=i*Ok)fOx=OEAe>8Ky5CkxmJBKw{7W0qy=o9jvu4e)Qd)Lozq__1$aCiPrO0)`
zS}<?O!LoK<T7Atenm3kULkn2KWGKwl%$v$7nj3vu4&Jg{oS!z|S3(1Akwa54Z!V$n
zHKX=q!{@8!EhPlDI_)cgF5NvpW8PYVuckHD7-2hR&G(m(pw;l(g!psj2TJf&o<jV2
z^MfV$%@r)RLi7dmLnY{g<qg<<JJ)h}yJ&tmhtOI2BQQ7V?}cgewlTO^gSExlTBw*G
z8H2l8zjCF$wlw6LU~!>pezXi9f)V4-m>(;{N4+6<{askXB~_X=KVC+%zR_Q5`xVaO
z!kqbuGJF)_*aW}iYP(;D*&}UPG(TBJm@?WIYUZZ|T~|7)zOsv*MXZy5x-45v+LlUM
zo*v&=Q2)$>AxHBz`dzjMYwn+Ykd#9@hJ<#;{M>`2?G6ST4Rs2$@LBWoIT={nhw|yx
z1B-L!7fLX@19%KtR)Jzc|BEHK>{>XrHbgsMf&WV-xJ?*G@CUN0i{_V05C<Dl1Hr7B
zUn#+a8yE6KMEC%HwFD9Mq)TQAz9?C3!YA-+CFmGLF?!X!y#(FnPKTQ?qBdjRQG#xB
z_vo|c*K^QyaW0AllOTK^&F#|CIrAIivAq*(5k7|BEFth2FPPsd!wa)qH18}!9rhAs
zQmdJF6{C{NI(TaEK>T(wV&YQ6Lc#n_F`o6u)uyZFcZ;#mVSzbPo1QVhSBh+>16R{o
z^ZTXf1MDtfN$OQ(4gQNiC?<hG<dDppcNdeys<8&|{Cjec-QZ7SFPit}U`MV7I*YIB
z^;RKrH8?ZgSBj4YMEDi+{v7<~N_V}{gKHHIXZQzO1MVNdiO&+M<^vN^(CwHQheA1H
z{%|77#Gn?cS@TB^g35YqYw&g4J`q`SBl1kt;P?3B$q3OtI${H-Y7Ki2ADoOB8aBh9
zMe`>U6Q^rkGj~i%n{*`{B!8Mi<W|!8-i{jfJw7x671lRNM(juIjC^<kGG}(QW8zu!
zkqL;`dPDeaW6C-6XA@AWg%VTFn?KK?q@NRxzwU5ncL>L|n0hsMbpE0Ux4zCv8d{M%
zO4!@56pQB0B8tR{uVJhBFN?6$gePmUY5ac*u^?sQ(5qq3=&y>f=!UmgRrA+HSSj5E
z|IbHrP%#<$9g-S6K7Uh+l(Ok+aQFOeIe|LYZ5e@gsRoD4$I3~yn|%!<>YDkxa%#*)
zbQZ!n(C#N&Gc~wqK3+}-otsBjF@Il9hw{`-joHk4DZ>iGZSxQ18KB_O3}(zfmS<pF
z4C6bQaVT(b>iknVAq@AO@Zk+N;FaQ9dA;2q(o<Z6ljooFNr9!C{V6e<T`>PLh5{1d
zs3Qg~ntvTbsREHpTr-~-LoBw5-L_!c;Kup4d=e|HvSFHP-dx4pHJ%7u)U8-`m~dGo
zC05Pd<B3tvT;dt?$??Rj^BOFSq{vzGsqs{(FA0-<<Ai$7e0n@JDx6O}Z$2}g8fEXq
zb~bZJid``OKAsT8W(XI}e~c$Yi5Mc-CE#{@QfAHEGoBP>W=Y{u`s{d8lqy^OvY8L@
zo3EJ9ji*9^F;&%kemoV*QV~k_wQBG%{pWZ>6qg~KHDAaf<X$tDvevv#PYd(&=J<Fb
zyTekOUoiKM$6l>(Z>t_>+4Y7j?`!jm=DzW?N{20lkg{gJIG&O{4x(P4t2D@{Z1C6M
zi2BlaT6Dw4x>EPn0^*AKukpk~oaLa$EQh{o?$4pO#=jmA=%;%GCo#S}o(QVhX5)-2
z>aB%Y^Of<ms+{x4=ge2flXG80RxfZptgrX_V7rt(ZytCs#A_4`rCcyy8&8S;wdK;^
zB5S6FMf3IXgjnZleWjK)^WViJnAPj6I6o0>mDk`+`^H!rRBuOpWuq-;5z!U!q5aP!
zL=7B!XxG<-mKB5t?VFR(!K=IEiDt}+Nr+m#4KUr4%^IAz%xt(@c3Ean)5vauCz~@{
zCL!xu`51W0d2`ZON({yfQx?q0lhDOXSu|TGAxbl)W*#vKS&AueznwA(S(YjA#GN{p
zQpaq<$XeBG8%wiXAFTHJZ5+AcAz1q5YVgaQHkPi_?W-A7n>DA8#fE&)j*;Bw%o&s5
zH`BbEH;)`k2eHV|Etp3M9c_cb2s$xq(KD5sZ?v4F6%<Ylo%tY$kuzO&vUgsCOYf|)
zv^;hu{<4{Ac=pZ?@UaQn-pT#EHF|>qu9$NK92^Iz%){_l5NOq$n}Oo|6qG$_XUus~
z*4=K;dKgfMD}T<MA0xpu=Mjw+RHC(lbFUtC-aJ}R<3l*$owMdg-2piPo5Fh#QI7@l
zm^7W&qqL<UfIwR`k4>YYYb-Nj%?s?Bd0YuLM55R4E_HFR$u<;Tw8xhaKvvTPGv*29
z1TN=U^TZNFRs|*iHg#rrxb|C0P+5rtb>2Lw1Qof8@1?8f3x$Iaif=6;;c%q8CL&oh
zPcA1JwBg|G4tMF1N;IKnrb;L{7WH_KPIogr@OwcC0cw>dsF({&2z&_;jXu7Sv2c++
zrG&;864K0=r<Tz8a@+<ZikUS}D<Sd41SE6jq7o9S0%^d!d3p(2eXxt}ON+Z;F3!PS
z9uC(FMhiSqmyDr6bFD|*ook%o3Fl{wAw!e1WHaWOW5}d5oN?{zxPZ^<Sz{=qpnzh|
zJbMg<Z_#pF)iYW&Z!R4}=35kyEt<>5knQLWx{eh}C}R?LE~dv&qMkT6(%ZS-U2ns^
zEt`uoJV0I<Lx`H@5mrof454tQC1>og6|>S^<taH7iKD7xD1|vWlrv^_63W4PZw>0+
z?uw$sSu^)w>A0C9wVgBbLYqwSLm14%?z(qKp@4a_kW&EWEFN)BWC}dD${fD0MIrDT
zGOM`JBYQEkIEq~}wJbQ^SO6MKzUO4o{4NVoD(1OGD6*wOoT_<V7AM+2A=Zp}ehyZ8
zvxJzl<^?&J>75Z`&Y5q^#|*bYh&XR9&qYjFR$DOjEoOw%a-*3R?u_6-1x}*lI>wSs
zrHzP#>3Wubq=qanFf4~~yYjGL3hScj#t4$Jqo0Pa{DmQWuxquAQ<YqZ;YvltY~R8=
zIrv;)c3*b{7tQ33*_I2;E&KNCx0B449Rr@j<bEYKAaJFig4<GCc>jhXjN2*~Kf7`X
zF2#V#Y%yD!jXq4xmF^Pm6tp`-Gkpa2d!|=#KP3e5QpEI;sz9bA2n?2GQq2mi62Th1
z;Sd{+(?@U`9a&Z*V0~>DARU3sSV#koG2EW96`4j&R&ZTKD`H_<6HL$m&Bq{D6{sNq
z7h+&imuXaH1s7MMT(vUOsLcwlttiNj%mHc%lNNyIT0m!I7tS*?wTjf|C8<5!NLt;%
zXcpKkV9$?BnP~}R5s(*H$TCjsqMO!Na8W^k(~B#(qM|hz;N<bBwF}2Q&}}SldUnNJ
z9s)bvE8%nyP;~_tR+O#-gO*M*1yojWWkmr?{Vukd`jXBLV{=;;21^plD%`B;Uu7;1
zqyh|oW$;z`cnPkkXqJ`?5;u&<*oPsVbj~HX!V-~@?^;+;ypjbOUxHgLN`|S!R=$JJ
z3a+kb`dUv!SQ~5`*0V5?rm#i6YF4If-PSDuMJ&WmIAGBo3$C#EDt94;q-Zk&k-h|1
zPqeyL7()_GifB;oCAf`(u?q=l(E{%EN1RBekF*!$en$*yLR~40S36=Dj%g`~cRFGa
z&d`&o$db1?Vpwkng#{p9=7>Q!?5-f*<cLAraaTxTyv0G-06Us`N^BaJF1FM=SB|<k
zE`UwXksg>rA?P-o{7Yb6EaX;k?t=Hf1X{s)y#%`4URhtosq6@&ij#K<Mw0gkS8CfW
zIsYX2@cdkY1r@yxA=K-F0-nX$w*=g4yih9`j8Rl{4(Ha`EZOD7Vv`kwvcf5>BvtHQ
zNv`0)Rg#S3i?~xK=~W!AO44~@OOt1ClqyQ*MJ*wi#nGt*!utzgD;&KFoWpS`55#d<
z+>Z3nd7O@lp-Q!YV^DEAZtwCMgMt@v>?sAtH7{P}QFsmKoD%rPdW()sscIcZni7Cq
zMx(irw4{LpOdgDVZ(fHMA*@U{acC)lt@by-WcqKIEsm|cD-By|R~+oOv#_edc)}=^
z=Sq7<VLVrqfz2w6$A~g8T-0P;cxEUAn^zbQ2W4Oj3gaoD3~W(hJoJ-+!5C+GJmQmq
zfg=K};XF?kXgO2I;hikdvZjG^I$5CQO%q3PvOvq67Eat`ftEXMoU6$KEqgjRI}-s{
zV5(|EIyf0a5O*I&O}LUp|5W4*N}LX(MI{E;aXu8#K+Ys9tgb&CByVT|IA8J+pUTZY
zMV`g^k0gIJ1Ibw2%Kh_Hy4;aeqIn$Wh>1ox=-9*+dWA3G@J0gfx7Tq`Q2~oMuMq<5
z?2qzlIHQq3)b{obt>b7$0>mBMp61rTS&SsP-*(AOoV#GMZUD(Wdo~HjKt2|x*ZX>5
zKwuRdZU|`L=W1dVD#c)3{qYbs<OvtC7KCyJ#}ooefr?Qe&{>>82%rP3ca#-4$MKH>
zp}Lkh2~rpql6NP`IOw9txU=#}Nu~DZoQM<G%pPmNPx*9qs@OOH%wQjx<qE;ZKy4zV
z&tiv|>EgwKB~Q3!HHR%=N1-Y6*q~)ftKF%?x(jd@u>VSkECw)*D5J2y|DTdfRf$!Y
zORiu)li1kM!`3Q(;aUxAk8Rxh1i+ivxKRR2%5@g3Tx{8qh%gxwJWD3?K^5zP`(qed
z<5*tBdC4!QpmGIw#4{o+w~FchD=`LKqCA1og>O?3X0d<f3P;8buZpWsJP){O5|@Hy
zPQZAzlN(%}*!HorXaa@}B3F2kH(YYq;>jRb;|4w}tWDBTmcn|$Ap&3)iYZUQv)GkM
zgL(3?EA5`a?0s@B96>rXgL&+<u-$T9o67)3Z$QadIbd%ifv8JhlmIK(#7Kbsc9K4e
zO^PJFzA?m!$z;g!BJAlNI#`8Pb3Md6r;qfol{!x8dsqdV1xc=SA4m=1F+S5Lx8Q8)
zV%^HR<I?C^9>NQgYC0@pCOg{$8eDFOAoC*VISHeL7hqv`6_%vqjj!&xDa87f5u(lY
zJShkE1p|pB^EyuoKQ@H8>3~Or9~S~-X9kVoY2e3)04Ezf`TGO{;??eju6Bq8(&Va&
z9Km7_E<Y<M1n_v90xIzAg#b1?p{l}(7XsPT1ULg%T>xZ-?FPJ*I186t0A{sAFec9s
zoQ$UqB6w6n2s{s13}|i9<<$^2L~slz4;}RSj0dh_6~WtQ(#lE)eypT2t@dDhy@}iM
z175;sWm|Q)p%OUlS-HHeYj(Jb5)kb>52A}G0YRDp!R1us2!7Kwl)!MUkas0m8Gz^y
zN<c108jT936DR?v^$p1B`bpp$Ym{L%&y}1Gp9IV`w<P0+cHJefBZ|WazFjP_>N_xK
z<eUd<2GgVEkZ@nM2fNyx6To5&M>Qo>f?!rm+hZoqp%hZpbUe~3LL2mVrSqAAn<=R+
zqpze9X5nW_5Y}nz_ttoHL0W~mbGwJ~wv;ZRIt=8o;vvJGJrAjxRS%II3DZ?02xrV%
z2o`lu1V{~6fxwtGy$}Ocvh$_tbYRSx^?VG?VBTDj0tb=<4`)9G#cDU<Jp5{d6nLm1
z9i(nGGxSg_=@_$v5tX`#RUn1qNW_&ML*`k|cM7YRT^?3%4!b+B%%O|T!mH*g59eM6
z7G|8Km3qc}yN6QwYx1nQ+9%`a%!b&EooQU<`3?`jPVZINK4BwpZ|6Hb0OLv)pH%ID
zEtrvq$#RR$Q`n-}?P0n`lg2BwX0Gv2p{x%AaNS&+0^4<5fYUI0JPvKO0M;~nJxmIR
z2{t0%ZOvQeI*))&90XN@rK2X2*060}<S|-Z7$IUmDX?Sqd0?Z9Gi&Q194_te_HZ$s
zB=|~%Q!y|0IN~daz*TdD2g}NU`LtWIRY>l`LA~E&Y^-fx!+xlT&Y1%q+8=hJ%;(Kb
z9>`6C2)bZi;-Ot0s=>soS67;<7qRPqD2u{%_^>OpII34Ohl^1Luup}RwYs_4q0zS1
z!q^+u9_Y})am1r^pd_JVhrJP}1_n!FKJ-$*EDuR!D?zH7mwO}zb3!)6&@5)mD?HSf
zqet0&Nwema0UG57wi+T)!A#P8=FIm52uXcmw=o<T)u!Ujn^)!Gt<*Pg``_97Xxf7L
zUXKTA2H3(lM8+F37XxL{Y<d*u|Bo<g=BUT8jkD7LMz!N&-MrdkNt6b(TUHV%q+wo@
z21Z3R&8;5Zf~w#F2dSsdww39Yd2Ni*00LARcMX&$ZSy*h0q5O-YZK)c%+lAVVF=;C
zMQ^8qIrR-`AP7g!;sr+4yfKYI@(^XlyeW;MhipdHdP6p|=KIn(HmKAFwjHz?Fk#=E
zMr!O5FBNi_H*ZM;H<Cs!n75{Z;kcqh=KIqK;n=L;(7_LQ1l!Zez)F-DeH%Yqh$k08
z$X9qd-j=~?bun~08{!B73jCiL6t(HFRfYIflFy9!(ITXsI5VL`2WJL;EQ5u3U1}it
z%;wCG7o!E)&6}U_c)AZY(ur6q#S6Y3ZdnDDfTil1IwLz3-s1H*JQD=FsIf5+MOfiY
zT@SU=EE9BP5f^bCNDVk1p%g1X3&%ZM2gmG@s0qC$q$s#xn}?zrLQ!z9)}vUJmbgSw
zecYw>a9>J@f?KqCC@w^cmV*nlc}O%Z(90SMMltK=SMxBvmjJbDm|yca*jkPaT+OFx
z-tKYWRL;X`nRj>`+j>Z6lX2H5c8hKE>mI>3-(F7=l#cn03<@UnuBb1`1@rkkJ&GGk
zf&(?DC>8TAk75fFi~&P?upsPE|8{`Fi9<H839C<=-%Y__1|!gy&TjRJ`MngFD}s(h
z#1s0e`TZ0Eg)te%^%?UADL5xBSb)1^9+e8#XU)4)NOl;v+G|~_!|QYAJt-u|5YF0~
z(Y$$Y3P(>~S}Q{Jd40jWFNK9o0Iyf-i{||)INLO6x5dV-)NAGgDL4)}Vbe-%-AcV~
z{xAg|0It3`aJ*suC<VqWxIF<k&Fv{LwO*q1pw|941#kB{+WNNnpa)5W!la)Y)8>v8
zEbQk-#r$asOr?i&C#r55xZRk7L%I-<$8o-adyFXrQHMSU+*M2=fT_->*{L*eBQXna
z!Zjk6bEScMhgtXl;W1aa_l68`+0Y>jM!hCHA`F1Jfjfz~r;B}K@e6e-&1v(O9?$x;
ztaGwcg}3-`Jk)N9L*CUCsN#&)-+D0eZemX^09Vb&Jec0205)U(&cW74gDX~?wigx5
zCLsQo`R5o#T}RYGycR(ra|}hiEb}ihG6K;JcOlo6ja3Fr6b~6PoiYC!<4FijaEGiL
zt#;wmLS#&>z^wU1jN4sVX)nQ6;ohU7%$a|SQRE1~I+O|nK#uC24rVYNvxv`P?uwD&
zbg*~Pp}gr9(@Yo4-5I=`>=w-@V>Hj7P+SpB!F(!4B)?Jiu!qxFT4ddPI!5WW8qKuj
zSjB|#nHY`d6LKeo>SELUdyG3+!xr^26lUZ`(ehj7KVoERe#}*}+(V!V#cG>-Vk|2-
zF;>TXHpW6zVZ7BLH4I%!*}_!vxfloh9ohA9wt6`E^!XTF*t4UGZo6UwTc$SGs`<|t
z4JEJlaLNvbHC9WSzl>m9$TeSxajEx2vU2!?Rp#*+TN*UPp=2BkaK+D=dt)Rvs)N(2
zD$h9hbYBeb;)Es+G{Pam_9$l-%ok%M%M}gP6Raa}y~BJdMzyC^DAaHy=Cz|{{wpTY
z;TKJ#RjfwukFjuvV*6^n&yaDU3r=g?Fkddi#u8R8=SaUd%~u>QLRCxDVcT~t^EC%q
zhq%DnUBh8)y~d3_z3x>wRHN&PDyEMUF>VV-8XCHt*r{Urz#fF2a?q@-*NJtvCj)?m
z15q&+dJ8HRBSc+!Rm>u%#2A<(Sc)9%Vsjd^=F}KN^&PJKgkH=lrju<BZ!qGi+vMOy
zr`p0^LJCOTU_E!$7WNcUV9x*c2(9!$3!4im6d0t-@!)7-qalTaVcS6TarJRkTi9?&
zA;e<Qnm6aB5bQ!g7A9Ji1#?~shnaL&p^|xV#156#qB-B8LCs-yZ~@w%;FHyxCr9s|
z=u^dWKsSVVMz|06t!bd3*!bJrihFVf0bOj#XUtRvYJIQO=~;8ZN!;bZ_UH;uso)mi
z^bu^2A*Qw@@9bXHU>F%moH0*xiFTtz4u4<d60tGb9Z(S<dColD7m7=b)U-U~sL*M1
zv4e7Vb0@u7jA=eIy?~;h>tWJP2Z47#gy^0iO$P3SkrY0DkDxo9b{$6OthwAnmGiRO
zMcACF2Qa(MNx-~mcz}54+zvdU3#RFzbnA)>Q0lU1S{_8RO)p;ytY+FCCQD3Y21}^p
zQ?=f~hAA<sX4zwC3tX^gKxa(XL7T#Ej4#=Do|&#KESOafM9AkgM5sVrYPb`)<^i(b
zhTTIL76Po9o(C?=uDbG?m;BZ}Xh#I9m@7O8Q75tM+w2e6MZB)p_po6fvbBaN)&iO_
zgEXi;K-g(e&6;5vBo%}=dm{zdshQ229Vx)<&bqW13+0_2#67tLvS_Y!kOmAj@Q4p6
zsJj`}z!drI9xj36?YJJnTqOdIsudtGRw)p0Ud<u&lYMKhy>PJ!;01Gy19x$p7RQ!a
zS_d;zsiK4T#!wr|3m`<`b)cr0z?2;56}VJyhyhdzjGqpza$^iZ0B3nZf!k>NQy}a=
z3ek)?;2{ItbKKtMt~RopH8*((jG%TOV}YlNv32$m4;j>{C#@=+HwQfg^9m+(1Z;=8
z!AY!Xb8{NDbD8cVz$)gYX&4P8K&s}JGz8Hcp#A}yF-Ov{h8%oGFnRN`G-y|w*AGZH
zXI`ELGG;m=a1c6gUXg}2cfsck(1Lko8no1h5CXJlz9$XB5$WZjgV)Tf((o3H6Ky5@
zqu-kcbuER9bTbcbTMPf_(KJ{Jr-ow1v8Vg$Gy+Tat%h&(HF+4e<?xE$ngXjl(k1#@
z4;k!2G^bVRct}?TSG8W}fuxWb3=YhSd3^xrHW5D$g20LI4L;o}SR~JwH~M5f<b~8(
z^Cp)n&ylQigOSTOi7i;2TQEP61DB=fOtp$2o<EoaUbmGYM$P<?!)T0PIJ?WuGtgge
za}cbJ(J(36ZslM~?6lFupY$j?7Pw{3v%&(OH9wVxW6nmThwa#6(bY>EqWaTmq@5c6
zVo8@JZOH4-<e)fPtPP?4*)*JceR|jg^;|SRmk0M5)XdMP5oA--o>xH@b@K~p4BScN
z#;3<=m|sleD26YnX?`h<;<E8bE%VE1BwLbP1yJ6$&99`9TuyqtTG2Y@SJP<Vt}0>n
z5ys`Or4eiZafWOcl!|$K8l^E@<1+#ZubOw{z~RqgfCkB7#{7B?M$%#o&ELp@FGIV?
zAlFRh%x|WV;PsMKjL&J_{8kz%mCb^AXCa2qXVJXNW5I>Ifh{zxM$P=ThctR}a0Gm;
zo8R%t2#J9cON!qxzv}_S4}neddmgCsjITq>{JsaGskjgU<wGZ7;xTGh+U5_6kW@`b
z2XxH4i?EzFARe||-sABs1csnJtkQ;|``#E1BX|_*1njrGFN@(^jBS{^@6UpDlUmpX
zi}wRr1h)yUD0Aiyvnciu7}_vz{>Xz>E3L2d-Uncd=Jp)eC^$FK#&Od>_Bd3fqlCO}
zK9~i?)D80|9>sFdXV5fv<U->-TINqPSUOX<ivb;+_%k2!NIK-j8XEEVGvF2T;e0qx
zKm%SiAMtRW+|c)E2*YWazevG20VKyDfl)DcI*fIAPGxpO>{F<IUAMO3Qv9o24DP#1
z4KTy}bq0e=Bez-IhN=9~3<jNex`m;+%$vXQIB-m;GqM905Iqx&sxNrh#Q3`q4>oik
zcY;(wVGHBq5fB?k9o>Ld;;Q-k5Z>zYmS}ISvFoaKUp)G4Y-0RFhyoL{*U{1HCp&Cn
z{9_Ih%*Oy{&iqq|1GfT~Vl*odbbkZ)HdGPS=gmKdc!Ja$Cf>X@wlMxBM6ek-FKruJ
z82=i=nL&Mp?A?|0BDOI;5#qG4fNi$By~MT9#!kk+g&09DHW(iz3L6@Cg;=PIx@GPC
zYQbrmyF;9COM^SLpA3OX1|dh<=2Iyg$2slAj`?&5hpcgri8wmb!Grag5J6j;avQbb
z$olsX3*!O~a*BiBiE6`-^&cS;8v~b%a91h=H`YBN0(ZlNcXHm)^B2yn&!+K^k?&@B
zu|5|f*bOh_$FmqJfm-6c`Fsu{&eHWdYj(f9jUAHz%t2z!#GNd=W9`PG`9cnsRT8`O
zawhw<Q8UL&5P9eq0SWZXI<V{J-VhrubTl<NT3DxJ*PY=(pbv9j39>f1X}%cZthL(=
zcSlXOD_wTWd?`fLvZZgqNYz-4w)w9R2YbUM_3N1XOOU00*k}53h~w%Ob#Sv{z7itY
z4o>bh2mR8lny==dhEsfV#yk+BSg)KHxaO?+T8Kcc&SOXv0c?%%B_sB1bIyD{MAJ}Z
zG+yG$&zt`a(QxB~7dz;5#A#iuW8_9AvRg3UIEmM9amXG2ehRUU__-24PsNXa%Mu|;
z@d@9UJaOVoym7gSS0@kR37|u`uXk8}^WPisK+#^a2hYvz!^1-dKzZWCNh$0h(hry$
zfVtZo1m-oMx(S#cdtSP11U1DcESv4ccEQR9cD~@>#^<TXJxs-^{hZX9Bo($VAG?g7
zzkEnfbGD@pc-ZdY&2~kz#mxUOXFTB1`Q)LxM{L?}5Nmm%?i80`qhp`uzDpGBZSI>q
zTz4wJ`CBuW-_725*cp7CVHJbt?9O1Z93Q%mvE^>}RSx*o2WD%MBE!v`%I~bFT;r+p
zn_ljMU+O9T8&7&)n0(b6SWip72REUfkxmqY`*c=I@|8PXPbHE@q~m&?^&Ob=5*!>L
zPu{9KpQ&=Y!TM?+nIy<A%cGL7&XsNMNhl;Jgxmnx!o&%BHoxycs}Uj8Ys`1@9?fz!
zF@7NLF&?0&XV^OPxOA#*wt0dFAa)en5Qdw0%+aJ2Ky6qgdQIgux^InW(=RhT*+cbI
zNgClMkATb(tb&^i(1tGm{9so9J~<V#q=^kH@ju29(adAGjC(v{6u0WLVR|O$)E6Qs
zSep}V>Ns)aRH(i>m<|_pUkZ*mQ8JD^-oX4)0S<iKK9cm$6d+-cr9(*nYyqk@SAVVm
zY)@tVd=VIf6$jaWp#W^dME_zI>|PCt0%IL0!GqPIkFZ=<j-+<g_2o$Z8I>26Ai@~(
zi2F(qQ8&o4e`w{qOK_tXR$g3!h)f-mAg}IemHj0Y5TnA!PhRpM=uk4p$H50jqKouH
z4~{5!=j3pf(#E+7hs7HUu_z$PV;bK(7R^nxo5h&=e8$ld1eeLHOK{wS8LuhCq2eOL
zZ!N^IM!;(e5yUEZT_G5}!6vmn8Gc(CmOX*Q+8isxlUb8KIbuGRGe@BAG$NsmP-MgN
zx(72}UzjUKTMG9LSzJzvh%FdtjV~6XAx{JkN#f|;UyKP3g_vJ1#bl$uQjEb;B@W(K
zi*Z<<;5<-_gM6^62qNBntr!>i#kgND#f`$^{dX}cs$geoxyJI1VoX#Z#QdLPOrIxu
zQzGDfvl!WD>yS?rBm11KgT-Ve(@Bue*y3&}#udlVNyTs<-tOcql06&~iR_!QZE$Gp
zNI1RB&BZAG6{nXLBiSdJjuc~{Bt7G4ZYf4`4>rB57zNiG`BKx%i!o3Vb(}uY^on9U
z^q<FjWig)3PhVO3o?<+kpW?kLi>Coj3f^gb&II^0#>{gkKy=6PVK3^-tk0W(DCbGm
z=jV{+K7@R686x->zJPqm7+hU)@xWVk3?^;|!4NXf7=spUwLNnTs_fYf%(KRz$&h*W
z7$iC<<lUn;mmxxE62!NZA#(iKr<E@qi>GfYUsi^vT;a9Q@mPpDR+$8gCp&QdW)f6x
zbPvpIDJl+^`1g<JvZ#rqMB481GDL7Ocv-hS5vqOewlfCVzool038u|;c?@p&dTw_N
zu3UA~Wy=dEK}A%U?PYk_*OPa9%}N;-#GDsgR?Bc)PVQ;kwaJi~Z?7CRcno*F3{zzV
z8&%0GxL1^+!)>4!2m57M>U~he!FWWJF1Q0TEJMzD>2{+GKN$w8CvJC?5hZWi?#yCY
z4^A|yt|~^un6eZqd*5D)YHfZ?VXiJlrhOH^X8Rq*$i5PE@|f=|#<V3{PsFGgQJoR+
zLAttrS21q<`t0sv#Q53SYl;!0_hzpx#w&Pec2AZf+03xlg9q3UPd)SYwn?eNz@|Sk
zA(8r4e{>>jIC>JXHs3!HNm!*HnuJ2@^VUgF8GL|8c$3HUes~h9MCX_vm>gZa%0HOJ
zckh$%+&Q*~qrv&(<I$nek{rxWjK_CQpx~jqpBzsmi^AZAyPq0QqB_*q?WeOOaLnk*
zjK2BhGHAq;Un#{@pR>)?xrNQ!OKG&GzA_2fJ4(r*nYdI9pJn^?QUdC|6v1zl5>WSv
zDGX16T@@#F`^{2H6jez1Tcwn?Rj|MP(`)Z6rJ$cC`{vraa%rG(vyZL)PB|*N)R85v
z|J`yD?a>U?@0C-b>AuasUyhr7<Kf<10xOB!LyDyM55{7n3p1~$y?ZPb+K{1o&sZu}
zk2gHHJ7nHF79CY11uu$lml1nAAba0fGSn?g_WrSCC@p#(?E_;eP*6nihhr&F1|&Xw
zN$rou(x8+S&Fy1pP>z2E?T^QzqX>`w!LjJbJ$m%)PsUQ9fQaIbECu&K;i0uo)kugx
zG!|Pt8y_Bvmh&RoN5&FqoU`C5v_Bh5!Y)H|!Z*<Vd@K>TntA-}FUC?8yn1$Lme5*l
zy15)bclMWKv7sC-y_;#x{~1f9>M>3CS7Yh&UN-yd2SH_TO@4GN3Hr&|vhtSM-;AYT
z1P*z0&HQa4E@s5^>t!Dshm4xYfh_S`|J?-G(bHTXpMb!>$@TXWV26)!{lf(KdW22S
zl>Orb_|X$mpPqmq^<LLMjU&Nmidgi|6A*Y7{mTT{A&dTX0{oCgpO^qYV$o+NAV{(3
z-^P*X@YFuLYaDX=5wp9;5onamPmV)_;LDxQPh}B{p4d4xyK51mqUY`Igne6QTRA>z
z5aXX#jxYJ!w{cD{N0qEC>KWyzzSj03oJW@9`&wK4Gt2SwUd%bGoCH;3V6X70oU_X*
zP^mP<Ipq}6?9>xC=a!R5%TpxhO+XSohjadeB%qJoJeov2h=ivp5&v>WdkHV3BWBxU
zDZ61hn6R{Lp5&8xOlzgLBnO_J=96jA?m}QcE2tL~L8|6Lf^Zrhw`&_4OM?;Kox{n&
zZ%L&h?kw(u)>EnW3A@jwllASo&u`lEcet#;1CGt%mAse5YvQ^C|B%i(zUL&=dxFzt
z#pedcop6(*NYNQSIZda&6A3{+?%<sSYrW7NL*#YmfDK(<PBagR2Y>nh6%V9pXR=$R
z{ZdsvRd5cIQhafpT!~sopVUKZ+$Y#L?l?>6P@JofLzgx-@L8<L!`u6*X1TVrA#D2D
zEKx#zN=o8yJ2#Q?YQz8;*AJ<8zeom%$l<A||K-6@c24c#KC*k#$w|fHGpbx18#!qD
z;LpcOL(_*`C8GZ`?@o$yeBi{capcztWb|YGdWFZ0tCr3=W~ncSGG&hzlXr8x4vv1s
zdEEx?^zat=L+aBfo@}-uyCfF(i4$dCdfV|Hm8}LY%(EJB2_c3Po+PP5>p!%*JRRLA
zC7=p$x8p+pNm4aigb45#fYWq^*4G9*aj^9Bk|x0fR6T&V13utx?mO94b}p=}gFh^_
zo(*f1)G@amu3Gm_P~rKo!VECYN<S<WZsb<DIbtE)u19#*26+EPL34@bxKi0BSe!3K
ziKeVw*{*e6v*21vg*SL;A~cW+(WzN6|D~0~(Q?=@at`5spQ4*f=F2_>8p3=9U-NoS
zWs5Nr@hXJGrZrzpL~AjuzdQ@^kVfRSQYGpu$bAQM3XbqRAZb+bIMk12d822(R!~)q
z+zCw)jbq2_T2xodmWNc`mn7Adntpv;wQNmrr<2-)3YxKL9#R!vd9rOTbJJ_1n_Jm@
zx-3Waz62CIS5n0Hhs`|1OF2gp)K`b=0oL(q&O>rq1YDhIQBdPCSgv!0KP*G?&17Pv
z^49T~Nv~-iwz7TtKf>yD2ZEXY4JU+nUPY_c?%<gO4W9gvt+^kQ@*;t<(R;Cdz8&)$
z%*CU^MNQ_t2~B;q@>U-+Oo?J7m;53VEomjg*KBp%*7*hZEFO-z<?RJ>34b$U)S?j4
z+~1TI<C_FLGbiM$j5oZRC~aykZzp)AzGP0$Hd0XWP<qk^opyLn5bK}8LzeXS2d$8R
zSk!WkU#ds1KzR0tVN87}C@B<7vPqe<HEzDEg=#~4OXVRq_@f2Yh=g+Ix~jxeh3$xs
zQZeZVHXo9H`LwVYp+xWkr`$JM+Q9P^u(~l@x!ZJAC^WuV#8LP#iR|^#9L@OQ<?34{
z=XpG%$xnROZ&T7H{)gQ@Z)WCjH=dvDtAXY&mlnPjxaBTEpXeW3#5_W?@B{NYyi#Ys
z+M8<=Whh8VuJiI0*_7Du|BGyA^Jq|tt{3qL8K2jhyE_ldrzMrt3z{I;<(E9VHszNV
z{4NfF3w&C<+=!PKeq9u;a<pJqihT|3;v`FZS=L;Vq~y9D{Mtn_m)Fjo<r`|-w15yv
z{Gc@PdyKicr&XKeUz`6T0@Cs0q|ZJoWbX9|@|e(;Faeuu@=nl6VWN9H=;R=gvSL^M
zTZ81_v7ko;$@)mpDfgCCKdH5fqhk81y2pgh4RTE$5jw9d<D^V20Wq9()F<iLKhPyy
zb%u^A=}Ft$_A+OR&SgKR_l`p-@(V7Z$d&D<ZiWcCe=|e=d=Sw1&NZG)$7lNN)3!Ro
z2dm!k5c7eX4_><$Z!?2*{osM?5AMEks<ZEgy@#$|-FNN51BVV=cX(>YzC$<fzF}%`
z_~t$P4qUyXSzEk%wbQ)XUa-C_dEWVdpGEQ}G#c`ylhW<PL-e+t0Lh25Z*adm{ECa+
z;a3c<+^gJq_pqzEm#FjZDI=}OcS=y6KauG<o;W7w_^0w*Lpd%FB;~pvm|nWlCqn7U
znh2={DU-5mJf`NZrT|DSZkSTGbRfLIekUkxR4^@TS28ti0WvLPIpo?$1;$OjRa0P+
zh&|zK0sNK;TYf{Q$#2Yw@*Bd5-!cQ>w`gklEqJP-=1p~4Rmmq0r^m&mnQ?I@%*5yc
zV_?WK4rco!;j(%Ze$K?tS@<~{Kj+}*T>PAepY!qaSo}N=Kaa=H6EemlGT8#a6Z0OM
z$FNM6Zip3p2Jp%XdNklHObhC^;Kb`A?j=%?O&{BHyUeV9fvw5c<L30+E|{8lN}X71
zJ-(YR#mZZbi~2>vl-Bg`z&S{7Ari>~olW9Ey2!^R^ZpeUbPNrNRM=Pu<4mt+`hk0C
zai6aNuW8&i#$Pax0MS<boPwWI@k6dZnQcO_?5pr%lkE2M?Nm#i*?Xa40nHY1NBX@P
zaobaa2<&vp(a}=hVHENqO8j?51k=q7sw4rP24LD(Nfjc%Gecn7H%NsdSZ9S;X@?xO
zieR1Xu+*7FWg_Y4gz4fWqEZpixe>_vWT;#OdY(YtnvSYPlFzq9d9Da*8$o)sMM^mZ
zsBHxP7=ioc3U!SD9xDJ{cO$?C)QxnT9JotXvXV^BKTfdy!jp<fvU$7!g0&#kkwBgh
z2w3t8pYG3B=EN{`VyWI1_(H_J#5k6L%sN+$m=_iSqtFYrMF=A~XQA+8@D)9Vw+w&`
zwFW1T4FL-PR18=pkt8sx#LRJ(Brc1$QDGIC9wLV=VOK)zFjB0br=8j;!piQM$q;2R
zd|b)Kk&WrD*no?Hcfml3ZuC6hX^bGoY)qwNh!JMZ$!NXTU9PgJIJA~JaSNlcMDiU;
zDnP9((0RW>0{J)zrKvim4=B%h4?IXqTr1+bvaJsqXm+S@?17E3iyHdO4jBcjZy2fQ
zK-Pg%0R>q2pLmJ^w_}6@*TSsN7%<y20gT>b0POftK#tcKC{~>)O6=wZ)H0JgfiF7*
z4qpK6uu>pNMdSgnql&r$bqySZ2<K~CPhAke_^c-#g+s)J1X7?d;E;=aVt`s!P%D7_
z&N~Kx<%0sOpA5;ii8gt;-P{f(GL2B*qD9!-i4#qesYMi<@~HkLKy0(9M&Qh~ULHgt
zwzYkNq+6dGl9Ous$%|*aal>z9Rm(Kz1DQH8f8oW2(avSQ+AMoT2w@CXg+Or=BiR;5
zl^gq%0kdT)EaOZDf@RV9$spDckU@}Uj1M<*6cz+&&cKo&%^8RbT@1C6f%zcK8BiFc
zIRo_JiZRMFP#>f@19Cx_#W;yumkQFHA&r7G=R#deF@$sBK1g#0oDR~QLC6GY&c*OS
zn$uvNF&LydfMkO-14v==8y1zyTqH^vM>`O#C~?+q;w8Qo9((gHcfhUkQMjzw6R$d;
zc2GVh5jIv;6-atk4WmN`&Crwg*t}1Pn0TWkI&^@X^I(BAn$ElUnFLKvJ(G|m(gsC@
zH+d!@Nd(`5XA+RCB1Rux>LG*xCboco2qA*xJ%kV-<UE8BK-F>%9zqCV(L)FU0MisK
zsr7af8|MgI&xa5KD0`2lFGKV%Ko15W8kV*v2osavH9vR=A)qLD2qD1G7DNvrB+$Hv
z5CR}nMDP$o0LVUs5CGE;Aq1fGLkIyV^AJJ+OFx8=0r`gzG9dR5LK=`fgpdX#&m9Dv
z*2GFDdI%vQDtHJXfQzL-%LL~+{6h#u2+2bT2}1ru2njg%A%qk(d<Y={$&x7><UJ2g
z+tg@~_dKwR`KUqO6O2rdcR;NBQ65d1sV*!)?QwPKR+iiF_i6ayT2TCyF4hlmp#n>B
zsSr`ig#~CsT7R0U%}9>f5C|j8<>E`@n${v(&nQu0)8wIEOw^3ilmynK<r<lJ3nEQ9
zd#y<-2YZ&4({(g53J(S%4?G+qYi*ZD!VSTb9V%j316Q$JF1juz*iJWG85f>vBc7dg
zgxzxZPL7-502+aI%JIPDWFDb*%8?>+PO1^b+PjiLIv60~*5o}k;b#~ZkO<aB6a-nC
z!n&j*17@n!(5?*vcpRz^dElKfaGU%FE5gIA_RuR)tPL1s69o1nf@P;51m12NL5@|y
zV`5@nx-fzWzB_DV5~e~IxMgNe7B1eHpn<D0NHS++S%&3jrYU+(mlz>Om0^0rlgriQ
zHXsqRoCRV!ejpJ;7ROD;(jPkssP!V<P*Q8<FAENi0}~<Qu$(-Ok*bnSF`MnlcENI-
z4r(LY4lKuV`4ZpR95(LAGBK>!20YZ2Ux*X(IVc6)om_Z~E_N~BkfB91IPx7vfFW5i
zdwo$LvmstU;TF6(f)r5%(OyUuc0ft>Y~UAC6n92cju@H5x2j}(y#@%UaV2}wEvUzn
zXdD-kgxy!vjwGZD2`1@F%PTy81cGn~6_tP<(fu;IWJokg@4Hg;Yyqhz>3m0}fnq@A
z*8HVhqa(@3j3HHt0N@^H6PNrDX&`&0o}?u#Oq0q5M$(jUF-?<+(nR_ahNkIr0yZ&+
zV&*1Ymmb8<$snu^G_c-BK&H;)oaQ|v|I?&_SA76O56XWv(6)>8MT>q6<S8Pt>MgmG
z$fDd#P(-7}L?q~_bTO<C-dL3P2}TfG9QVQNhOo6cD=j()cDg<JR5nx(>5982D$U0N
zBGDv0f+`A;FUvW_$JH^65QNg4V`m&$5G;sP#ab_Fm{1{Z5J`#^pC@sFe}tgK6iB)X
z3u8w8VgAJ`FPpy$EJV8EVVg(iN-G|?Ayp7=h(%2z4oZ%Jl0+UN<s>oz%S2-ffnY8)
z=YpXTNvz&#@-)S|&$mfwP(2}|0les(Hl-q@)<Xve<&&F6B%MSklEPB~i%36-j3lv(
zNHB?%)TLGE;T$btZPm0&#Is)Be2)3;C}^Ijp{sF^SexQ*4X9F4jX*bF+`EnrH|=uh
zihJ16`C3vllM(a9W8D$i-!?`PX^Q*R(PY9Uk*v5o9a$VXi8RGM>S$E<>^Esr@tAis
zQ9LCUQ#{}uNkM2O5*JH{Th(yVN#tUoxPL=@oN;Z7g}6}MuOYsV7mYeC6nASv10jlO
zin}$TK|8Q_;=@g|sN!x-$fC&8q$%#!ga$>qzg_$xd4q3}4u)hg8;?dukRHGb;ZW2i
zp{ly<VsDYYhjH0M(H4fgM)T;Hc(7TZxs2^g>IwQTT>(&Q5Ny&<(2qIvK|E|`QrxT7
zPNPh_b&vCd<V+F{+eeON?!`mY;j{bYVFO`F@%VK3_HqF;FP0C7>_W>DI~0vrnjE%`
zG7IF$kCKm!diy}KBq^2!mp=w#Oj0ZWj>MLt;bmD$ai2R9TZ$(s?qPLmh|)^JnzNAN
zQJbRh4$H;JUlX&;5oxe<7Es*H32vBmaYrZUE(AJrFYalJ&R)<#SaXMpawOU!CoWPf
zj0%Ul#kGFd8r~u;QVg!fLAdmpYR#RHD6R%1!I}cD=9BbmD%?3s8r!)Lpd7N|k?i<{
z=e$;M`2@E^FqCUN8Bw4cour0A_eoLQ&5;v^8|xBd7c>(&h|r*jrnnok(Gq2Ii|r|K
z5oM|9B2Elmp)MY`S?Xl*Ae6=3Ttq3ynpx%IuFjI;SbbdM;ttOtMtkW@Pp)pW^kM<X
z$pB0B49|+?AwPq33ySqXE`8F~B~B;jfynnB)!g}#oMD`%#5ylYVn4eRC=-x6Gbsqu
z$P9`FB`L`IywVXHNnI=}X==5ol2oaDv9NGY0Egy-7iCylv1|x_&f_wqDi#Q#N>(nl
z5`UOr+9zj_r#q{e!*<1lR3ctBF^koPVA_Xhh*_-t1v91hiu`P_-Jn|iZd%Qq^318L
zM@*T-HFxN<oJcoLY*~RfuU6vx3d@wpDn22~p?Da20$n)80W-nL5_ecY3;mvsok`l_
z{t9R@triBuWG2O38DxSAlx9+_{DVw5!DHtc%dTX$qu9BFtmXYjS;@xPBzf_;M%h^O
zW<ze0s(5^cRFE2%L)hab9<q>H^+;|8r6S`fC^HeOO5A0h&vH;HH3E4&zra>W5sGb8
z?>Cp>kVfD`T088d66aYe1Jqg1)}=C-L`0<O{D&urlA?>%eyV8Hoy5rn@g#>*5wSW!
z%0}h$b0}8-**ZkgH_5wFSxXh4AugU0vL$0^VLOFKB$K9>3R<e{EP06sFI&0~)`>>X
zPb_iZc}zKpMv~r2WHs66td)55QWZ|*G$1aPG@cJBhy%*T7K=xU(C(<!O8j&wik#@6
zEU{QDQuLWXp`<RBiWD`t#FQ{*DCkQZe<^x&Q6_vSGbomhR0ai+M43mioZy@>4yd&9
zf{K!`SQVuRq5f@(GX|*(OZ<c>dYu6BvMAO_sVwrMj<OEL5?7dk4M0ljVvUrdM*rIs
z`mngmSS#^briihHV#AV>tXSqOR!)Rc(3N;GV>(n-j*iRqB@!0PScWhP%1PR>vSlla
zLVbKr5{{KEPZ);kBx$ks$<$ZpRy`?C(y`*?OHIY&B=uNXveX#N8AgqjBu^VNs#t-=
ztwo_}MolV7oFBxBNf=e)_RN%;WmJg=G^W;Z?@OIjn$qD+(K#jl(6~&EY)Xm;AxCmz
zn=}tXfT9Snq<s+Llc5d8hc?TAkJx4d{^vh!%fdr3nk)n4PWLE+k&!->r80W=;O)%J
zbmUQ0n&|CYqJ+99IC^4(UJ@gei4a5MUlJo!C9asvQ@TV9J1;@RA|mHiU7{EF7fhsN
z?U9Y~Puj4*0w1_vZtx-w+@nAZdnQ1|LXM|C(+^ORBJ7KN3XJIRg-H;Vc`a=*(9vn4
zkhS?Gfk@oYD4}FL*%DYSd5Dq~3VWk4Z;xKw8;(uLJ${ywr4)2Tz+JQ;OE$h!Ko&i0
z$-*Y;7`wLD=@)lEigzDf!%$S3C>%HW%mX(p5wek&FHyr1w`8`kkZ!yn`10%<mn?3)
zNcgq|WaC9cUddz$<Hf>1m`VI%c?hFW`*A8`w8Y~VQh^0_N5h5$Mu8<Rz>pMd$dVQ_
zJtUP<ZJ25nSj_W~N(v09idh~~`4-x^)hw{M3qn%g!hp1Rn1!Ty(XUx>@o)>NQD<yN
zMS-wET;fm+iBao3;^N^K5(~Fdv94KkIHkpdH>4JZ<xo#16+#^a&1T6DLN-ELxlv8}
zP)ZUjfXCm5T?Bu^?XNYO3qUNE3Cx|0#3S{i{MmP%NtBGu@Up9{Q0-+`B0*&29GBm@
zS;dte-aIq2xH|!v$b#b?C7{v1&7%43Hlm=9i%?`=jX3DZEKan6MlAGL4pw@njF{-3
z9L)5V7%|Zk`IzC}7ZK4DxrhnNxCifU8^WwyU)KnYxS-gk2`6zvrtEFR!6=M)CK$M|
zN{^|>VAPIPoU}#gfC0lP3RV!oASh#mC>rfn3nHLc!8KnzPlq79^|f7kAzU&EVi^oZ
zxB+NGNp{!PSL#h$kPR-P0km-mi5cTMJ!;6y5whzdbB83O?$M<r-RO}JBm$ROJ2GAr
z(%fup6V1&9FBbyTkXNVTTTJ$rm1NHI?1<_DXOCtTRaYZB1W+3uMGF$BQsIhT;-%JX
zC4Q$W3q`RZR02|j_mnH43b$cZ6uz<EqSHc}P!CxpjgxCmxEv+mMg+$3Sw>A+QCKsC
zt@byNc^__Z(qVf(=mCYTv@0dBs>0+xwCe&#H>0qqdmL<5VNoAB*qp*_I2vucgUu@}
z>JSH8P*~I*4z{Q;8^0#bv!<}9FB}~>B8-VTA^}>?M4gcUEo-8#NPw0%Ieh_sTjsQK
zJHv9PoeQ+=>7;=x(7f6Z2clzg)RYU<Y#{7g5!R<B*WCmrq5TAI6-WSwW|S;ptwzJ?
z3|t{(5S{=P!OA5QbT>owaNuRJ=mb|Z^gM%a5G~F~wV`AM2`J7=@FZBiX6Qsh8m&Ng
z0a`M1Vj*xFeNX_92@YZ36c>q5pb&}}s#B9^8U({tl2<MnqseC_(F!FWh{#D9rb+Zd
z0YgZVVr&pcr!uh}t^?Ml*ZX>~oOCdUBN*1QO*jgKBd~WP*pR#axO;JxLfx>mxe64k
zdhJD+t`V&Ul#~+DDXi&JC`3L~CP6Udq)+wQ>lSl?Ly_>Af)S{BfpUhzNd%s@6}YRi
zq*GX6#0bFERsb6VJ5MpBkk(TcScoS@xKcRv;ZvN1wA!8e#!86mWJ5wyVX9LGV((HW
zCCcZ8Y>N-P&pKg;G6v&#9JYl<a#xuM*oxB1F$#!Y@|W05fK`)ukT4NRy^t?3*Qp5%
zt#e&dg&W4_sv}&kq>dy+fY3W;CG>EStfOnY@N)=);~Ei=al=m!Rh=I6%D<bZphJ3y
zX$?}iJXm@PjQB<pU0D#M@@WJOvjB3bd<sgoYUWb$3>1dBf~DFiFi)Lz*Ay;Yo&(2I
z28!S$0D{$R*5P9r*@`VB{oz4P1Suog0$gLtaSvleCjq(6@F3imlSz0%<5)m!Jgm1v
z#Cc)bb$|!q3Y_NX<ko|>*VpO_bM=p6nxY=O04uUcb^0`ls$S}rL%b3tN|3C;#z_5k
zqb{}L<yCE`5Z5<`y+GCQ;%Weu_zO<rcqcS~t<?KVZ4YzYlU%tpVOw~;GazYUao1fD
zcJm@<0O4gtHPLuoGXOMp$q8u5%T*0b#7?r8W*#L~5({y2B+rdT02>IT&10ewzzHXh
zg94z^g(&Dv-f(0~IxK@4@uC1I!CwW4axy?{sY)PNK|pyK1Q!%m5KwL!fwfh=tu+8+
z(kQHVhyoU+QIb*JVf>vm)CGlQ9oSifKRsw-5+GI(Y$ZLyDn{6HcSUCVPDLyd$2)|B
z++J@su_(cvPia7_9`cr}0@~65fw|Iyj+9og2T30~5S#;mAl|x?NjEweBBV1U6)S@r
z<BqgB(zI5vNSUJ~8*za<(SRTqVRP_}HA<l_XOvvVr~@w}l(!^@(S+7VYrPTH+fYCC
z9T59^!?u+Mniny+LPvv*^>u`oLjmn8o9%Upz{WP<Hf?~J#JEc#MLbx=d9ePjbUqO;
z82c=Zkm3e(ac_-Pl2&oX_Z9A~X^?$Z5GTC?$Z%)RP7r`ZwUVV2VX9F9j%sAtPXtH}
zH6$>yRkAa>Dsx~&U8IqDbk5fdqAn6}AUW`T1T_~ZW`czC@Oq@dLk+SZbqfOK$if&G
zUq^fftcwT%QaCn;1A3XiIRh&!Vp<({W_MsQC^NLeBi7MPj3q4X28BkPqx#n5h+Q~f
zuz`?3tSh!)gPPz1;Z<$UqX0zw!MKv86qPez5qD%!%H}C7VvVk3rSS@lSYy}f0XR|t
z;c7R)k#&|ETeK<zm@Km#ObUmQI3nL|&1I?O5a1TZQwA`9)M(Qh%6iLTw7M{h#G+GR
zq{13qoB&!6;qYSx+!SLD57Oa%_#h8BvH~3OxJ2Nndu0j3eA+G9pdk0*l?pQ0Slhma
zT^SFJI<!CRM43mON;hHzjk>kFhK*nt5qi0ysd^FnmO<GLh2Dx`7h!LtdQlgrQ3f!q
z6)os$TK`%Yd&AD?9qT62t^k{%B%uO_Jq;y;LmJEnkqLc`LL?EM1Sw!Do@>D)JIIC@
znnf^X!YuSKG9O7%w1DqGqujvNiV%@7bQB?AeV7l9p!E5gi<+>ga?lGQ-b#G~_u}2^
z1$aS!kVTl*aFatAv4Oa~()yr3*6E_-`Josi=#Hc?I}Om4Zrc|1hQu;JyJZQ4dITeG
zeWXD4MpB7j)UA(NP!-&$wjHL`42GRzG=Kn=H(=-rX-F{a*5N<K4jEf4uy8fvU<hs?
z3ak>(sR<#1*D=&EvsNS1iIHNEJVc2kKvDDv#>iTD$R_H3n~g-sYitZLA8J{V2q;ox
zm-zCKL)7mI+(;T3b+!V-aaBQdk7VdME`(#Vg6+-#!48*XU?oaSJV0)~P9(zNt=EUk
z(vr})NU&O644ux#in5;mpiD+;(;>2dT@0-Xu1^#q?d(G{YiSX4UEQ65<TH!dn??(=
zi#V+@Na>-*L@dRH^Ka5Ps01vr*AkpavG86A>>`PNN1?(=tDsp{nq>m7;4D=FLMRRx
za6C{J6rR^s6fV2oqGl`MtQ^))HH0=HYNAzXiQ^a*jO59(3Z;Z7kwkeE7Yaqo$&)JN
zL(>Aiyu@85v9>FVkq+_MdA|i}6{!+zIthOg16NCo)Ct`0c{q_mv8{)6HtTqjPx>d)
zCqZQ(OIGF<gULK$GA8t{s4vMSoX`CvB{)!XiV}&5El4m13}(T)U|T8?2o%JLLw2kP
zs|OZ?g~1HQ)3mCW>v8T%%1IkOMajFK&6~oQ4C8trj5dExT9_tw$vmo=#1hF;>@aS%
z*Sfl5s?_7LM<k~-*d)y;5=v>Qo+-0dgpR&?ESk&-TP0qv)ML3MoNXGk+hXHZ>aj=?
zjw2Otv52i(smF3i@Bnc27J}oE2ud9>3vN%qk@N|eS}#$0P;2SVZ1+0a`bg$@8Nv5+
zBkE^?h5g)!`dPqKdcCz3RS1o!n*|Q(LU<aqPRedX{VWKg4t)+$9}5DQ3jdOLT|1RV
z)V&Vggs(&_=Sm~$S_dB>tmG>FQph0aRjhiNc<+;;r8jWHY%p5yUfCAUPN&igI3W+o
z4L1f5Xr1e;>gRUmx82GPzyY5IFh$^CYSFrO)B&3YBe(>+0W9Ls;EENe?Zr@G6A%k4
z>|3I!$A~%z7W_^MnPVtoJEf7^c%^g~a$VV2<paLr<3gsHawYgQxI@;VlJKG-PPA4a
z>Lga6yRy<=f~~?GTt$ici72aZV`IC&J?i&%Vl%hX!3?Hj7NIfHb%fKw-d474(@cZD
zTOTn~;N@f&4a}H7p}69zce-4g=dg$K8(L&EN(t_@8jMFCS&r3s!XR1;F2CGKp}H6i
zUE&Vb;J#hP3>>*pwESos6PcPHbCoRB@HDJqMMGM$1ZD;+nn{QS_Q80oLu#y|#x3eJ
zOTb?{8|PFnTqSCc2zz!^(QQ|3;I@pYe_Xvx=Zccodjs71fc1{o1Y{>!Mlh~Frg5qF
zM6&WKkP$^`&=5zl;52u|XM~ZB>forG$}>(o1j>?(!P7#$K1S70x?6aR0}m-At@TI)
z%LMBPocT_pQW{pf2q3)Cha)ks9T`#7;YW!GdM6`|I5EC`wcckiwa^8pHIAkbHY>))
z5*FS(+e3j+;&EMs)=HQcNnooEYj<r4j&AS>-G{aJRS2E0>xybTeGs?RxpLHi`j!gC
z(+9z7Z%W<m`HD_8o<xX+-hzt72vJvFHJ(L?fjNSuNW@pF$VMa<#87>Q7z3dfvl>n(
zgAvbBCC6Ag)mETqEf8WWr<zzsD-dc6=KOCD<Vk~Dfh=1T7^KVb;AjPPwMZD;4LsAL
zKCWsj5Z|O8p;)v6`LzgkAt0Vxtx6!iK_=Z*sAPD>TyM7m(Zzg-y*T<aF@=fyhB>uE
zR|e19tU#dYCLiL35P?VSQ8+eVac^!r+$yTE+OcO^k#_3k!X=fKcIba_<p9O;za9D=
z9Gw0=-6BFgqo!yPg!>GFG3PQ6N2c9nLKeYza~R#V6izV89FAi6f}+8tHF4Q^q+p!I
z`QT+F-CIV50!8nTTuvccpy?eNSf`P#*+-$T!Xen;neb^yH-;Vyhte3XbzBdI{)zw&
z8@AQs`6(0<NxwE5IV3F(T@^tN%iX1Ad7VHriG*J>fu$>&%jXmg07Xh=6N!Hc!{-x;
z43>=>aGPm0B3WtlWU~lOj0B_$t3g*p?MfsS#1DayJm@1az7CNbps6^fw##~XoCVpg
zL~;-#N#nHAkr>2SE(|$4D&EVn5ZLT?$=nW|EHsjvbmK-kA@s3$47Yr2hu#$rR>!o|
z6i2?3$<-q`$G4(Hg5WA)w{Fpf91&Pw=Ltc;qHfjB2Mn)YCwnFB@c95W^znR*C679p
zeLzr59d)<mpwA%c?*JO-5p}%9(mTW&vx`lM7als~<pre?4~79A%~>IwXTt!GCM`Kn
z!F?Tp#XDpIiw<LS+Tl(aoO}8@1|n)f_3K>Kj+YSu1}$bO1sCy>u1@mc3d%XC+p$~8
z=0U?<-4>cl(B11J7$dp>>A>uxHNt?gf)_h3+9Nzn(C^?_w*muZF%z7<=ylZTtnh$Y
zgtxjpQ{G!^?7FJmmsNZ_c3jvjbhP@(t{ycxL1GNtWI~Mn7UD|as+qeC2tm7n6R)a>
z>ZyhcQV(%ptp(qX-4;nkZe`Yv-4<AtqLlgy*}E(0#n^R$hGS#7+3xldbD|x4FQQy*
z7!^ue?8K0|=u*|*+7O&za43_#8-w22Kv;qdLXHHwkQu-TbDYy&474EOkTv?1h@&%I
zY_+=9rcA|lY`o%m_jVtPVv2+JKDA@pl@c?6;lvonE%A`FW7Cz7#1EIH2jq-_=WlGl
zDjqWO-5gr3Y?XC#AwTZFs02#$V~<FJi2d_kXU+P^+o4w^$c;7gdxGsophp8Nt0Z>m
zjZF4wBbY675P4K*SK`xwwH0?Vmd$8t;%%*SG3WN}5YVO+S(}^^skL^Sfkt?&Y*)JM
zlz?g3(zjrwYOF>|z~B!qsb5OkQpi%j(6>bPxVl9h+)ODa+rh~NhM-@XDLv(6!M<L^
z9%%-)m=-A;bzb0_DIG<v&aFp^0Nf#P8fn#oS(y1~FcKOsaphB5${thYLIW}Guw;<4
z`>2+fWqid+cR$Rt(dtw2)ZL?S{`6e*^m%yS<1zUCSo}O5KTp7=gER2MD-T1{Hdo@`
zu30lpvtl+(3n>OKB|~T66TXWaymO5F#?k95!y)}s_U*s+hMV{7ox0FHc6{NZPDegJ
zf}+anax$wD)#WLB_FlJd|K2G$!SKcnc6j*$Iz}y)h5GQ&;8CZiad`T%1T1g<l;_}t
zEX)Sw?7MF20<F)Ui&-C62scPCnR?|br$Qihh?lVZ-?&5w0h!_}?laX#o$jJCPt~3^
zRRQ#-gS)T4are}<2lnh8-L(7qy%$%ib5)Y<-M<G#UUr!y^o&IpU43}(p~HJ`yk_s7
zOAlUKy>JS6Q~M9>e|F|2>gF?_Ikk7szQcR>Ou3#t#5$!q>EN}<!+wy};PCGKdv+h(
zgKFJ)(}Dea_a7#a)QFvV54wE{eRbl*$+<FgF<^vWjvv19Dj)YCwSEi!-82UOo6SxA
zg@5s<x&8Lr@tc4X@;?gVU--d)Oyc*kp9jn~#o07(!5<GG14&@MZ;`K(aO}7w97ifX
z+m0PSeh>e!-_4o#=%2@J%9}R{1^l>TI6V86Sd!#_Z?pL+#&PrJyDa@%HZ`APtlIJ8
zs3a23Jbp~-%CC|jb$&pafP`bVO%L3u@Z;L12kyL+37ae%82pNaH)~zC>DN2&v~}8g
z=bd-lap%gNE62~g3rS|{${i~!cih>!!+pPF<&Ha6T6eb4#u$G5O!?k|*thV{@w=q0
zTlsCJbw>-FWSh3$(UJ`AIL=ycnyml<zS6R7+Dc-6qzNZZ+$vv^1pieq!mmhhUs3P>
zr=N?V)22`Z9S2!m$Z>Eseu(47!6yFB|7>Cm00NnpU-%b)PBso$1r7~-&b-SQ{4YP~
z8~yuC{Kn7md+(E<drzFW?=1Y>e%5_wnzQbE<ej(U6<6~}hzqgqyaT_F<2U5tIKD$n
zT6djwAJSVbQnm28{H*)7@^|ZU{z7pN>2o2dr|@&)#F_Zn#9#3|K<=Gnrl!soE>ip8
zP42Vx8~cEqU&Qn=h2JMmoaFN`r)@=&eApN3_&FCpt}p&tyG-EmKbyIIL49;P^pdbz
zlu=eE9ee1XTaKjiIFb5}uW!2L*sZNw;`CcWyxRnJTW9IW(rrupd(&8K{c67)Tav<t
z$8J5cd~BJCXS{P8e;qq^SjhD6W5=Yh+m?@g_{cK;#mC{@)?2#emLs>IF1H;ycFQe2
zW_atdTUkG$-P|U>jvamgl5(U4aBJySyb5(cC~lGBKP(7m*!uPG?bgFb4j;Mo$l=2e
z96R<FRO2JJ0U3!zw0O4ybnMn!PuzM0KZ1Avv17|`0*Y;~&+o*E`)_><@_WnSTcH+D
zECcV>BWUn3$<VdqR@U!W3((dw>eoYdDEG)Q6wd~m&G)$q;+y~U`0dKu(1xYkJ_0Vk
zb6b)jA<0LWam%q+9=Yu!Z+em70ac;P`YZTy>yg_IfB4v8q@YxnUx?-YM&+b-V9Wbl
z{TwX(ed|l#{l-0#0Lk7KLQ;QUf9IXT<s_MQ<P;_T#25XzI@^z{E#`cTsng6OHcvs;
zr)_S-zo+8o^1F>W@>EB=HKDyJphdROj~AJa*=KGrd->Izv3U`!)V<~wl-e){%>n#%
z2;UFl`%d8PH+v-QG+45Sk$Qu9Ch+}d%iR~5p1BDW`$6GyzSQu)kftXjTY)_=yUk01
zKL!1;+gvYy)lp`aX5fo4r-E`F<+DbIGq}$dU8Crmrha!DtvmwU!$@L_+h~P;Gv+CG
zH_gpRI~>*TN+G@wr8Lpro6O51Xj7n1lRE51T@RzyVe58i(em#z?j8V2{$2~bDU?*l
zw;Kd@`equohSK%}*MFXhQpiVgeoB5%VJ-0@{B<bcS(aNJpM^PZle{`$t^*Zo;<)Qj
zHqH5hu@@NZYxdr?5gxg=1JslZejW*Y*INU?4uFRTg@({a1<;GI?%9ug4-nu!_gsWF
z9Ke4!m}`*FL8Nb*El3@JN4xQJv$U>ZVJv;g=J1Hkiy)c1QPztkw^Q)F1K2^-j5+O*
zyiP^xGE#3ujkV90@z)LLNtSducv?rvtTp>&C~Z9qxwsLjdy$9oQz;$vkd*gm<lF@R
zccWD*tsAC~RUJQ%0c;7S9FSJsAicdTJ#|=W_%gwI+-4K?+>0D2H<SoBP6&QN1icI#
zxdk~KMtff*xN%RC;xR|-s4=C(@$@h#Zo>B!TQ>WX{mRd`qK*!KCsMBgp5}Rd0fms6
zCvQ5cxJ9ggUO6{y_L2LIXt$2;G*uoAOFBEL-3DsBPsSg|INNYIx1@hhYIYqc*ymHg
zJp{Sa_QiUPW&B4%(MeHgnJdU;H#n+1+cfuVI-REQi_Im>#(Z{j4gI6~(#ZrleS^6S
zt#}z~ac!aviT{O7tydSR9Qg;qn|(5Bo^4)W^Px0#@yaMmz+%EuXb(|}uEoy{kZsD}
z9{j~z@~Js$IQGc9gBXDvGaUQ;+=t$|8L%nTliJ9SfhlmDI?Z7c`)pv6pRuI=Qehri
z1}TmCnN8M#63qGIFr=88gTMLtS@gtB_>aB22Q4S>2vx3xm_N7K79CD)tNH(YG*Xz`
zFCay=HAe#Z_lujW_=^&#DZV8G@Q^x`JUxiM;^)9bExK-V3Hcos$s`Xss~B^=O=W8-
zIY%V*MK*O6tvUkfWjn72g|>d*CZ*u8$%je?=DTeUZ7GR0t%D*i<;Bpq)W6h6*;Z*j
z`)xkyb~E3bMNb|S&XXJN^H#vv?{S{KCd7NmL_9laOIPV8-65MY6se#bv%e18)Go>$
zpkCKNH?m$%k2^Wkk-Y}UOPQH@qpgKXbF8ri!F;dHnbN)Aa5f2Nk<AP=J*OCR6gV-}
zt0g6i`5H;5#Krw|>!#Bzo)51@%_;S&aah;aK`JPfoU4qv&DN}ilxuBIIhi|VVYFZl
z;y+5)VfYuRLHK#>QI%AdpfkH#OxFiEueW(n5)a|OeJE#ts>j(gZ?Ljjj_1c$tPfe6
zFHR&W_uF!MXwN=K^gh&PH~8aQ^<`V*VvMg?3{UgbB-dMzpXzmE9!PQuQ@>_$X^T-4
z(Q3LDb>QFRjcT8-TiSB0|F&4<8hejzI*c()xo|eoH*9&-U8=45?+{qji~RhL&7~OQ
zo4I*t9~?xDsb%;%k(*N%&m3iqRmb@{rS;bqD_?QF(pXZkIq9gILn%!sAEk|-o*}*T
zP-0&Keo-d1=5LxvdTvg7#pw)VUb;zbvW~o{nJG`#OO=jbwxBNHtf=<*ElF>AE0m}&
z19xeWx_OFeFPCw92<fVujCqBnc4K@Ay-f>K$MGv|59LF@Cq>(ldGLCaNp8I=MH@mL
z&su01H2_x`I-{`%y@kO#KW8EyJ{SDb8JjfElXh|(vL~3MvlnT*cpK^Yn;W2FzlFGJ
zw}hC!zO>ZBH6=^Cc%m9!V!1_~cq4XGvYN4)^d$RMxuT<&r98tzX<v|MlyLufW<q-{
zptQDbkhy~6h@WR!xSyFc{n<91vyzhu&GpR|!g=Wk%DM`<vgZ7}#rAC;OsOvo>T}4}
zN7tv91rS%$T}mYXP9tyM2F^$PRHD=dMj<~lnN(Wn)Ro%0*$mvR02R(WHq9Kc_L-N1
zilxPR!P}9P%xte*K2hJdZJX<;+qJNxDC^Y0ltg|yIq)8I?R98}(}GJDhch>|@}Ve)
z<qR}U-?bRjD{LbrWH-h+OV}f|c%jAUi-w_HMm%pV3X<8L!J=))&kA%?oG(*X#Rldm
zq$cBMErUnC(|(|2YhJxvoOY6jWMtL_iz8vT^n1*cE6}gL&(zA|tU-Um9y^9KAO72i
zRnHZvZ#`27=wH7gjA6qFrulmeFJZ=PY_@Do$OpH6%hLfnqB`s7U$OmhGk$BY_?0~6
zcju<#pR<&_)Mi)SS4||b-)?(3rjO;}YKs$Faxn#Y_#M(F&dZ_2m&GHlG2fY6vRio*
zV}z9hHHY&IrPo-*G3L7<8`P7uf%e*UYD`D0-O`7&)~Nlm@N1%;%fhckDYS#BbJEaF
zvj;7I5n6p%^gZphavr#OhI!H(LT``yhsgOG@t>}sRkq%SviY4bdiz3Y_w&Y&Bv`CR
zKF*I?9BN0MG07YKd_Q1i`Tr2$#W}wfeHG^U!%1$csb7rsCH0xNR9(5o{D8=f)44jn
zDDOWQrF-wA<6aMZqgJCG!GGE2*rxdLiN?TBSdEa*Pr3h-&};E3bT2$4amkALQ=8u2
zepxQgrupeem*nN+T36&B`sGb>?pG#i+1qW)^73*cjry8=<L4bw?IxxA^+Z4D8bNh5
z^GsV%zac&9E%#!~-%PZFw}N!VL@5oeerNmnR{WMNCA6R>rG00rE#wYIbq{`!bZf}5
zP4lizUH9*V9YzVHfA}Wxdg(XS7PQVe=h2>tdsyMu1FCCW=K4EhdiQs2zou#P`t<jr
zKAnW(_bm_dTD@uRl@*IyDd>tNJHy3ojJ=%nC_5YB55}~V+%V?dwnxcP$^&gH+7WIZ
zq<u<##?O0f?I*!~@20EE8giiZ8|L&rTdKoxJ{jlBKNMlV-<CTW_6Ka<JJAMOXO1c?
z{|{}BWjKFi^P!HS4}em%6C;Fs4Pjol+q}l%{jtrDUO)BgbM85WT>1H+%_SfDCzdwk
ze7p|XG<Vn>igBFexP35{Fyea;5bN?GD>*t}xVDDY*oULF;z!_Z-Hm-2@<-*5`-iTS
z-O%Wqf%y5e%@BijbRO29CmhxNI`Uk-Z6P)D`wPn#>IIh*v3uyV7<bd$2^&vkoMVcX
zL^*}yR%|!0rL=WuMXF~1%ZbL>|FL={&MiGlu}yy!X_fK#q%r2NMR&y5dky^;^s|#E
zhf!l)J$%&S_5yo|((8IkvHr&PLY$|rF_;%M^xwj^<9aX5$!p=5Qs)d>i7H7Sn}~0J
zXKS$owYveW;R@4x$UbhN4b+0`Cid@s>{vQna^~+X4)rR1Kr!?mER^k_-<f&D82@N7
zLai8MeA;3(!EdiQW1N4oINemA97>hO8XNP^R<6t1^)D7Dzg_=op~da`gvBVX^JgqZ
zS-bwt;!M`AyCT_+Idu0Xcef6~8lbf9#pq;Ta7{t|t1|ORnN{eK;f%CtK4rP;<``q%
z3T)lGI1HSdAe*|<qYb0pzEh7D?SX|FZrf4n#lxnLf4xU?Rnq8v&@pn_QSWIl#yUO7
z%lYG-_BbQRAq{(EK<9Jkj<(;W#M!eThhnU=j&dKLe*Scu!u*s2XWMdB|5I14gN}9<
z*HrWoI$!EJw(Rkk=LT(|R%Z{>XX)1G`_R*@8$ag-EgFX_1m^sJg8o{L^g}3tvd!6+
zz8=cUqbI=QEJ1sPdTfZjPt`2Sna4)*%RTTV?3ws8EUe9wGC0beDZwSi(>B=`dfJA&
z=m*U8$x58?i#9KUU95f=YFh5-r*STj*^J|Wwb%tXJp)r1J(OA}p_}Hy0MBDx6ya4-
z=3AkM_97?Reb+(5@*L33sF$|;TTmm!3pZ8#x5z4*`eqH^E2d^7XutW~X2s0o+dR@3
zdw<h>9w|z*AZO5DxFtN7^lHf^Jj2d}x5_I2T9oX@J@=*Es)W6wE##_^pGi)I@O;!o
zGLCORP8>P>Y(pBQ!|k_8BF?w?^De$ur+}&a<(>gQj|zH_^BS!I_CptPcO7v3XY1Ym
zq!Z6BIovup>rR_E?EmeVA@p)^Vu`t(8}a(JQb3m1U2xge=l_pfJ~QAldFyKH_+`vF
zn0?$iG7snJ2G3m_gPy1lu8Mf}ngX6VpG&!1p0(+Az4SEBepts-A{|rKj~1V+^DX*+
zCDB@g$vAa(z;!(Zr0t8jelErmrHX#FkPFmhX>Zjgil4&Ii4#1tcq{%&pGBr_;EYV0
zz|R}yz2MLIF~9T}iO=y-V-=4-p6Zyw&xsSK`7@QlIp;Ib(hKkA-Jgzms{CHVnM!`|
znJw~t04e169p-8HeV*B7o{8V5LI*qrzfXofTbJ)Qn=A1940t)1->LXb{4;Qqh<ImU
z4~cX~%@d))(55Y}UXMV%RI`QS{C4vZVBul_|1qBz%?#ZQJD2(_{|p>-BW8zzq1K}{
z&GUxjyv_`)E7TZ1XP9$v3iW)Hd*Z~aEmt<pNdmjroDQpDn}yM$dpYJ6-7oQHj{Ld1
zDVcp}*Qq@)g<0fM%rE+Jc|JbK(@7R<bv@=gw&h~<!X@}!1tsSu{cJHOOPzij+^pir
z{T8Wf&uq8w*)1UtUni+49=?@{j}XY$%+>N+y*)QVx>+)JVY%kuEIp2YTg(=z&#PhK
z=G6x$<pur$3)hqN>ZkU5)~tl`<#e>`Gv-O=3n#N5)@6jyj^>P{wln)~3Muq|t976j
zoX$U&N_!~(N2T0T5u5rR+;ICm@;ho_C)+xmiW&Yh=-c}M+Z6fGQ+{=klUqbeNV2>o
z<mqjaOUTm?nvVoLeZYK&U~qP%C*l^=lwOu8aDcWyPd`049y{JV0=&5gGCGboFGGoH
zKi!n7!*ir&uFsA_YRdZT{T5!-XFqFs{0M}W|14hXxc5QuIL#ea>^pInVhX=coZ$FB
z#-!*jAI87%d7D5!ZeAh3H$*xPg15S7Glk#u8mh$;_kdgfsKrhVQ?4CYfXd}5I2-*A
z+=^7*4>3l${+I%%)nn`TE2hxHy2{d0h_zev(~GPG$0u<v1)O!&^?p{;eQ(n4SLx5T
zHNU6B`ac~b;WYC_8CQ;HoWGT8Dj9y<RDk_s=+omtpL$+A2Tz%7GhdRt(mkm;IoYVd
z!e%~svT+JZ|FfL&m#tlKpR$Eco-YP>%H(-u;YITN-CIKWdp)yG%iku`PUS!54l|P9
zp%0Dy816)Jy-_Y<Teke1=&2s&pZ(@p=D)yGwbq!q>dsTGuD>6!O|ku5|A#iW!+oOg
z;LCy=uDhhNL7rUyoN2xyc=R~j5?Sz$r*AYbEamCCg%|PE>)P$+`RMDfN_n)cXhYUz
zzR`6peR}Skkui^p`r-{z`B3LNTi_IdybG2IKiZCTFO2I0H&;B}oQ;|NO!ENhcvSL(
zeX!*MIi~V-JZ#f6-)g=Fn65y)+#NB`Ddo|(S$GkT@cxg;z@u;r<}rz#5syrVa|U$n
z;}RTaeNuPmxcfBfJ%u0Dp>LE{<nc{ysCQv4&JXpXlc@*GJ+CvW;NMHYzpn@Ub8>V9
z)>_%v{5A_8$D>ohql=REyZ(-O^{PmA-jw0N9aCyYo{IkLnlHh(&X3z!38jS^TThm^
z@LNyZX<uzc9iEZYgR~dfS?3n<(H*w^v1wi-eR~<k@Fw)&=GH*AtSxsL#(f>Ia{<HY
z4QP<v$c=X&xQE5L-0gzVUe$4a8E)ra4w`d>hC0aKuHbrvGX*~${{@)MA8F1L`~jeD
ze~c^rYw(SCQT&b-X`QY4eprjX@AUk<&amXadY6dr^ws+jL4f#0efeHsPT@yo^!xBv
ztY<&C?RJ^xVVmP~(H43AP&6woJ$l*bv2(hwT)(<Hy&Nw!mDS13ZPc}#+x`bK{OXMV
z#?6u{1J4BR{lNW(;7Vo9CnDK<vm}P&?{ahdG81(U`Iaqj6O6P5EN>HNMW#-HK0Rwo
z1$?C3(9=f`TDT73clI+q&Qs`Jy}Q67PqRAbY-p1?<a1Qyq5&zV?CA=aGdq1jimzp!
zjdcm}UoH6leiF5Y$CmclIyO<q8Cyqpn<<U0{5%JFd@dPNdgg^vsr@~LR&YE{!AGgK
z{}kkw>puFucngH>)6vRSa|dq<wl>EPX%EQ1&TgZ<<l5%?{v71@<fMGntrr2$`E_0I
zyZK@c7Qo*^&R+vw92G7Z^V3^G*%mR*wIS4o{ispTAx|BwpneZ#<>lv}*Fc*5`1ET*
zC;P9#tTKu0Uk)9-g!X?^<XKlMYHzywk^i)Al@pE+k4L><2R@t#^!~}_0_p$9V=cD>
zJ+=ira`UFsNmHO%hb)~evP7Na{2}TirgxL~FDaAP+cI5W%^>Z0Nnfee#Xi0kKfDQa
zF@AG3t1ED>W-m!{aCLhQR*=*13~vkS_D=NU6n<1UeZTZ-IDVbofu#yQ+qY1cnPluu
z$xO=g)Hk5)@z$U3!*jR%QqYHbhRo^kEt^M$m()$q-}2+I5eJa#Ly#Cf)8hQ^GswXt
zsp>KKI#Q<aqwV=Y{1xk3*B-S8-fL}Iw`-uj5<gS?@8t9782LO39aJWtPR{0VzibII
zvo#oRP99!>`Jj@>Lnyo4b5LJ<EWM#$nd{9Tnvgeo+R0f-df$+Gc0WeOgB!ulHhQT1
zaXfeuc(6O+LAIX$)LFa&^<zv}0GmO_?qgt;?8EpwH5eaTF)2?0?Zk<*@v}vF7WfXg
zo;-`R9q^`%@NXOAVE`Me2g`hf-)qQCE%gs<z4x2{x3sf~k*Wyd_?xhRtf+iP2!<!o
zh^V-PH9;kOFR&4ez>+}3;KH!5W?9zVQNfP{1pHhLgiZ9|!GkBm0iy>Fc=2G=aO7YN
z2VyvQGLdjF#svSruIcH1({C0GZ}WEMRaIA4S66peSNHV8`dtffT%-+su5#Zk#%J8?
z0DbILqpOHtSe3@_qR;4-_HCtNrK9Q48cm0yJACR53`(2puDA#;Q7$3`M<tETeT7mS
zY@YC*AM>UW^(DmPLN5Yc*(ke3>DDQSHKHAoJVothT1DdJpPn}>Qz148&!zJJa!DEf
zTifka-&k>F!-g%wF%U_e%93d|HdARfi~fL0H{eQ4%sNCCvl3W&v~iJSi+S~ki>=kN
zb}_6G*4ES3t4&r^ua*a+H97n8@<gPrOm|CUAv<-`YjN_F_2X6bpG3vu`bo>$THnt&
zeHVE(YrU1u*Sj*amd`GoX6wr28`4vnCWt08Hu+IT2(^UsZDX=Q_;5lN*1u6D3AVpc
zzXI!axXlg<ja~6L(=L$p*;UuNF6kLNHrR&__HP09k%K+1Mib~hcCg(A*r<bz3U+^k
z-zN_CRe|obgIzAb&Nx_`$`|rD>tLM)*qDP=>oDrq{M}5t$g*p?xh6`L9zI#$;mOrZ
z|Gj||dN(mIq5rxCy>q<(2R(9dA@iT^o8*<8E9>8z<y;_LagA3li&q#=^Bq!pi)*HO
zSl@#Gx0Y?9HxF-?C)Qgm&#maOtz3EO03Y3_U9KIjrcHoK+k`gwaTIMXk8eWTL_KZM
zt61CvE^qgCdoLZx`}Dka*9&@^#GXxhGXn2?1UyaP`Vn>o_&tGq-5R|p!4XG5ow>Ht
zIKWsh!PEPq^p<P)GQ39q+qyRB(6vo+`ApP<wc1c#cp7m}s^zS&Hsrojh`#=T{qEsz
zJ-pKUdhf`-;r^joBW3U2!>`#B)Yaaa#$jcFbsy^OAE+H}aOywQJ0z$&yGWOH-y_oH
zWTl=hGM)6-y<wL-v5!OPw(jWCJ0w7IuwDVFHwx|G%s+=sl0M(1cP(yv&LL+tC#}B^
z6t>fwaUAXnf@-PfCrxjZ7PmY2y#da#f;$WvQE%_kLHyl4yPCP^O#^nAJ={@iojVz3
z&XdjcdGqEZ-Ba`}%Z8$JU#6(nwfQc)s_eWAM>NjA6~g7Zjb{bPZ^?6_^XM7%>=$OF
zDZ3^$>JxcqJKk}BzDhkl-a7t4uXyG9Mr?=u+>DQQDhfW#u%5!0f=|GzRPY!$7lIun
zlo^lHuXZr=DUS5*@<{yJXlJ%nshIzVc{KZpQ-9@IQJ8GD9!TWCX3rza%T~y$$}8U2
zG9pi<OJ26$^HioGgZ-wDT({N1oJ3EHG#Xl*g1y^5XFu~FRGH0}hlUsw`?-)8E$o*R
zJ|bli24GJ$arCjSX5N%}zskpqk(CyUCzR!ZXHldi_Ca3bU$pyNx0QWXQudG<Em+MI
z>&x~ESRE8KfHtg_ye_Ddz$New-xf7|d2DuOBF|jaDb~q6G*}H!ex7c#YwF(9&5ORX
zVr#a0RI(9yA#N8_<HHfLS=R7L$IB<!`jBb}&6qt~^vBys`dg{?2KS}<W+^>&TADk_
z1>W<W-)QmCkPEAX`y_9lZgwtHPP66q2K@s0gSOL;h#k8@m`lXJ`pU(_?;o>$r0w#V
zsUf&=J>dE)a-$Ck+N9TkiqeH0C+!95rS&IhS(|5-J(hc);}^F;%9pD&lq;ONWcm8i
zv9@5n9y}kGO$Pf3^0EGaA5F`GW3hk1lH*inHFM=jTl)-rT9wmN+TJ<%hcwMCf57$6
z7IjD4NR(;~9(Mhxk6gF4>*Gl~dPLH*hmoF&{yleXq3Za03!&{2xuSO(RvYQj(*ga_
z(sK6%mS2_(Yo2&(e$+J<U_DtmS7y?l#yDGfTK)gK5|{I@q?~hPvEi4fLBGYGid`}M
zwtC)eQM3Ei_W4?0GvC>$%@EOy*IzLY>j~+T=_9PoEKtuhC>^3f+u=A~+CFK{V#!|K
zh0;2?_;nV`!}GvOY-DP--QqaHKF!u#nk_MH2}N#CyFLO9#k%meS~gC2Z-JbMq7&UH
z8{vJqnoBcMVjS-Ymg_eAzn<6yNgj0dhE>u6Vrk22ZqQNT2Mvg`uYnmFE&K?G-CE0_
zUt=xVM?=Z2{9>&o*KKlETnIk)(b81Y8!eAENMCF%(_+j9S*#k3`zB;Zdp6qn)9za7
zv$<y@M%U~~5Y-KGPiQIk6v>D;Y`>7f&RhGe7d26PNPIVGy>YERIrG$C{@WS>*6R*5
zl{!f{yK%LCHgv8)^OK{A=Y`BSr^#>vpPv(&%W}>~3pBqZG(QM(@_fwaNheTThu0<i
zz&A0?6Ac<)uHS3o^Ic4{B%xtK^2MVSY4rBbJ!eXGW!y9-K`ifQ%6ZY^@$#`%&^QgJ
z*Is>$oqsLP&KA!<RHRmC3NMtL9Ub7y&&uT-+?vDN3a-c%n+bJ3PtTW@k-q#qPtNST
zs}p?rnVsyN|8l3tzYF`q8rcltr)mSUr9YM6+1tGOMUOv`;ExG%Q9-X(`)`j3zxyTd
z<@;Y3ivJCVFW-l%qGikXkRCj}Ur~Pc3y!|*@$V;i_PO2Y_4p4GJo}JpRgX{iA+a|m
z>+|?@Z_G8Jmml!>bPovoBUT*r_|YVP;!;=oJw9EZXN~)UgtYR1nxtn9^umD0pHA><
z!r75Qk3W;({}E)<VUItX;IWVDkjK|!CsAyGHHyz)1z)~KL45XVt#U{4Sz=*hZ;(fM
zEG!fL>Jg8x%NVsG`t<Bg@a6FhVii3Nd>X4D-f+HwPvZ^DvwwZd^H1m5%tbH1?eXbc
zl(}K`9gk1vhWNbaj(L3Q^WrOx9ryUuSESXPJK^!E&%jvSbJF9}u^RnNJ>~J~nD`&~
CG2uu6

diff --git a/embedding/qa/testembed/testembed.dsp b/embedding/qa/testembed/testembed.dsp
deleted file mode 100644
index e347255dde5..00000000000
--- a/embedding/qa/testembed/testembed.dsp
+++ /dev/null
@@ -1,393 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testembed" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=testembed - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testembed.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testembed.mak" CFG="testembed - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testembed - Win32 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "testembed - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "testembed - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Cmd_Line "NMAKE /f testembed.mak"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "testembed.exe"
-# PROP BASE Bsc_Name "testembed.bsc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "nmake /f "makfile.win""
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "WIN32_O.OBJ\testembed.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testembed - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Cmd_Line "NMAKE /f testembed.mak"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "testembed.exe"
-# PROP BASE Bsc_Name "testembed.bsc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "nmake /f "makefile.win""
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "WIN32_D.OBJ\testembed.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testembed - Win32 Release"
-# Name "testembed - Win32 Debug"
-
-!IF  "$(CFG)" == "testembed - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testembed - Win32 Debug"
-
-!ENDIF 
-
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\BrowserFrameGlue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BrowserFrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BrowserImpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BrowserImplCtxMenuLstnr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BrowserImplHistoryLstnr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BrowserImplPrompt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BrowserImplWebPrgrsLstnr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\BrowserView.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Dialogs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DomWindow.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\EditingSession.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MostRecentUrls.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIClipboardCmd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsICmdParams.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsICommandMgr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsiDirServ.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIEditSession.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsiHistory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIObserServ.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIRequest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIWebBrow.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIWebBrowFind.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIWebNav.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsiWebProg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsProfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Preferences.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\PrintProgressDialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ProfileMgr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ProfilesDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\QaUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Selection.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestEmbed.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\testembed.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\Tests.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\UrlDialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\winEmbedFileLocProvider.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\BrowserFrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\BrowserImpl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\BrowserView.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Dialogs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\DomWindow.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\EditingSession.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\IBrowserFrameGlue.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MostRecentUrls.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIClipboardCmd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsICmdParams.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsICommandMgr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsiDirServ.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIEditSession.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsiHistory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIObserServ.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIRequest.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIWebBrow.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIWebBrowFind.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsIWebNav.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsiWebProg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsProfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Preferences.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\PrintProgressDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ProfileMgr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ProfilesDlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\QaUtils.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Selection.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TestEmbed.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Tests.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\UrlDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\winEmbedFileLocProvider.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\res\testembed.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\testembed.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\Toolbar.bmp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/embedding/qa/testembed/testembed.dsw b/embedding/qa/testembed/testembed.dsw
deleted file mode 100644
index 269b880c97b..00000000000
--- a/embedding/qa/testembed/testembed.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "testembed1"=.\testembed1.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/embedding/qa/testembed/testembed.htm b/embedding/qa/testembed/testembed.htm
deleted file mode 100644
index bba48eedd97..00000000000
--- a/embedding/qa/testembed/testembed.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=x-user-defined">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-   <title> MfcEmbed JavaScript Tests </title>
-<script language="JavaScript">
-
-   // Open a window with default size/style
-   function ShowWin() 
-   {
-	window.open("http://www.mozilla.org", "theWin1");
-   }
-
-   // Open a window with specific size
-   function ShowWinSpecificSize() 
-   {
-	window.open("http://www.mozilla.org", "theWin2", "width=400, height=600");
-   }
-
-   // Open a window with chrome + specific size
-   function ShowWinSpecificSizeWithChrome() 
-   {
-	window.open("http://www.mozilla.org", "theWin3", "menubar=yes, toolbar=yes, status=yes, resizable=yes, width=400, height=600");
-   }
-
-</script>
-</head>
-<body>
-
-<h1>
-Excercising MfcEmbed's Interfaces</h1>
-This test page serves as a testbed to execercise some of the interfaces
-MfcEmbed implements - such as nsIWebBrowserChrome, nsIPrompt etc.
-<p>You can test these by loading mfcembed in the debugger and setting breakpoints
-in the interface methods discussed below. Then clicking on these links
-will break in the debugger at the specified locations for you to explore
-these interface implementations further.
-<p><a href="javascript:ShowWin()">Open a simple JavaScript window with
-defaults for size etc:</a>
-<blockquote><font size=-1>Invokes <i>nsIWebBrowserChrome::CreateBrowserWindow()</i>
-to create the window</font></blockquote>
-<a href="javascript:ShowWinSpecificSize()">Open a JavaScript window with
-only its size specified (Not Resizable)</a>
-<blockquote><font size=-1>Invokes <i>nsIWebBrowserChrome::CreateBrowserWindow()</i>
-to create the window and also invokes <i>nsIWebBrowserChrome::SizeBrowserTo()</i>
-to set the window size. This also shows how we handle the chromeMask to
-make the window non-resizeable</font></blockquote>
-<a href="javascript:ShowWinSpecificSizeWithChrome()">Open a window with
-chrome and its size specified (Resizable)</a>
-<blockquote><font size=-1>Invokes <i>nsIWebBrowserChrome::CreateBrowserWindow()</i>
-to create the window and also invokes <i>nsIWebBrowserChrome::SizeBrowserTo()</i>
-to set the window size</font>
-<br><font size=-1>All of the above tests also invoke<i> nsIWebBrowserChrome::FindNamedBrowserItem()</i>
-to find the named target window in the JavaScript code.</font></blockquote>
-
-</body>
-</html>
diff --git a/embedding/qa/testembed/testembed.rc b/embedding/qa/testembed/testembed.rc
deleted file mode 100644
index 70adfd2e09e..00000000000
--- a/embedding/qa/testembed/testembed.rc
+++ /dev/null
@@ -1,1307 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\testembed.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON    DISCARDABLE     "res\\testembed.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Toolbar
-//
-
-IDR_MAINFRAME TOOLBAR DISCARDABLE  20, 18
-BEGIN
-    BUTTON      ID_NAV_BACK
-    BUTTON      ID_NAV_FORWARD
-    SEPARATOR
-    BUTTON      ID_NAV_RELOAD
-    BUTTON      ID_NAV_STOP
-    SEPARATOR
-    BUTTON      ID_NAV_HOME
-    SEPARATOR
-    BUTTON      ID_APP_ABOUT
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_MAINFRAME MENU PRELOAD DISCARDABLE 
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&New Browser Window\tCtrl+N", ID_NEW_BROWSER
-        MENUITEM SEPARATOR
-        MENUITEM "&Open File...\tCtrl+O",       ID_FILE_OPEN
-        MENUITEM "&Save Page As...\tCtrl+S",    ID_FILE_SAVE_AS
-        MENUITEM SEPARATOR
-        MENUITEM "&Print...\tCtrl-P",           ID_FILE_PRINT
-        MENUITEM SEPARATOR
-        MENUITEM "E&xit",                       ID_APP_EXIT
-    END
-    POPUP "&Edit"
-    BEGIN
-        MENUITEM "Cu&t\tCtrl+X",                ID_EDIT_CUT
-        MENUITEM "&Copy\tCtrl+C",               ID_EDIT_COPY
-        MENUITEM "&Paste\tCtrl+V",              ID_EDIT_PASTE
-        MENUITEM SEPARATOR
-        MENUITEM "Select &All",                 ID_EDIT_SELECT_ALL
-        MENUITEM "Select &None",                ID_EDIT_SELECT_NONE
-        MENUITEM SEPARATOR
-        MENUITEM "&Find in This Page...\tCtrl+F", ID_EDIT_FIND
-        MENUITEM SEPARATOR
-        MENUITEM "Profiles...",                 ID_MANAGE_PROFILES
-        MENUITEM SEPARATOR
-        MENUITEM "Preferences...",              ID_EDIT_PREFERENCES
-    END
-    POPUP "&View"
-    BEGIN
-        MENUITEM "Page S&ource",                ID_VIEW_SOURCE
-        MENUITEM "Page &Info",                  ID_VIEW_INFO
-        MENUITEM SEPARATOR
-        MENUITEM "&Toolbar",                    ID_VIEW_TOOLBAR
-        MENUITEM "&Status Bar",                 ID_VIEW_STATUS_BAR
-    END
-    POPUP "&Go"
-    BEGIN
-        MENUITEM "&Back",                       ID_NAV_BACK
-        MENUITEM "&Forward",                    ID_NAV_FORWARD
-        MENUITEM "&Home",                       ID_NAV_HOME
-    END
-    POPUP "&Help"
-    BEGIN
-        MENUITEM "&About TestEmbed...",         ID_APP_ABOUT
-    END
-    POPUP "&Tests"
-    BEGIN
-        MENUITEM "&Change URL",                 ID_TESTS_CHANGEURL
-        MENUITEM "&Global &History",            ID_TESTS_GLOBALHISTORY
-        MENUITEM "Create &File",                ID_TESTS_CREATEFILE
-        MENUITEM "Create/Switch &Profile",      ID_TESTS_CREATEPROFILE
-        MENUITEM "Add Tooltip Listener",        ID_TESTS_ADDTOOLTIPLISTENER
-        MENUITEM "&Add Web Prog Listener",      ID_TESTS_ADDWEBPROGLISTENER
-        MENUITEM SEPARATOR
-        MENUITEM "Add History &Listener",       ID_TESTS_ADDHISTORYLISTENER
-        MENUITEM "Remove History Listener",     ID_TESTS_REMOVEHISTORYLISTENER
-
-        MENUITEM SEPARATOR
-        POPUP "Add UriContentListener"
-        BEGIN
-            MENUITEM "Add from nsIWebBrowser",      ID_TESTS_ADDURICONTENTLISTENER_ADDFROMNSIWEBBROWSER
-
-            MENUITEM "Add From nsIUriLoader",       ID_TESTS_ADDURICONTENTLISTENER_ADDFROMNSIURILOADER
-
-            MENUITEM "OpenUri()",                   ID_TESTS_ADDURICONTENTLISTENER_OPENURI
-
-        END
-        MENUITEM "NSNewChannel/AyncOpen",       ID_TESTS_NSNEWCHANNEL
-        MENUITEM "nsIIOService->NewURI()",      ID_TESTS_NSIIOSERVICENEWURI
-        MENUITEM "nsIProtocolHandler->NewURI()", 
-                                                ID_TESTS_NSIPROTOCOLHANDLERNEWURI
-
-    END
-    POPUP "&Interfaces"
-    BEGIN
-        MENUITEM "Run All Test Cases",          ID_INTERFACES_RUNALLTESTCASES
-
-        MENUITEM SEPARATOR
-        POPUP "nsI&File"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSIFILE_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "InitWithPath",                ID_INTERFACES_NSIFILE_INITWITHPATH
-
-            MENUITEM "AppendRelaticePath",          ID_INTERFACES_NSIFILE_APPENDRELATICEPATH
-
-            MENUITEM "Exists",                      ID_INTERFACES_NSIFILE_EXISTS
-
-            MENUITEM "Create",                      ID_INTERFACES_NSIFILE_CREATE
-
-            MENUITEM "CopyTo",                      ID_INTERFACES_NSIFILE_COPYTO
-
-            MENUITEM "MoveTo",                      ID_INTERFACES_NSIFILE_MOVETO
-
-        END
-        POPUP "nsI&SHistory"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSISHISTORY_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetCount",                    ID_INTERFACES_NSISHISTORY_GETCOUNT
-
-            MENUITEM "GetIndex",                    ID_INTERFACES_NSISHISTORY_GETINDEX
-
-            MENUITEM "GetMaxLength",                ID_INTERFACES_NSISHISTORY_GETMAXLENGTH
-
-            MENUITEM "SetMaxLength",                ID_INTERFACES_NSISHISTORY_SETMAXLENGTH
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetEntryAtIndex",             ID_INTERFACES_NSISHISTORY_GETENTRYATINDEX
-
-            MENUITEM "PurgeHistory",                ID_INTERFACES_NSISHISTORY_PURGEHISTORY
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetSHistoryEnumerator",       ID_INTERFACES_NSISHISTORY_GETSHISTORYENUMERATOR
-
-            MENUITEM SEPARATOR
-            POPUP "nsIHistoryEntry"
-            BEGIN
-                MENUITEM "Run All Tests",               ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_RUNALLTESTS
-
-                MENUITEM SEPARATOR
-                MENUITEM "GetURI",                      ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETURI
-
-                MENUITEM "GetTitle",                    ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETTITLE
-
-                MENUITEM "GetIsSubFrame",               ID_INTERFACES_NSISHISTORY_NSIHISTORYENTRY_GETISSUBFRAME
-
-            END
-        END
-        POPUP "nsI&WebNav"
-        BEGIN
-            MENUITEM "RunAllTests",                 ID_INTERFACES_NSIWEBNAV_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetCanGoBack",                ID_INTERFACES_NSIWEBNAV_GETCANGOBACK
-
-            MENUITEM "GetCanGoForward",             ID_INTERFACES_NSIWEBNAV_GETCANGOFORWARD
-
-            MENUITEM "GoBack",                      ID_INTERFACES_NSIWEBNAV_GOBACK
-
-            MENUITEM "GoForward",                   ID_INTERFACES_NSIWEBNAV_GOFORWARD
-
-            MENUITEM "GoToIndex",                   ID_INTERFACES_NSIWEBNAV_GOTOINDEX
-
-            MENUITEM "LoadURI",                     ID_INTERFACES_NSIWEBNAV_LOADURI
-
-            MENUITEM "Reload",                      ID_INTERFACES_NSIWEBNAV_RELOAD
-
-            MENUITEM "Stop",                        ID_INTERFACES_NSIWEBNAV_STOP
-
-            MENUITEM "GetDocument",                 ID_INTERFACES_NSIWEBNAV_GETDOCUMENT
-
-            MENUITEM "GetCurrentURI",               ID_INTERFACES_NSIWEBNAV_GETCURRENTURI
-
-            MENUITEM "GetReferringURI",             ID_INTERFACES_NSIWEBNAV_GETREFERRINGURI
-
-            MENUITEM "GetSessionHistory",           ID_INTERFACES_NSIWEBNAV_GETSESSIONHISTORY
-
-            MENUITEM "SetSessionHistory",           ID_INTERFACES_NSIWEBNAV_SETSESSIONHISTORY
-
-        END
-        POPUP "nsI&Channel"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSICHANNEL_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "SetOriginalURI",              ID_INTERFACES_NSICHANNEL_SETORIGINALURI
-
-            MENUITEM "GetOriginalURI",              ID_INTERFACES_NSICHANNEL_GETORIGINALURI
-
-            MENUITEM "GetURI",                      ID_INTERFACES_NSICHANNEL_GETURI
-
-            MENUITEM "SetOwner",                    ID_INTERFACES_NSICHANNEL_SETOWNER
-
-            MENUITEM "GetOwner",                    ID_INTERFACES_NSICHANNEL_GETOWNER
-
-            MENUITEM "SetNotifications",            ID_INTERFACES_NSICHANNEL_SETNOTIFICATIONS
-
-            MENUITEM "GetNotifications",            ID_INTERFACES_NSICHANNEL_GETNOTIFICATIONS
-
-            MENUITEM "GetSecurityInfo",             ID_INTERFACES_NSICHANNEL_GETSECURITYINFO
-
-            MENUITEM "SetContentType",              ID_INTERFACES_NSICHANNEL_SETCONTENTTYPE
-
-            MENUITEM "GetContentType",              ID_INTERFACES_NSICHANNEL_GETCONTENTTYPE
-
-            MENUITEM "SetContentCharset",           ID_INTERFACES_NSICHANNEL_SETCONTENTCHARSET
-
-            MENUITEM "GetContentCharset",           ID_INTERFACES_NSICHANNEL_GETCONTENTCHARSET
-
-            MENUITEM "SetContentLength",            ID_INTERFACES_NSICHANNEL_SETCONTENTLENGTH
-
-            MENUITEM "GetContentLength",            ID_INTERFACES_NSICHANNEL_GETCONTENTLENGTH
-
-            MENUITEM SEPARATOR
-            MENUITEM "Open",                        ID_INTERFACES_NSICHANNEL_OPEN
-
-            MENUITEM "AsyncOpen",                   ID_INTERFACES_NSICHANNEL_ASYNCOPEN
-
-        END
-        POPUP "nsI&Request"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSIREQUEST_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetName",                     ID_INTERFACES_NSIREQUEST_GETNAME
-
-            MENUITEM "IsPending",                   ID_INTERFACES_NSIREQUEST_ISPENDING
-
-            MENUITEM "Cancel",                      ID_INTERFACES_NSIREQUEST_CANCEL
-
-            MENUITEM "GetStatus",                   ID_INTERFACES_NSIREQUEST_GETSTATUS
-
-            MENUITEM "Suspend",                     ID_INTERFACES_NSIREQUEST_SUSPEND
-
-            MENUITEM "Resume",                      ID_INTERFACES_NSIREQUEST_RESUME
-
-            MENUITEM "GetLoadGroup",                ID_INTERFACES_NSIREQUEST_GETLOADGROUP
-
-            MENUITEM "SetLoadGroup",                ID_INTERFACES_NSIREQUEST_SETLOADGROUP
-
-            MENUITEM "GetLoadFlags",                ID_INTERFACES_NSIREQUEST_GETLOADFLAGS
-
-            MENUITEM "SetLoadFlags",                ID_INTERFACES_NSIREQUEST_SETLOADFLAGS
-
-        END
-        POPUP "nsIDirectoryService"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSIDIRECTORYSERVICE_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "Init",                        ID_INTERFACES_NSIDIRECTORYSERVICE_INIT
-
-            MENUITEM "Register Provider",           ID_INTERFACES_NSIDIRECTORYSERVICE_REGISTERPROVIDER
-
-            MENUITEM "UnRegisterProvider",          ID_INTERFACES_NSIDIRECTORYSERVICE_UNREGISTERPROVIDER
-
-        END
-        POPUP "nsIDomWindow"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSIDOMWINDOW_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetDomDocument",              ID_INTERFACES_NSIDOMWINDOW_GETDOMDOCUMENT
-
-            MENUITEM "GetSelection",                ID_INTERFACES_NSIDOMWINDOW_GETSELECTION
-
-            MENUITEM "GetParent",                   ID_INTERFACES_NSIDOMWINDOW_GETPARENT
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetScrollBars",               ID_INTERFACES_NSIDOMWINDOW_GETSCROLLBARS
-
-            MENUITEM "GetFrames",                   ID_INTERFACES_NSIDOMWINDOW_GETFRAMES
-
-            MENUITEM "GetName",                     ID_INTERFACES_NSIDOMWINDOW_GETNAME
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetTextZoom",                 ID_INTERFACES_NSIDOMWINDOW_GETTEXTZOOM
-
-            MENUITEM "SetTextZoom",                 ID_INTERFACES_NSIDOMWINDOW_SETTEXTZOOM
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetScsollX",                  ID_INTERFACES_NSIDOMWINDOW_GETSCSOLLX
-
-            MENUITEM "GetScrollY",                  ID_INTERFACES_NSIDOMWINDOW_GETSCROLLY
-
-            MENUITEM SEPARATOR
-            MENUITEM "ScrollTo",                    ID_INTERFACES_NSIDOMWINDOW_SCROLLTO
-
-            MENUITEM "ScrollBy",                    ID_INTERFACES_NSIDOMWINDOW_SCROLLBY
-
-            MENUITEM "ScrollByLines",               ID_INTERFACES_NSIDOMWINDOW_SCROLLBYLINES
-
-            MENUITEM "ScrollByPages",               ID_INTERFACES_NSIDOMWINDOW_SCROLLBYPAGES
-
-            MENUITEM SEPARATOR
-            MENUITEM "SizeToContent",               ID_INTERFACES_NSIDOMWINDOW_SIZETOCONTENT
-
-        END
-        POPUP "nsISelection"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSISELECTION_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetAnchorNode",               ID_INTERFACES_NSISELECTION_GETANCHORNODE
-
-            MENUITEM "GetAnchorOffset",             ID_INTERFACES_NSISELECTION_GETANCHOROFFSET
-
-            MENUITEM "GetFocusNode",                ID_INTERFACES_NSISELECTION_GETFOCUSNODE
-
-            MENUITEM "GetFocusOffset",              ID_INTERFACES_NSISELECTION_GETFOCUSOFFSET
-
-            MENUITEM "GetIsCollapsed",              ID_INTERFACES_NSISELECTION_GETISCOLLAPSED
-
-            MENUITEM "GetRangeCount",               ID_INTERFACES_NSISELECTION_GETRANGECOUNT
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetRangeAt",                  ID_INTERFACES_NSISELECTION_GETRANGEAT
-
-            MENUITEM "Collapse",                    ID_INTERFACES_NSISELECTION_COLLAPSE
-
-            MENUITEM "Extend",                      ID_INTERFACES_NSISELECTION_EXTEND
-
-            MENUITEM "CollapseToStart",             ID_INTERFACES_NSISELECTION_COLLAPSETOSTART
-
-            MENUITEM "CollapseToEnd",               ID_INTERFACES_NSISELECTION_COLLAPSETOEND
-
-            MENUITEM SEPARATOR
-            MENUITEM "ContainsNode",                ID_INTERFACES_NSISELECTION_CONTAINSNODE
-
-            MENUITEM "SelectAllChildren",           ID_INTERFACES_NSISELECTION_SELECTALLCHILDREN
-
-            MENUITEM SEPARATOR
-            MENUITEM "AddRange",                    ID_INTERFACES_NSISELECTION_ADDRANGE
-
-            MENUITEM "RemoveRange",                 ID_INTERFACES_NSISELECTION_REMOVERANGE
-
-            MENUITEM "RemoveAllRanges",             ID_INTERFACES_NSISELECTION_REMOVEALLRANGES
-
-            MENUITEM SEPARATOR
-            MENUITEM "DeleteFromDocument",          ID_INTERFACES_NSISELECTION_DELETEFROMDOCUMENT
-
-            MENUITEM "SelectionLanguageChange",     ID_INTERFACES_NSISELECTION_SELECTIONLANGUAGECHANGE
-
-            MENUITEM "ToString",                    ID_INTERFACES_NSISELECTION_TOSTRING
-
-        END
-        POPUP "nsIProfile"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSIPROFILE_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetProfileCount",             ID_INTERFACES_NSIPROFILE_GETPROFILECOUNT
-
-            MENUITEM "GetCurrentProfile",           ID_INTERFACES_NSIPROFILE_GETCURRENTPROFILE
-
-            MENUITEM "SetCurrentProfile",           ID_INTERFACES_NSIPROFILE_SETCURRENTPROFILE
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetProfileList",              ID_INTERFACES_NSIPROFILE_GETPROFILELIST
-
-            MENUITEM "ProfileExists",               ID_INTERFACES_NSIPROFILE_PROFILEEXISTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "CreateNewProfile",            ID_INTERFACES_NSIPROFILE_CREATENEWPROFILE
-
-            MENUITEM "RenameProfile",               ID_INTERFACES_NSIPROFILE_RENAMEPROFILE
-
-            MENUITEM "DeleteProfile",               ID_INTERFACES_NSIPROFILE_DELETEPROFILE
-
-            MENUITEM "CloneProfile",                ID_INTERFACES_NSIPROFILE_CLONEPROFILE
-
-            MENUITEM "ShutDownCurrentProfile",      ID_INTERFACES_NSIPROFILE_SHUTDOWNCURRENTPROFILE
-
-        END
-        POPUP "nsIClipboardCommands"
-        BEGIN
-            MENUITEM "CanCopySelection",            ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANCOPYSELECTION
-
-            MENUITEM "CanCutSelection",             ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANCUTSELECTION
-
-            MENUITEM "CanPaste",                    ID_INTERFACES_NSICLIPBOARDCOMMANDS_CANPASTE
-
-            MENUITEM SEPARATOR
-            MENUITEM "CopySelection",               ID_INTERFACES_NSICLIPBOARDCOMMANDS_COPYSELECTION
-
-            MENUITEM "CutSelection",                ID_INTERFACES_NSICLIPBOARDCOMMANDS_CUTSELECTION
-
-            MENUITEM "Paste",                       ID_INTERFACES_NSICLIPBOARDCOMMANDS_PASTE
-
-            MENUITEM "CopyLinkLocation",            ID_INTERFACES_NSICLIPBOARDCOMMANDS_COPYLINKLOCATION
-
-            MENUITEM SEPARATOR
-            MENUITEM "SelectAll",                   ID_INTERFACES_NSICLIPBOARDCOMMANDS_SELECTALL
-
-            MENUITEM "SelectNone",                  ID_INTERFACES_NSICLIPBOARDCOMMANDS_SELECTNONE
-
-        END
-        POPUP "nsIObserverService"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSIOBSERVERSERVICE_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "AddObservers",                ID_INTERFACES_NSIOBSERVERSERVICE_ADDOBSERVERS
-
-            MENUITEM "EnumerateObservers",          ID_INTERFACES_NSIOBSERVERSERVICE_ENUMERATEOBSERVERS
-
-            MENUITEM "NotifyObservers",             ID_INTERFACES_NSIOBSERVERSERVICE_NOTIFYOBSERVERS
-
-            MENUITEM "RemoveObservers",             ID_INTERFACES_NSIOBSERVERSERVICE_REMOVEOBSERVERS
-
-        END
-        POPUP "nsIWebBrowser"
-        BEGIN
-            MENUITEM "",                            ID_INTERFACES_NSIWEBBROWSER
-
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSIWEBBROWSER_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "AddWebBrowserListener",       ID_INTERFACES_NSIWEBBROWSER_ADDWEBBROWSERLISTENER
-
-            MENUITEM "RemoveWebBrowserListener",    ID_INTERFACES_NSIWEBBROWSER_REMOVEWEBBROWSERLISTENER
-
-            MENUITEM "GetContainerWindow",          ID_INTERFACES_NSIWEBBROWSER_GETCONTAINERWINDOW
-
-            MENUITEM "SetContainerWindow",          ID_INTERFACES_NSIWEBBROWSER_SETCONTAINERWINDOW
-
-            MENUITEM "GetParentURIContentListener", ID_INTERFACES_NSIWEBBROWSER_GETPARENTURICONTENTLISTENER
-
-            MENUITEM "SetParentURIContentListener", ID_INTERFACES_NSIWEBBROWSER_SETPARENTURICONTENTLISTENER
-
-            MENUITEM "GetContentDOMWindow",         ID_INTERFACES_NSIWEBBROWSER_GETCONTENTDOMWINDOW
-
-            MENUITEM SEPARATOR
-            MENUITEM "nsIWBSetup->SetProperty",     ID_INTERFACES_NSIWEBBROWSER_NSIWBSETUPSETPROPERTY
-
-        END
-        POPUP "nsIWebProgress"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSIWEBPROGRESS_RUNALLTESTS
-
-            MENUITEM "AddProgressListener",         ID_INTERFACES_NSIWEBPROGRESS_ADDPROGRESSLISTENER
-
-            MENUITEM "RemoveProgressListener",      ID_INTERFACES_NSIWEBPROGRESS_REMOVEPROGRESSLISTENER
-
-            MENUITEM "GetDOMWindow",                ID_INTERFACES_NSIWEBPROGRESS_GETDOMWINDOW
-
-            MENUITEM "IsLoadingDocument",           ID_INTERFACES_NSIWEBPROGRESS_ISLOADINGDOCUMENT
-
-        END
-        POPUP "nsIWebBrowserFind"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSIWEBBROWSERFIND_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "SetSearchStringTest",         ID_INTERFACES_NSIWEBBROWSERFIND_SETSEARCHSTRINGTEST
-
-            MENUITEM "GetSearchStringTest",         ID_INTERFACES_NSIWEBBROWSERFIND_GETSEARCHSTRINGTEST
-
-            MENUITEM "FindNextTest",                ID_INTERFACES_NSIWEBBROWSERFIND_FINDNEXTTEST
-
-            MENUITEM "SetFindBackwardsTest",        ID_INTERFACES_NSIWEBBROWSERFIND_SETFINDBACKWARDSTEST
-
-            MENUITEM "GetFindBackwardsTest",        ID_INTERFACES_NSIWEBBROWSERFIND_GETFINDBACKWARDSTEST
-
-            MENUITEM "SetWrapFindTest",             ID_INTERFACES_NSIWEBBROWSERFIND_SETWRAPFINDTEST
-
-            MENUITEM "GetWrapFindTest",             ID_INTERFACES_NSIWEBBROWSERFIND_GETWRAPFINDTEST
-
-            MENUITEM "SetEntireWordTest",           ID_INTERFACES_NSIWEBBROWSERFIND_SETENTIREWORDTEST
-
-            MENUITEM "GetEntireWordTest",           ID_INTERFACES_NSIWEBBROWSERFIND_GETENTIREWORDTEST
-
-            MENUITEM "SetMatchCase",                ID_INTERFACES_NSIWEBBROWSERFIND_SETMATCHCASE
-
-            MENUITEM "GetMatchCase",                ID_INTERFACES_NSIWEBBROWSERFIND_GETMATCHCASE
-
-            MENUITEM "SetSearchFrames",             ID_INTERFACES_NSIWEBBROWSERFIND_SETSEARCHFRAMES
-
-            MENUITEM "GetSearchFrames",             ID_INTERFACES_NSIWEBBROWSERFIND_GETSEARCHFRAMES
-
-        END
-        POPUP "nsIEditingSession"
-        BEGIN
-            MENUITEM "RunAllTests",                 ID_INTERFACES_NSIEDITINGSESSION_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "Init",                        ID_INTERFACES_NSIEDITINGSESSION_INIT
-
-            MENUITEM "MakeWindowEditable",          ID_INTERFACES_NSIEDITINGSESSION_MAKEWINDOWEDITABLE
-
-            MENUITEM "WindowIsEditable",            ID_INTERFACES_NSIEDITINGSESSION_WINDOWISEDITABLE
-
-            MENUITEM "GetEditorForWindow",          ID_INTERFACES_NSIEDITINGSESSION_GETEDITORFORWINDOW
-
-            MENUITEM "SetupEditorOnWindow",         ID_INTERFACES_NSIEDITINGSESSION_SETUPEDITORONWINDOW
-
-            MENUITEM "TearDownEditorOnWindow",      ID_INTERFACES_NSIEDITINGSESSION_TEARDOWNEDITORONWINDOW
-
-        END
-        POPUP "nsICommandManager"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSICOMMANDMANAGER_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "AddCommandObserver",          ID_INTERFACES_NSICOMMANDMANAGER_ADDCOMMANDOBSERVER
-
-            MENUITEM "RemoveCommandObserver",       ID_INTERFACES_NSICOMMANDMANAGER_REMOVECOMMANDOBSERVER
-
-            MENUITEM SEPARATOR
-            MENUITEM "IsCommandeSupported",         ID_INTERFACES_NSICOMMANDMANAGER_ISCOMMANDESUPPORTED
-
-            MENUITEM "IsCOmmandEnabled",            ID_INTERFACES_NSICOMMANDMANAGER_ISCOMMANDENABLED
-
-            MENUITEM "GetCommandState",             ID_INTERFACES_NSICOMMANDMANAGER_GETCOMMANDSTATE
-
-            MENUITEM "DoCOmmand",                   ID_INTERFACES_NSICOMMANDMANAGER_DOCOMMAND
-
-        END
-        POPUP "nsICommandParams"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSICOMMANDPARAMS_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetValueType",                ID_INTERFACES_NSICOMMANDPARAMS_GETVALUETYPE
-
-            MENUITEM "GetBooleanValue",             ID_INTERFACES_NSICOMMANDPARAMS_GETBOOLEANVALUE
-
-            MENUITEM "GetLongValue",                ID_INTERFACES_NSICOMMANDPARAMS_GETLONGVALUE
-
-            MENUITEM "GetDoubleValue",              ID_INTERFACES_NSICOMMANDPARAMS_GETDOUBLEVALUE
-
-            MENUITEM "GetStringValue",              ID_INTERFACES_NSICOMMANDPARAMS_GETSTRINGVALUE
-
-            MENUITEM "GetCStringValue",             ID_INTERFACES_NSICOMMANDPARAMS_GETCSTRINGVALUE
-
-            MENUITEM "GetISupportsValue",           ID_INTERFACES_NSICOMMANDPARAMS_GETISUPPORTSVALUE
-
-            MENUITEM SEPARATOR
-            MENUITEM "SetBooleanValue",             ID_INTERFACES_NSICOMMANDPARAMS_SETBOOLEANVALUE
-
-            MENUITEM "SetLongValue",                ID_INTERFACES_NSICOMMANDPARAMS_SETLONGVALUE
-
-            MENUITEM "SetDoubleValue",              ID_INTERFACES_NSICOMMANDPARAMS_SETDOUBLEVALUE
-
-            MENUITEM "SetStringValue",              ID_INTERFACES_NSICOMMANDPARAMS_SETSTRINGVALUE
-
-            MENUITEM "SetCStringValue",             ID_INTERFACES_NSICOMMANDPARAMS_SETCSTRINGVALUE
-
-            MENUITEM "SetISupportsValue",           ID_INTERFACES_NSICOMMANDPARAMS_SETISUPPORTSVALUE
-
-            MENUITEM SEPARATOR
-            MENUITEM "RemoveValue",                 ID_INTERFACES_NSICOMMANDPARAMS_REMOVEVALUE
-
-            MENUITEM "HasMoreElements",             ID_INTERFACES_NSICOMMANDPARAMS_HASMOREELEMENTS
-
-            MENUITEM "First",                       ID_INTERFACES_NSICOMMANDPARAMS_FIRST
-
-            MENUITEM "GetNext",                     ID_INTERFACES_NSICOMMANDPARAMS_GETNEXT
-
-        END
-        POPUP "nsIHttpChannel"
-        BEGIN
-            MENUITEM "Run All Tests",               ID_INTERFACES_NSIHTTPCHANNEL_RUNALLTESTS
-
-            MENUITEM SEPARATOR
-            MENUITEM "SetRequestMethod",            ID_INTERFACES_NSIHTTPCHANNEL_SETREQUESTMETHOD
-
-            MENUITEM "GetRequestMethod",            ID_INTERFACES_NSIHTTPCHANNEL_GETREQUESTMETHOD
-
-            MENUITEM "SetReferrer",                 ID_INTERFACES_NSIHTTPCHANNEL_SETREFERRER
-
-            MENUITEM "GetReferrer",                 ID_INTERFACES_NSIHTTPCHANNEL_GETREFERRER
-
-            MENUITEM "SetRequestHeader",            ID_INTERFACES_NSIHTTPCHANNEL_SETREQUESTHEADER
-
-            MENUITEM "GetRequestHeader",            ID_INTERFACES_NSIHTTPCHANNEL_GETREQUESTHEADER
-
-            MENUITEM "VisitRequestHeaders",         ID_INTERFACES_NSIHTTPCHANNEL_VISITREQUESTHEADERS
-
-            MENUITEM "SetAllowPipelining",          ID_INTERFACES_NSIHTTPCHANNEL_SETALLOWPIPELINING
-
-            MENUITEM "GetAllowPipelining",          ID_INTERFACES_NSIHTTPCHANNEL_GETALLOWPIPELINING
-
-            MENUITEM "SetRedirectionLimit",         ID_INTERFACES_NSIHTTPCHANNEL_SETREDIRECTIONLIMIT
-
-            MENUITEM "GetRedirectionLimit",         ID_INTERFACES_NSIHTTPCHANNEL_GETREDIRECTIONLIMIT
-
-            MENUITEM SEPARATOR
-            MENUITEM "GetResponseStatus",           ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUS
-
-            MENUITEM "GetResponseStatusText",       ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUSTEXT
-
-        END
-    END
-    POPUP "T&ools"
-    BEGIN
-        MENUITEM "Remove &GH Page",             ID_TOOLS_REMOVEGHPAGE
-        MENUITEM "Remove &All GH",              ID_TOOLS_REMOVEALLGH
-        MENUITEM "View &Logfile",               ID_TOOLS_VIEWLOGFILE
-        MENUITEM "&Delete Logfile",             ID_TOOLS_DELETELOGFILE
-        MENUITEM "Test &Your Method",           ID_TOOLS_TESTYOURMETHOD
-        MENUITEM "Test Your &Method2",          ID_TOOLS_TESTYOURMETHOD2
-    END
-    POPUP "Ve&rify Bugs"
-    BEGIN
-        MENUITEM "&70228",                      ID_VERIFYBUGS_70228
-        MENUITEM "90195",                       ID_VERIFYBUGS_90195
-        MENUITEM "169617",                      ID_VERIFYBUGS_169617
-        MENUITEM "170274",                      ID_VERIFYBUGS_170274
-    END
-END
-
-IDR_CTXMENU_DOCUMENT MENU DISCARDABLE 
-BEGIN
-    POPUP "Document Context Menu"
-    BEGIN
-        MENUITEM "&Back",                       ID_NAV_BACK
-        MENUITEM "&Forward",                    ID_NAV_FORWARD
-        MENUITEM "&Reload",                     ID_NAV_RELOAD
-        MENUITEM "&Stop",                       ID_NAV_STOP
-        MENUITEM SEPARATOR
-        MENUITEM "&View Page Source",           ID_VIEW_SOURCE
-        MENUITEM "View Page &Info",             ID_VIEW_INFO
-        MENUITEM SEPARATOR
-        MENUITEM "Save &Page As...",            ID_FILE_SAVE_AS
-        MENUITEM SEPARATOR
-        MENUITEM "Select &All",                 ID_EDIT_SELECT_ALL
-        MENUITEM "Select &None",                ID_EDIT_SELECT_NONE
-        MENUITEM "&Copy",                       ID_EDIT_COPY
-    END
-END
-
-IDR_CTXMENU_IMAGE MENU DISCARDABLE 
-BEGIN
-    POPUP "Image Context Menu"
-    BEGIN
-        MENUITEM "&Back",                       ID_NAV_BACK
-        MENUITEM "&Forward",                    ID_NAV_FORWARD
-        MENUITEM "&Reload",                     ID_NAV_RELOAD
-        MENUITEM "&Stop",                       ID_NAV_STOP
-        MENUITEM SEPARATOR
-        MENUITEM "&View Page Source",           ID_VIEW_SOURCE
-        MENUITEM "View &Image",                 ID_VIEW_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "Save Image As...",            ID_SAVE_IMAGE_AS
-        MENUITEM "Save &Page As...",            ID_FILE_SAVE_AS
-    END
-END
-
-IDR_CTXMENU_LINK MENU DISCARDABLE 
-BEGIN
-    POPUP "Link Context Menu"
-    BEGIN
-        MENUITEM "Open Link In New Window",     ID_OPEN_LINK_IN_NEW_WINDOW
-        MENUITEM SEPARATOR
-        MENUITEM "&Back",                       ID_NAV_BACK
-        MENUITEM "&Forward",                    ID_NAV_FORWARD
-        MENUITEM "&Reload",                     ID_NAV_RELOAD
-        MENUITEM "&Stop",                       ID_NAV_STOP
-        MENUITEM SEPARATOR
-        MENUITEM "&View Page Source",           ID_VIEW_SOURCE
-        MENUITEM SEPARATOR
-        MENUITEM "Save &Page As...",            ID_FILE_SAVE_AS
-        MENUITEM "Save &Link As...",            ID_SAVE_LINK_AS
-        MENUITEM "&Copy Link Location",         ID_COPY_LINK_LOCATION
-    END
-END
-
-IDR_CTXMENU_TEXT MENU DISCARDABLE 
-BEGIN
-    POPUP "Selection Context Menu"
-    BEGIN
-        MENUITEM "Cu&t",                        ID_EDIT_CUT
-        MENUITEM "&Copy",                       ID_EDIT_COPY
-        MENUITEM "&Paste",                      ID_EDIT_PASTE
-        MENUITEM "Select &All",                 ID_EDIT_SELECT_ALL
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE 
-BEGIN
-    "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
-    "F",            ID_EDIT_FIND,           VIRTKEY, CONTROL, NOINVERT
-    "N",            ID_NEW_BROWSER,         VIRTKEY, CONTROL, NOINVERT
-    "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL, NOINVERT
-    "S",            ID_FILE_SAVE_AS,        VIRTKEY, CONTROL, NOINVERT
-    "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL, NOINVERT
-    VK_BACK,        ID_EDIT_UNDO,           VIRTKEY, ALT, NOINVERT
-    VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT, NOINVERT
-    VK_F6,          ID_NEXT_PANE,           VIRTKEY, NOINVERT
-    VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT, NOINVERT
-    VK_INSERT,      ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
-    VK_INSERT,      ID_EDIT_PASTE,          VIRTKEY, SHIFT, NOINVERT
-    "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL, NOINVERT
-    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
-    VK_ESCAPE,      ID_NAV_STOP,            VIRTKEY 
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 235, 55
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About TestEmbed"
-FONT 8, "MS Sans Serif"
-BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,11,17,20,20
-    LTEXT           "Mozilla TestEmbed Version 1.0",IDC_STATIC,40,10,119,8,
-                    SS_NOPREFIX
-    LTEXT           "Copyright (C) 2001",IDC_STATIC,40,25,119,8
-    DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
-END
-
-IDD_PROMPT_DIALOG DIALOG DISCARDABLE  0, 0, 249, 92
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Prompt Dialog"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,130,69,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,189,69,50,14
-    LTEXT           "Please enter something....",IDC_PROMPT_TEXT,10,7,229,29
-    EDITTEXT        IDC_PROMPT_ANSWER,7,39,232,13,ES_AUTOHSCROLL
-    CONTROL         "Save Answer",IDC_CHECK_SAVE_PASSWORD,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,57,229,10
-END
-
-IDD_PROMPT_PASSWORD_DIALOG DIALOG DISCARDABLE  0, 0, 248, 93
-STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "Password Entry Dialog"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Please enter your password:",IDC_PROMPT_TEXT,5,7,232,20
-    DEFPUSHBUTTON   "OK",IDOK,129,75,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,188,75,50,14
-    EDITTEXT        IDC_PASSWORD,5,37,233,12,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "Save Password",IDC_CHECK_SAVE_PASSWORD,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,57,229,10
-END
-
-IDD_PROMPT_USERPASS_DIALOG DIALOG DISCARDABLE  0, 0, 214, 123
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Username and Password Required"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "This operation requires authentication.  Please enter your user name and password:",
-                    IDC_PROMPT_TEXT,6,9,171,25
-    LTEXT           "User Name:",IDC_USERNAME_LABEL,6,39,39,9
-    EDITTEXT        IDC_USERNAME,49,39,153,12,ES_AUTOHSCROLL
-    LTEXT           "Password:",IDC_PASSWORD_LABEL,6,58,36,8
-    EDITTEXT        IDC_PASSWORD,49,56,153,12,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "Save User Name and Password",IDC_CHECK_SAVE_PASSWORD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,78,201,10
-    DEFPUSHBUTTON   "OK",IDOK,40,101,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,95,101,50,14
-END
-
-IDD_PROFILES DIALOG DISCARDABLE  0, 0, 196, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Manage Profiles"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LISTBOX         IDC_LIST1,79,17,110,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
-                    WS_TABSTOP
-    PUSHBUTTON      "Rename...",IDC_PROF_RENAME,7,7,50,14
-    PUSHBUTTON      "Delete",IDC_PROF_DELETE,7,27,50,14
-    PUSHBUTTON      "New...",IDC_PROF_NEW,7,48,50,14
-    DEFPUSHBUTTON   "OK",IDOK,139,74,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,80,74,50,14
-    CONTROL         "Ask At Startup",IDC_CHECK_ASK_AT_START,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,75,61,10
-END
-
-IDD_PROFILE_NEW DIALOG DISCARDABLE  0, 0, 177, 79
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "New Profile"
-FONT 8, "MS Sans Serif"
-BEGIN
-    EDITTEXT        IDC_NEW_PROF_NAME,39,16,122,14,ES_AUTOHSCROLL
-    COMBOBOX        IDC_LOCALE_COMBO,39,35,67,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_DISABLED | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "OK",IDOK,120,58,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,63,58,50,14
-    RTEXT           "Name:",IDC_STATIC,13,18,22,8
-    RTEXT           "Locale:",IDC_STATIC,11,37,24,8
-END
-
-IDD_PROFILE_RENAME DIALOG DISCARDABLE  0, 0, 177, 76
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rename Profile"
-FONT 8, "MS Sans Serif"
-BEGIN
-    EDITTEXT        IDC_NEW_NAME,50,16,113,14,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "OK",IDOK,120,55,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,63,55,50,14
-    RTEXT           "New Name:",IDC_STATIC,7,18,38,8
-END
-
-IDD_FINDDLG DIALOG DISCARDABLE  30, 73, 242, 87
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "Find"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "Fi&nd what:",-1,4,8,42,8
-    EDITTEXT        IDC_FIND_EDIT,47,7,128,12,ES_AUTOHSCROLL | WS_GROUP
-    CONTROL         "Wra&p around",IDC_WRAP_AROUND,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,47,44,65,12
-    CONTROL         "Match &case",IDC_MATCH_CASE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,47,26,64,12
-    CONTROL         "Search &backwards",IDC_SEARCH_BACKWARDS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,47,62,75,12
-    DEFPUSHBUTTON   "&Find Next",IDOK,188,5,50,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,188,23,50,14
-END
-
-IDD_PRINT_PROGRESS_DIALOG DIALOG DISCARDABLE  0, 0, 294, 55
-STYLE DS_SYSMODAL | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION
-CAPTION "Printing..."
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "Cancel",IDCANCEL,122,34,50,14
-    LTEXT           "Document:",IDC_PPD_DOC_TITLE_STATIC,7,7,36,8
-    LTEXT           "",IDC_PPD_DOC_TXT,43,7,244,8
-END
-
-IDD_PREFS_START_PAGE DIALOG DISCARDABLE  0, 0, 284, 150
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Startup"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "TestEmbed starts with",IDC_STATIC,6,10,271,49
-    CONTROL         "Bla&nk Page",IDC_RADIO_BLANK_PAGE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,16,24,53,10
-    CONTROL         "&Home Page",IDC_RADIO_HOME_PAGE,"Button",
-                    BS_AUTORADIOBUTTON,16,40,53,10
-    GROUPBOX        "Home Page",IDC_STATIC,6,67,271,51
-    LTEXT           "Clicking the Home button will take you to this page",
-                    IDC_STATIC,17,80,234,8
-    LTEXT           "Loc&ation:",IDC_STATIC,17,98,31,8
-    EDITTEXT        IDC_EDIT_HOMEPAGE,53,95,211,14,ES_AUTOHSCROLL
-END
-
-IDD_URLDIALOG DIALOG DISCARDABLE  0, 0, 209, 130
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "URL Dialog"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,131,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,131,22,50,14
-    LTEXT           "Enter URL here:",IDC_ENTER_URLTEXT,64,55,71,8
-    EDITTEXT        IDC_URLFIELD,25,68,134,14,ES_AUTOHSCROLL
-    COMBOBOX        IDC_COMBO1,25,29,86,72,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Select Load Flag:",IDC_CHKURLFLAG,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,32,14,80,10
-    LTEXT           "Protocol (optional):",IDC_STATIC,51,97,60,8
-    COMBOBOX        IDC_COMBO2,58,109,48,66,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-END
-
-IDD_RUNTESTSDLG DIALOG DISCARDABLE  0, 0, 331, 186
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Test Results"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "Close",IDOK,274,165,50,14
-    CONTROL         "List1",IDC_LIST1,"SysListView32",LVS_REPORT | 
-                    LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,317,154
-END
-
-IDD_QAFINDDLG DIALOG DISCARDABLE  0, 0, 186, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Text Search Dialog"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
-    EDITTEXT        IDC_TEXTFIELD,53,62,71,14,ES_AUTOHSCROLL
-    LTEXT           "Enter text here:",IDC_STATIC,62,46,49,8
-END
-
-IDD_WEBPROGDLG DIALOG DISCARDABLE  0, 0, 186, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Web Prog Lstnr Dialog"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
-    LTEXT           "Web Prog Notification Flag",IDC_STATIC,29,46,97,8
-    COMBOBOX        IDC_WPCOMBO,22,65,105,70,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-END
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "TestEmbed MFC Application\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "TestEmbed\0"
-            VALUE "LegalCopyright", "Copyright (C) 2001\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TestEmbed.EXE\0"
-            VALUE "ProductName", "TestEmbed Application\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_ABOUTBOX, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 228
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 48
-    END
-
-    IDD_PROFILES, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 189
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-
-    IDD_PROFILE_NEW, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 170
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 72
-    END
-
-    IDD_PROFILE_RENAME, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 170
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 69
-    END
-
-    IDD_FINDDLG, DIALOG
-    BEGIN
-        RIGHTMARGIN, 238
-        BOTTOMMARGIN, 62
-    END
-
-    IDD_PRINT_PROGRESS_DIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 287
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 48
-    END
-
-    IDD_URLDIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 6
-        RIGHTMARGIN, 186
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 123
-    END
-
-    IDD_RUNTESTSDLG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 324
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 179
-    END
-
-    IDD_QAFINDDLG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-
-    IDD_WEBPROGDLG, DIALOG
-    BEGIN
-        LEFTMARGIN, 6
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_URLDIALOG DLGINIT
-BEGIN
-    IDC_COMBO1, 0x403, 6, 0
-0x4f4e, 0x454e, 0x0020, 
-    IDC_COMBO1, 0x403, 5, 0
-0x414d, 0x4b53, "\000" 
-    IDC_COMBO1, 0x403, 8, 0
-0x5349, 0x4c5f, 0x4e49, 0x004b, 
-    IDC_COMBO1, 0x403, 15, 0
-0x5942, 0x4150, 0x5353, 0x485f, 0x5349, 0x4f54, 0x5952, "\000" 
-    IDC_COMBO1, 0x403, 16, 0
-0x4552, 0x4c50, 0x4341, 0x5f45, 0x4948, 0x5453, 0x524f, 0x0059, 
-    IDC_COMBO1, 0x403, 13, 0
-0x5942, 0x4150, 0x5353, 0x435f, 0x4341, 0x4548, "\000" 
-    IDC_COMBO1, 0x403, 13, 0
-0x5942, 0x4150, 0x5353, 0x505f, 0x4f52, 0x5958, "\000" 
-    IDC_COMBO1, 0x403, 15, 0
-0x4843, 0x5241, 0x4553, 0x5f54, 0x4843, 0x4e41, 0x4547, "\000" 
-    IDC_COMBO1, 0x403, 8, 0
-0x4552, 0x5246, 0x5345, 0x0048, 
-    IDC_COMBO2, 0x403, 6, 0
-0x7468, 0x7074, 0x0020, 
-    IDC_COMBO2, 0x403, 6, 0
-0x7468, 0x7074, 0x0073, 
-    IDC_COMBO2, 0x403, 4, 0
-0x7466, 0x0070, 
-    IDC_COMBO2, 0x403, 5, 0
-0x6966, 0x656c, "\000" 
-    IDC_COMBO2, 0x403, 11, 0
-0x616a, 0x6176, 0x6373, 0x6972, 0x7470, "\000" 
-    IDC_COMBO2, 0x403, 6, 0
-0x6261, 0x756f, 0x0074, 
-    IDC_COMBO2, 0x403, 5, 0
-0x6164, 0x6174, "\000" 
-    IDC_COMBO2, 0x403, 7, 0
-0x616d, 0x6c69, 0x6f74, "\000" 
-    IDC_COMBO2, 0x403, 5, 0
-0x6d69, 0x7061, "\000" 
-    0
-END
-
-IDD_WEBPROGDLG DLGINIT
-BEGIN
-    IDC_WPCOMBO, 0x403, 21, 0
-0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x525f, 0x5145, 0x4555, 
-0x5453, "\000" 
-    IDC_WPCOMBO, 0x403, 22, 0
-0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x445f, 0x434f, 0x4d55, 
-0x4e45, 0x0054, 
-    IDC_WPCOMBO, 0x403, 21, 0
-0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x4e5f, 0x5445, 0x4f57, 
-0x4b52, "\000" 
-    IDC_WPCOMBO, 0x403, 20, 0
-0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x575f, 0x4e49, 0x4f44, 
-0x0057, 
-    IDC_WPCOMBO, 0x403, 17, 0
-0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x415f, 0x4c4c, "\000" 
-    IDC_WPCOMBO, 0x403, 16, 0
-0x4f4e, 0x4954, 0x5946, 0x505f, 0x4f52, 0x5247, 0x5345, 0x0053, 
-    IDC_WPCOMBO, 0x403, 14, 0
-0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x5554, 0x0053, 
-    IDC_WPCOMBO, 0x403, 16, 0
-0x4f4e, 0x4954, 0x5946, 0x535f, 0x4345, 0x5255, 0x5449, 0x0059, 
-    IDC_WPCOMBO, 0x403, 16, 0
-0x4f4e, 0x4954, 0x5946, 0x4c5f, 0x434f, 0x5441, 0x4f49, 0x004e, 
-    IDC_WPCOMBO, 0x403, 11, 0
-0x4f4e, 0x4954, 0x5946, 0x415f, 0x4c4c, "\000" 
-    0
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE PRELOAD DISCARDABLE 
-BEGIN
-    IDR_MAINFRAME           "testembed"
-END
-
-STRINGTABLE PRELOAD DISCARDABLE 
-BEGIN
-    AFX_IDS_APP_TITLE       "testembed"
-    AFX_IDS_IDLEMESSAGE     "Ready"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
-    ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
-    ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_EDIT_CLEAR           "Erase the selection\nErase"
-    ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"
-    ID_EDIT_COPY            "Copy the selection and put it on the Clipboard\nCopy"
-    ID_EDIT_CUT             "Cut the selection and put it on the Clipboard\nCut"
-    ID_EDIT_FIND            "Find the specified text\nFind"
-    ID_EDIT_PASTE           "Insert Clipboard contents\nPaste"
-    ID_EDIT_REPEAT          "Repeat the last action\nRepeat"
-    ID_EDIT_REPLACE         "Replace specific text with different text\nReplace"
-    ID_EDIT_SELECT_ALL      "Select the entire document\nSelect All"
-    ID_EDIT_UNDO            "Undo the last action\nUndo"
-    ID_EDIT_REDO            "Redo the previously undone action\nRedo"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_VIEW_TOOLBAR         "Show or hide the toolbar\nToggle ToolBar"
-    ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    AFX_IDS_SCSIZE          "Change the window size"
-    AFX_IDS_SCMOVE          "Change the window position"
-    AFX_IDS_SCMINIMIZE      "Reduce the window to an icon"
-    AFX_IDS_SCMAXIMIZE      "Enlarge the window to full size"
-    AFX_IDS_SCNEXTWINDOW    "Switch to the next document window"
-    AFX_IDS_SCPREVWINDOW    "Switch to the previous document window"
-    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    AFX_IDS_SCRESTORE       "Restore the window to normal size"
-    AFX_IDS_SCTASKLIST      "Activate Task List"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_NAV_RELOAD           "Tool Tip\nTool Tip"
-    ID_EDIT_SELECT_NONE     "Select nothing in the document\nSelect None"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_INTERFACES_TEMP      "Temporary"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\testembed.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/embedding/qa/testembed/winEmbedFileLocProvider.cpp b/embedding/qa/testembed/winEmbedFileLocProvider.cpp
deleted file mode 100644
index 1e4061b1ace..00000000000
--- a/embedding/qa/testembed/winEmbedFileLocProvider.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Conrad Carlen <conrad@ingress.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-#include "winEmbedFileLocProvider.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsILocalFile.h"
-#include "nsString.h"
-#include "nsXPIDLString.h"
-#include "nsCRT.h"
-
-
-#include <windows.h>
-#include <shlobj.h>
-
- 
-// WARNING: These hard coded names need to go away. They need to
-// come from localizable resources
-#define APP_REGISTRY_NAME NS_LITERAL_CSTRING("registry.dat")
-
-#define PROFILE_ROOT_DIR_NAME       NS_LITERAL_CSTRING("Profiles")
-#define DEFAULTS_DIR_NAME           NS_LITERAL_CSTRING("defaults")
-#define DEFAULTS_PREF_DIR_NAME      NS_LITERAL_CSTRING("pref")
-#define DEFAULTS_PROFILE_DIR_NAME   NS_LITERAL_CSTRING("profile")
-#define RES_DIR_NAME                NS_LITERAL_CSTRING("res")
-#define CHROME_DIR_NAME             NS_LITERAL_CSTRING("chrome")
-#define PLUGINS_DIR_NAME            NS_LITERAL_CSTRING("plugins")
-#define SEARCH_DIR_NAME             NS_LITERAL_CSTRING("searchplugins")
-#define COMPONENTS_DIR_NAME         NS_LITERAL_CSTRING("components")
-
-//*****************************************************************************
-// winEmbedFileLocProvider::Constructor/Destructor
-//*****************************************************************************   
-
-winEmbedFileLocProvider::winEmbedFileLocProvider(const char* productDirName)
-{
-    strncpy(mProductDirName, productDirName, sizeof(mProductDirName) - 1);
-    mProductDirName[sizeof(mProductDirName) - 1] = '\0';
-}
-
-winEmbedFileLocProvider::~winEmbedFileLocProvider()
-{
-}
-
-
-//*****************************************************************************
-// winEmbedFileLocProvider::nsISupports
-//*****************************************************************************   
-
-NS_IMPL_ISUPPORTS1(winEmbedFileLocProvider, nsIDirectoryServiceProvider)
-
-//*****************************************************************************
-// winEmbedFileLocProvider::nsIDirectoryServiceProvider
-//*****************************************************************************   
-
-NS_IMETHODIMP
-winEmbedFileLocProvider::GetFile(const char *prop, PRBool *persistent, nsIFile **_retval)
-{    
-	nsCOMPtr<nsILocalFile>  localFile;
-	nsresult rv = NS_ERROR_FAILURE;
-
-	*_retval = nsnull;
-	*persistent = PR_TRUE;
-	
-    if (nsCRT::strcmp(prop, NS_APP_APPLICATION_REGISTRY_DIR) == 0)
-    {
-        rv = GetProductDirectory(getter_AddRefs(localFile));
-    }
-    else if (nsCRT::strcmp(prop, NS_APP_APPLICATION_REGISTRY_FILE) == 0)
-    {
-        rv = GetProductDirectory(getter_AddRefs(localFile));
-        if (NS_SUCCEEDED(rv))
-            rv = localFile->AppendNative(APP_REGISTRY_NAME);
-    }
-    else if (nsCRT::strcmp(prop, NS_APP_DEFAULTS_50_DIR) == 0)
-    {
-        rv = CloneMozBinDirectory(getter_AddRefs(localFile));
-        if (NS_SUCCEEDED(rv))
-            rv = localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME);
-    }
-    else if (nsCRT::strcmp(prop, NS_APP_PREF_DEFAULTS_50_DIR) == 0)
-    {
-        rv = CloneMozBinDirectory(getter_AddRefs(localFile));
-        if (NS_SUCCEEDED(rv)) {
-            rv = localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME);
-            if (NS_SUCCEEDED(rv))
-                rv = localFile->AppendRelativeNativePath(DEFAULTS_PREF_DIR_NAME);
-        }
-    }
-    else if (nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR) == 0 ||
-             nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_50_DIR) == 0)
-    {
-        rv = CloneMozBinDirectory(getter_AddRefs(localFile));
-        if (NS_SUCCEEDED(rv)) {
-            rv = localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME);
-            if (NS_SUCCEEDED(rv))
-                rv = localFile->AppendRelativeNativePath(DEFAULTS_PROFILE_DIR_NAME);
-        }
-    }
-    else if (nsCRT::strcmp(prop, NS_APP_USER_PROFILES_ROOT_DIR) == 0)
-    {
-        rv = GetDefaultUserProfileRoot(getter_AddRefs(localFile));   
-    }
-    else if (nsCRT::strcmp(prop, NS_APP_RES_DIR) == 0)
-    {
-        rv = CloneMozBinDirectory(getter_AddRefs(localFile));
-        if (NS_SUCCEEDED(rv))
-            rv = localFile->AppendRelativeNativePath(RES_DIR_NAME);
-    }
-    else if (nsCRT::strcmp(prop, NS_APP_CHROME_DIR) == 0)
-    {
-        rv = CloneMozBinDirectory(getter_AddRefs(localFile));
-        if (NS_SUCCEEDED(rv))
-            rv = localFile->AppendRelativeNativePath(CHROME_DIR_NAME);
-    }
-    else if (nsCRT::strcmp(prop, NS_APP_PLUGINS_DIR) == 0)
-    {
-        rv = CloneMozBinDirectory(getter_AddRefs(localFile));
-        if (NS_SUCCEEDED(rv))
-            rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME);
-    }
-    else if (nsCRT::strcmp(prop, NS_APP_SEARCH_DIR) == 0)
-    {
-        rv = CloneMozBinDirectory(getter_AddRefs(localFile));
-        if (NS_SUCCEEDED(rv))
-            rv = localFile->AppendRelativeNativePath(SEARCH_DIR_NAME);
-    }
-    //---------------------------------------------------------------
-    // Note that by returning a valid localFile's for NS_GRE_DIR and
-    // NS_GRE_COMPONENT_DIR your app is indicating to XPCOM that 
-    // it found an GRE version with which it's compatible with and 
-    // it intends to be "run against" that GRE
-    //
-    // Please see http://www.mozilla.org/projects/embedding/MRE.html
-    // for more info. on GRE
-    //---------------------------------------------------------------
-    else if (nsCRT::strcmp(prop, NS_GRE_DIR) == 0)
-    {
-        rv = GetGreDirectory(getter_AddRefs(localFile));
-    }    
-    else if (nsCRT::strcmp(prop, NS_GRE_COMPONENT_DIR) == 0)
-    {
-        rv = GetGreDirectory(getter_AddRefs(localFile));
-        if (NS_SUCCEEDED(rv))
-            rv = localFile->AppendRelativeNativePath(COMPONENTS_DIR_NAME);
-    }    
-   
-	if (localFile && NS_SUCCEEDED(rv))
-		return localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)_retval);
-		
-	return rv;
-}
-
-// Get the location of the GRE version we're compatible with from 
-// the registry
-//
-static char * GetGreLocationFromRegistry()
-{
-    char szKey[256];
-    HKEY hRegKey = NULL;
-    DWORD dwLength = _MAX_PATH * sizeof(char);
-    long rc;
-    char keyValue[_MAX_PATH + 1];
-    char *pGreLocation = NULL;
-
-    // A couple of key points here:
-    // 1. Note the usage of the "Software\\Mozilla\\GRE" subkey - this allows
-    //    us to have multiple versions of GREs on the same machine by having
-    //    subkeys such as 1.0, 1.1, 2.0 etc. under it.
-    // 2. In this sample below we're looking for the location of GRE version 1.3
-    //    i.e. we're compatible with GRE 1.3 and we're trying to find its install
-    //    location.
-    //
-    // Please see http://www.mozilla.org/projects/embedding/MRE.html for
-    // more info.
-    //
-    strcpy(szKey, "Software\\Mozilla\\GRE\\" MOZILLA_VERSION);
-
-    if (::RegOpenKeyEx(HKEY_LOCAL_MACHINE, szKey, 0, KEY_QUERY_VALUE, &hRegKey) == ERROR_SUCCESS) 
-    {
-        if ((rc = ::RegQueryValueEx(hRegKey, "GreHome", NULL, NULL, (BYTE *)keyValue, &dwLength))==ERROR_SUCCESS)
-        {
-            pGreLocation = ::strdup(keyValue);
-            ::RegCloseKey(hRegKey);
-        }
-    }
-
-    return pGreLocation;
-}
-
-// Create and return the location of the GRE the application is 
-// currently using, if any, via the |aLocalFile| param
-//
-// If an embedding application is written to use an GRE it determines
-// the compatible GRE's location by looking in the Windows registry
-// In this case GetGreDirectory() creates a new localFile based on the
-// GRE path it just read from the registry
-//
-// If the embedding application is not using an GRE and is running in
-// a "regular" embedding scenario GetGreDirectory() simply returns a
-// failure code indicating to the caller to fallback to a non-GRE
-// based operation - which is the default mode of operation.
-// 
-// Please see http://www.mozilla.org/projects/embedding/MRE.html for 
-// more information on the Mozilla Runtime Environment(GRE) and for 
-// the actual registry key whichs contains the GRE path, if any.
-
-NS_METHOD winEmbedFileLocProvider::GetGreDirectory(nsILocalFile **aLocalFile)
-{
-    NS_ENSURE_ARG_POINTER(aLocalFile);
-    nsresult rv = NS_ERROR_FAILURE;
-
-    // Get the path of the GRE which is compatible with our embedding application
-    // from the registry
-    //
-    char *pGreDir = GetGreLocationFromRegistry();
-    if(pGreDir)
-    {
-        nsCOMPtr<nsILocalFile> tempLocal;
-	    rv = NS_NewNativeLocalFile(nsDependentCString(pGreDir), TRUE, getter_AddRefs(tempLocal));
-
-        if (tempLocal)
-        {
-           *aLocalFile = tempLocal;
-           NS_ADDREF(*aLocalFile);
-           rv = NS_OK;
-        }
-
-        ::free(pGreDir);
-    }
-
-    return rv;
-}
- 
-NS_METHOD winEmbedFileLocProvider::CloneMozBinDirectory(nsILocalFile **aLocalFile)
-{
-    NS_ENSURE_ARG_POINTER(aLocalFile);
-    nsresult rv;
-    
-    if (!mMozBinDirectory)
-    {        
-        // Get the mozilla bin directory
-        // 1. Check the directory service first for NS_XPCOM_CURRENT_PROCESS_DIR
-        //    This will be set if a directory was passed to NS_InitXPCOM
-        // 2. If that doesn't work, set it to be the current process directory
-        
-        nsCOMPtr<nsIProperties> directoryService = 
-                 do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
-        if (NS_FAILED(rv))
-            return rv;
-        
-        rv = directoryService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mMozBinDirectory));
-        if (NS_FAILED(rv)) {
-            rv = directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mMozBinDirectory));
-            if (NS_FAILED(rv))
-                return rv;
-        }
-    }
-    
-    nsCOMPtr<nsIFile> aFile;
-    rv = mMozBinDirectory->Clone(getter_AddRefs(aFile));
-    if (NS_FAILED(rv))
-        return rv;
-
-    nsCOMPtr<nsILocalFile> lfile = do_QueryInterface (aFile);
-    if (!lfile)
-        return NS_ERROR_FAILURE;
-    
-    NS_IF_ADDREF(*aLocalFile = lfile);
-    return NS_OK;
-}
-
-
-//----------------------------------------------------------------------------------------
-// GetProductDirectory - Gets the directory which contains the application data folder
-//
-// WIN    : <Application Data folder on user's machine>\Mozilla 
-//----------------------------------------------------------------------------------------
-NS_METHOD winEmbedFileLocProvider::GetProductDirectory(nsILocalFile **aLocalFile)
-{
-    NS_ENSURE_ARG_POINTER(aLocalFile);
-    
-    nsresult rv;
-    PRBool exists;
-    nsCOMPtr<nsILocalFile> localDir;
-   
-    nsCOMPtr<nsIProperties> directoryService = 
-             do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
-    if (NS_FAILED(rv)) return rv;
-    rv = directoryService->Get(NS_WIN_APPDATA_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir));
-    if (NS_SUCCEEDED(rv))
-        rv = localDir->Exists(&exists);
-    if (NS_FAILED(rv) || !exists)
-    {
-        // On some Win95 machines, NS_WIN_APPDATA_DIR does not exist - revert to NS_WIN_WINDOWS_DIR
-        localDir = nsnull;
-        rv = directoryService->Get(NS_WIN_WINDOWS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir));
-    }
-    if (NS_FAILED(rv)) return rv;
-
-    rv = localDir->AppendRelativeNativePath(nsDependentCString(mProductDirName));
-    if (NS_FAILED(rv)) return rv;
-    rv = localDir->Exists(&exists);
-    if (NS_SUCCEEDED(rv) && !exists)
-        rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0775);
-    if (NS_FAILED(rv)) return rv;
-
-    *aLocalFile = localDir;
-    NS_ADDREF(*aLocalFile);
-
-   return rv; 
-}
-
-
-//----------------------------------------------------------------------------------------
-// GetDefaultUserProfileRoot - Gets the directory which contains each user profile dir
-//
-// WIN    : <Application Data folder on user's machine>\Mozilla\Users50 
-//----------------------------------------------------------------------------------------
-NS_METHOD winEmbedFileLocProvider::GetDefaultUserProfileRoot(nsILocalFile **aLocalFile)
-{
-    NS_ENSURE_ARG_POINTER(aLocalFile);
-    
-    nsresult rv;
-    PRBool exists;
-    nsCOMPtr<nsILocalFile> localDir;
-   
-    rv = GetProductDirectory(getter_AddRefs(localDir));
-    if (NS_FAILED(rv)) return rv;
-
-    // These 3 platforms share this part of the path - do them as one
-    rv = localDir->AppendRelativeNativePath(PROFILE_ROOT_DIR_NAME);
-    if (NS_FAILED(rv)) return rv;
-    rv = localDir->Exists(&exists);
-    if (NS_SUCCEEDED(rv) && !exists)
-        rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0775);
-    if (NS_FAILED(rv)) return rv;
-
-    *aLocalFile = localDir;
-    NS_ADDREF(*aLocalFile);
-
-   return rv; 
-}
-
diff --git a/embedding/qa/testembed/winEmbedFileLocProvider.h b/embedding/qa/testembed/winEmbedFileLocProvider.h
deleted file mode 100644
index 95655fccb2f..00000000000
--- a/embedding/qa/testembed/winEmbedFileLocProvider.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Conrad Carlen <conrad@ingress.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIDirectoryService.h"
-#include "nsILocalFile.h"
-
-class nsIFile;
-
-//*****************************************************************************
-// class winEmbedFileLocProvider
-//*****************************************************************************   
-
-class winEmbedFileLocProvider : public nsIDirectoryServiceProvider
-{
-public:
-                        // productDirName is the name (not path) of the dir
-                        // in which the application registry and profiles live.
-                        winEmbedFileLocProvider(const char* productDirName);
-
-   NS_DECL_ISUPPORTS
-   NS_DECL_NSIDIRECTORYSERVICEPROVIDER
-
-protected:
-   virtual              ~winEmbedFileLocProvider();
-
-   NS_METHOD            CloneMozBinDirectory(nsILocalFile **aLocalFile);   
-   NS_METHOD            GetProductDirectory(nsILocalFile **aLocalFile);
-   NS_METHOD            GetDefaultUserProfileRoot(nsILocalFile **aLocalFile);
-   NS_METHOD            GetGreDirectory(nsILocalFile **aLocalFile); 
-
-   char                 mProductDirName[256];
-   nsCOMPtr<nsILocalFile> mMozBinDirectory;
-};

From 49940b5bd341159f38e7bda1b0db221e77e536aa Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@stanford.edu>
Date: Wed, 29 Jul 2009 10:13:08 -0400
Subject: [PATCH 065/175] Bug 504822 - Remove XBM support from Mozilla. r=joe
 sr=vladimir

---
 browser/components/nsBrowserContentHandler.js |   1 -
 configure.in                                  |   2 +-
 embedding/config/gre-installer-win.pkg        |   1 -
 embedding/config/gre-win                      |   1 -
 modules/libpr0n/build/nsImageModule.cpp       |  33 --
 modules/libpr0n/decoders/xbm/Makefile.in      |  61 ----
 modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp | 292 ------------------
 modules/libpr0n/decoders/xbm/nsXBMDecoder.h   | 101 ------
 modules/libpr0n/src/imgLoader.cpp             |   3 -
 .../en-US/chrome/global/filepicker.properties |   1 -
 toolkit/toolkit-makefiles.sh                  |   1 -
 widget/src/xpwidgets/nsBaseFilePicker.cpp     |   3 +-
 12 files changed, 2 insertions(+), 498 deletions(-)
 delete mode 100644 modules/libpr0n/decoders/xbm/Makefile.in
 delete mode 100644 modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp
 delete mode 100644 modules/libpr0n/decoders/xbm/nsXBMDecoder.h

diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
index b0f621f1b76..d118d69f7dd 100644
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -909,7 +909,6 @@ var Module = {
     registerType("image/bmp");
     registerType("image/x-icon");
     registerType("image/vnd.microsoft.icon");
-    registerType("image/x-xbitmap");
     registerType("application/http-index-format");
 
     var catMan = Components.classes["@mozilla.org/categorymanager;1"]
diff --git a/configure.in b/configure.in
index 5670f07eb2b..81a14fd3c90 100644
--- a/configure.in
+++ b/configure.in
@@ -4508,7 +4508,7 @@ MOZ_DBGRINFO_MODULES=
 MOZ_ENABLE_CANVAS=1
 MOZ_ENABLE_CANVAS3D=
 MOZ_FEEDS=1
-MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp xbm icon"
+MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp icon"
 MOZ_IMG_ENCODERS_DEFAULT="png jpeg"
 MOZ_JAVAXPCOM=
 MOZ_JSDEBUGGER=1
diff --git a/embedding/config/gre-installer-win.pkg b/embedding/config/gre-installer-win.pkg
index 5ef878d9454..af5e779e0ec 100644
--- a/embedding/config/gre-installer-win.pkg
+++ b/embedding/config/gre-installer-win.pkg
@@ -38,7 +38,6 @@ components\htmlparser.xpt
 ; imagelib
 ;
 components\imgbmp.dll
-components\imgxbm.dll
 components\imgicon.dll
 components\imgicon.xpt
 components\imglib2.xpt
diff --git a/embedding/config/gre-win b/embedding/config/gre-win
index 2b4eb308056..cf0ee0a2860 100644
--- a/embedding/config/gre-win
+++ b/embedding/config/gre-win
@@ -26,7 +26,6 @@ components\htmlparser.xpt
 ; imagelib
 ;
 components\imgbmp.dll
-components\imgxbm.dll
 components\imgicon.dll
 components\imgicon.xpt
 components\imglib2.xpt
diff --git a/modules/libpr0n/build/nsImageModule.cpp b/modules/libpr0n/build/nsImageModule.cpp
index 4a53f1682f4..990c5b8147f 100644
--- a/modules/libpr0n/build/nsImageModule.cpp
+++ b/modules/libpr0n/build/nsImageModule.cpp
@@ -44,7 +44,6 @@
 #define IMG_BUILD_bmp 1
 #define IMG_BUILD_png 1
 #define IMG_BUILD_jpeg 1
-#define IMG_BUILD_xbm 1
 #endif
 
 #include "nsIDeviceContext.h"
@@ -81,12 +80,6 @@
 #include "nsJPEGDecoder.h"
 #endif
 
-#ifdef IMG_BUILD_DECODER_xbm
-// xbm
-#include "nsXBMDecoder.h"
-#endif
-
-
 #ifdef IMG_BUILD_ENCODER_png
 // png
 #include "nsPNGEncoder.h"
@@ -133,11 +126,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsPNGDecoder)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPNGEncoder)
 #endif
 
-#ifdef IMG_BUILD_DECODER_xbm
-// xbm
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsXBMDecoder)
-#endif
-
 static const char* gImageMimeTypes[] = {
 #ifdef IMG_BUILD_DECODER_gif
   "image/gif",
@@ -157,11 +145,6 @@ static const char* gImageMimeTypes[] = {
   "image/png",
   "image/x-png",
 #endif
-#ifdef IMG_BUILD_DECODER_xbm
-  "image/x-xbitmap",
-  "image/x-xbm",
-  "image/xbm"
-#endif
 };
 
 static NS_METHOD ImageRegisterProc(nsIComponentManager *aCompMgr,
@@ -293,22 +276,6 @@ static const nsModuleComponentInfo components[] =
     "@mozilla.org/image/encoder;2?type=image/png",
     nsPNGEncoderConstructor, },
 #endif
-
-#ifdef IMG_BUILD_DECODER_xbm
-  // xbm
-  { "XBM Decoder",
-     NS_XBMDECODER_CID,
-     "@mozilla.org/image/decoder;2?type=image/x-xbitmap",
-     nsXBMDecoderConstructor, },
-  { "XBM Decoder",
-     NS_XBMDECODER_CID,
-     "@mozilla.org/image/decoder;2?type=image/x-xbm",
-     nsXBMDecoderConstructor, },
-  { "XBM Decoder",
-     NS_XBMDECODER_CID,
-     "@mozilla.org/image/decoder;2?type=image/xbm",
-     nsXBMDecoderConstructor, },
-#endif
 };
 
 static nsresult
diff --git a/modules/libpr0n/decoders/xbm/Makefile.in b/modules/libpr0n/decoders/xbm/Makefile.in
deleted file mode 100644
index cf1f8028332..00000000000
--- a/modules/libpr0n/decoders/xbm/Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Christian Biesinger <cbiesinger@web.de>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE          = imgxbm
-LIBRARY_NAME    = imgxbm_s
-FORCE_STATIC_LIB = 1
-MODULE_NAME     = nsXBMModule
-LIBXUL_LIBRARY  = 1
-
-REQUIRES	= xpcom \
-			  string \
-			  gfx \
-			  thebes \
-			  imglib2 \
-			  $(NULL)
-
-CPPSRCS        = nsXBMDecoder.cpp
-
-include $(topsrcdir)/config/rules.mk
diff --git a/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp b/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp
deleted file mode 100644
index b872d0e8fa7..00000000000
--- a/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-/* vim:set tw=80 expandtab softtabstop=4 ts=4 sw=4: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Mozilla XBM Decoder.
- *
- * The Initial Developer of the Original Code is
- * Christian Biesinger <cbiesinger@web.de>.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Aaron Kaluszka <ask@swva.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* KNOWN BUGS:
- * o first #define line is assumed to be width, second height */
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "nsXBMDecoder.h"
-
-#include "nsIInputStream.h"
-#include "nsIComponentManager.h"
-#include "nsIInterfaceRequestorUtils.h"
-
-#include "imgILoad.h"
-
-#include "nsIProperties.h"
-#include "nsISupportsPrimitives.h"
-
-#include "gfxColor.h"
-#include "nsIInterfaceRequestorUtils.h"
-
-// Static colormap
-static const PRUint32 kColors[2] = {
-    GFX_PACKED_PIXEL(0, 0, 0, 0),     // Transparent 
-    GFX_PACKED_PIXEL(255, 0, 0, 0)    // Black
-};
-
-NS_IMPL_ISUPPORTS1(nsXBMDecoder, imgIDecoder)
-
-nsXBMDecoder::nsXBMDecoder() : mBuf(nsnull), mPos(nsnull), mImageData(nsnull)
-{
-}
-
-nsXBMDecoder::~nsXBMDecoder()
-{
-    if (mBuf)
-        free(mBuf);
-}
-
-NS_IMETHODIMP nsXBMDecoder::Init(imgILoad *aLoad)
-{
-    nsresult rv;
-    mObserver = do_QueryInterface(aLoad);
-
-    mImage = do_CreateInstance("@mozilla.org/image/container;2", &rv);
-    if (NS_FAILED(rv))
-        return rv;
-
-    aLoad->SetImage(mImage);
-
-    mCurRow = mBufSize = mWidth = mHeight = 0;
-    mState = RECV_HEADER;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsXBMDecoder::Close()
-{
-    mImage->DecodingComplete();
-
-    mObserver->OnStopContainer(nsnull, mImage);
-    mObserver->OnStopDecode(nsnull, NS_OK, nsnull);
-    mObserver = nsnull;
-    mImage = nsnull;
-    mImageData = nsnull;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsXBMDecoder::Flush()
-{
-    return NS_OK;
-}
-
-NS_METHOD nsXBMDecoder::ReadSegCb(nsIInputStream* aIn, void* aClosure,
-                             const char* aFromRawSegment, PRUint32 aToOffset,
-                             PRUint32 aCount, PRUint32 *aWriteCount) {
-    nsXBMDecoder *decoder = reinterpret_cast<nsXBMDecoder*>(aClosure);
-    *aWriteCount = aCount;
-
-    nsresult rv = decoder->ProcessData(aFromRawSegment, aCount);
-
-    if (NS_FAILED(rv)) {
-        *aWriteCount = 0;
-    }
-
-    return rv;
-}
-
-NS_IMETHODIMP nsXBMDecoder::WriteFrom(nsIInputStream *aInStr, PRUint32 aCount, PRUint32 *aRetval)
-{
-    nsresult rv = aInStr->ReadSegments(ReadSegCb, this, aCount, aRetval);
-    
-    if (aCount != *aRetval) { 
-        *aRetval = aCount; 
-        return NS_ERROR_FAILURE; 
-    }
-    
-    return rv;    
-}
-
-nsresult nsXBMDecoder::ProcessData(const char* aData, PRUint32 aCount) {
-    char *endPtr;
-    // calculate the offset since the absolute position might no longer
-    // be valid after realloc
-    const PRPtrdiff posOffset = mPos ? (mPos - mBuf) : 0;
-
-    // expand the buffer to hold the new data
-    char* oldbuf = mBuf;
-    PRUint32 newbufsize = mBufSize + aCount + 1;
-    if (newbufsize < mBufSize)
-        mBuf = nsnull;  // size wrapped around, give up
-    else
-        mBuf = (char*)realloc(mBuf, newbufsize);
-
-    if (!mBuf) {
-        mState = RECV_DONE;
-        if (oldbuf)
-            free(oldbuf);
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-    memcpy(mBuf + mBufSize, aData, aCount);
-    mBufSize += aCount;
-    mBuf[mBufSize] = 0;
-    mPos = mBuf + posOffset;
-
-    // process latest data according to current state
-    if (mState == RECV_HEADER) {
-        mPos = strstr(mBuf, "#define");
-        if (!mPos)
-            // #define not found. return for now, waiting for more data.
-            return NS_OK;
-
-        // Convert width and height to numbers.  Convert hotspot for cursor functionality, if present
-        if (sscanf(mPos, "#define %*s %u #define %*s %u #define %*s %u #define %*s %u unsigned", &mWidth, &mHeight, &mXHotspot, &mYHotspot) == 4)
-            mIsCursor = PR_TRUE;
-        else if (sscanf(mPos, "#define %*s %u #define %*s %u unsigned", &mWidth, &mHeight) == 2)
-            mIsCursor = PR_FALSE;
-        else
-             // No identifiers found.  Return for now, waiting for more data.
-            return NS_OK;
-
-        // Check for X11 flavor
-        if (strstr(mPos, " char "))
-            mIsX10 = PR_FALSE;
-        // Check for X10 flavor
-        else if (strstr(mPos, " short "))
-            mIsX10 = PR_TRUE;
-        else
-            // Neither identifier found.  Return for now, waiting for more data.
-            return NS_OK;
-
-        mImage->Init(mWidth, mHeight, mObserver);
-        mObserver->OnStartContainer(nsnull, mImage);
-
-        PRUint32 imageLen;
-        nsresult rv = mImage->AppendFrame(0, 0, mWidth, mHeight, gfxASurface::ImageFormatARGB32,
-                                          (PRUint8**)&mImageData, &imageLen);
-        if (NS_FAILED(rv))
-            return rv;
-
-        if (mIsCursor) {
-            nsCOMPtr<nsIProperties> props(do_QueryInterface(mImage));
-            if (props) {
-                nsCOMPtr<nsISupportsPRUint32> intwrapx = do_CreateInstance("@mozilla.org/supports-PRUint32;1");
-                nsCOMPtr<nsISupportsPRUint32> intwrapy = do_CreateInstance("@mozilla.org/supports-PRUint32;1");
-
-                if (intwrapx && intwrapy) {
-                    intwrapx->SetData(mXHotspot);
-                    intwrapy->SetData(mYHotspot);
-
-                    props->Set("hotspotX", intwrapx);
-                    props->Set("hotspotY", intwrapy);
-                }
-            }
-        }
-
-        mObserver->OnStartFrame(nsnull, 0);
-
-        mState = RECV_SEEK;
-
-        mCurRow = 0;
-        mCurCol = 0;
-
-    }
-    if (mState == RECV_SEEK) {
-        if ((endPtr = strchr(mPos, '{')) != NULL) {
-            mPos = endPtr+1;
-            mState = RECV_DATA;
-        } else {
-            mPos = mBuf + mBufSize;
-            return NS_OK;
-        }
-    }
-    if (mState == RECV_DATA) {
-        PRUint32 *ar = mImageData + mCurRow * mWidth + mCurCol;
-
-        do {
-            PRUint32 pixel = strtoul(mPos, &endPtr, 0);
-            if (endPtr == mPos)
-                return NS_OK;   // no number to be found - need more data
-            if (!*endPtr)
-                return NS_OK;   // number at the end - might be missing a digit
-            if (pixel == 0 && *endPtr == 'x')
-                return NS_OK;   // 0x at the end, actual number is missing
-            while (*endPtr && isspace(*endPtr))
-                endPtr++;       // skip whitespace looking for comma
-
-            if (!*endPtr) {
-                // Need more data
-                return NS_OK;
-            }
-            if (*endPtr != ',') {
-                *endPtr = '\0';
-                mState = RECV_DONE;  // strange character (or ending '}')
-            } else {
-                // Skip the comma
-                endPtr++;
-            }
-            mPos = endPtr;
-            PRUint32 numPixels = 8;
-            if (mIsX10) { // X10 use 16bits values, but bytes are swapped
-                pixel = (pixel >> 8) | ((pixel&0xFF) << 8);
-                numPixels = 16;
-            }
-            numPixels = PR_MIN(numPixels, mWidth - mCurCol);
-            for (PRUint32 i = numPixels; i > 0; --i) {
-                *ar++ = kColors[pixel & 1];
-                pixel >>= 1;
-            }
-            mCurCol += numPixels;
-            if (mCurCol == mWidth || mState == RECV_DONE) {
-                nsIntRect r(0, mCurRow, mWidth, 1);
-                nsresult rv = mImage->FrameUpdated(0, r);
-                if (NS_FAILED(rv)) {
-                  return rv;
-                }
-
-                mObserver->OnDataAvailable(nsnull, PR_TRUE, &r);
-
-                mCurRow++;
-                if (mCurRow == mHeight) {
-                    mState = RECV_DONE;
-                    return mObserver->OnStopFrame(nsnull, 0);
-                }
-                mCurCol = 0;
-            }
-        } while ((mState == RECV_DATA) && *mPos);
-    }
-
-    return NS_OK;
-}
-
-
diff --git a/modules/libpr0n/decoders/xbm/nsXBMDecoder.h b/modules/libpr0n/decoders/xbm/nsXBMDecoder.h
deleted file mode 100644
index 2e0cc034680..00000000000
--- a/modules/libpr0n/decoders/xbm/nsXBMDecoder.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* vim:set tw=80 expandtab softtabstop=4 ts=4 sw=4: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Mozilla XBM Decoder.
- *
- * The Initial Developer of the Original Code is
- * Christian Biesinger <cbiesinger@web.de>.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Aaron Kaluszka <ask@swva.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#ifndef _nsXBMDecoder_h
-#define _nsXBMDecoder_h
-
-#include "nsCOMPtr.h"
-#include "imgIDecoder.h"
-#include "imgIContainer.h"
-#include "imgIDecoderObserver.h"
-
-#define NS_XBMDECODER_CID \
-{ /* {dbfd145d-3298-4f3c-902f-2c5e1a1494ce} */ \
-  0xdbfd145d, \
-  0x3298, \
-  0x4f3c, \
-  { 0x90, 0x2f, 0x2c, 0x5e, 0x1a, 0x14, 0x94, 0xce } \
-}
-
-class nsXBMDecoder : public imgIDecoder
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_IMGIDECODER
-
-    nsXBMDecoder();
-    virtual ~nsXBMDecoder();
-
-    nsresult ProcessData(const char* aData, PRUint32 aCount);
-private:
-    static NS_METHOD ReadSegCb(nsIInputStream* aIn, void* aClosure,
-                               const char* aFromRawSegment, PRUint32 aToOffset,
-                               PRUint32 aCount, PRUint32 *aWriteCount);
-
-    nsCOMPtr<imgIDecoderObserver> mObserver;
-
-    nsCOMPtr<imgIContainer> mImage;
-
-    PRUint32 mCurRow;
-    PRUint32 mCurCol;
-
-    char* mBuf; // Holds the received data
-    char* mPos;
-    PRUint32 mBufSize; // number of bytes in mBuf
-
-    PRUint32 mWidth;
-    PRUint32 mHeight;
-    PRUint32 mXHotspot;
-    PRUint32 mYHotspot;
-
-    PRUint32* mImageData;    // Pointer into the Cairo image data
-
-    PRPackedBool mIsCursor;
-    PRPackedBool mIsX10; // X10 flavor XBM?
-
-    enum {
-        RECV_HEADER,
-        RECV_SEEK,
-        RECV_DATA,
-        RECV_DONE
-    } mState;
-};
-
-
-#endif
diff --git a/modules/libpr0n/src/imgLoader.cpp b/modules/libpr0n/src/imgLoader.cpp
index 50014733652..d14b011f342 100644
--- a/modules/libpr0n/src/imgLoader.cpp
+++ b/modules/libpr0n/src/imgLoader.cpp
@@ -1681,9 +1681,6 @@ nsresult imgLoader::GetMimeTypeFromContent(const char* aContents, PRUint32 aLeng
     aContentType.AssignLiteral("image/x-icon");
   }
 
-  else if (aLength >= 8 && !nsCRT::strncmp(aContents, "#define ", 8)) {
-    aContentType.AssignLiteral("image/x-xbitmap");
-  }
   else {
     /* none of the above?  I give up */
     return NS_ERROR_NOT_AVAILABLE;
diff --git a/toolkit/locales/en-US/chrome/global/filepicker.properties b/toolkit/locales/en-US/chrome/global/filepicker.properties
index 3fc9d36ffde..e250be0e9b6 100644
--- a/toolkit/locales/en-US/chrome/global/filepicker.properties
+++ b/toolkit/locales/en-US/chrome/global/filepicker.properties
@@ -7,7 +7,6 @@ htmlFilter=*.html; *.htm; *.shtml; *.xhtml
 textTitle=Text Files
 textFilter=*.txt; *.text
 imageTitle=Image Files
-imageFilter=*.jpg; *.jpeg; *.gif; *.png; *.bmp; *.xbm; *.ico
 xmlTitle=XML Files
 xmlFilter=*.xml
 xulTitle=XUL Files
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index c4163e3ec6d..77094a4f0d5 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -809,7 +809,6 @@ MAKEFILES_libpr0n="
   modules/libpr0n/decoders/icon/win/Makefile
   modules/libpr0n/decoders/icon/gtk/Makefile
   modules/libpr0n/decoders/icon/beos/Makefile
-  modules/libpr0n/decoders/xbm/Makefile
   modules/libpr0n/encoders/Makefile
   modules/libpr0n/encoders/png/Makefile
   modules/libpr0n/encoders/jpeg/Makefile
diff --git a/widget/src/xpwidgets/nsBaseFilePicker.cpp b/widget/src/xpwidgets/nsBaseFilePicker.cpp
index 70152a4409d..0ca2682b5b2 100644
--- a/widget/src/xpwidgets/nsBaseFilePicker.cpp
+++ b/widget/src/xpwidgets/nsBaseFilePicker.cpp
@@ -153,8 +153,7 @@ nsBaseFilePicker::AppendFilters(PRInt32 aFilterMask)
   }
   if (aFilterMask & filterImages) {
     stringBundle->GetStringFromName(NS_LITERAL_STRING("imageTitle").get(), getter_Copies(title));
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("imageFilter").get(), getter_Copies(filter));
-    AppendFilter(title,filter);
+    AppendFilter(title,NS_LITERAL_STRING("*.jpg; *.jpeg; *.gif; *.png; *.bmp; *.ico"));
   }
   if (aFilterMask & filterXML) {
     stringBundle->GetStringFromName(NS_LITERAL_STRING("xmlTitle").get(), getter_Copies(title));

From ae3b3bf26de29745c5a86e9d2fb0dc8ec51121ae Mon Sep 17 00:00:00 2001
From: Neil Deakin <neil@mozilla.com>
Date: Wed, 29 Jul 2009 10:36:03 -0400
Subject: [PATCH 066/175] Bug 504224, crash in GetCommonAncestor, caused
 because child frame is still focused. Move focus when frame content is
 removed, and add warnings, r=smaug

---
 dom/base/crashtests/504224.html     | 22 ++++++++++++++++++++++
 dom/base/crashtests/crashtests.list |  1 +
 dom/base/nsFocusManager.cpp         | 23 +++++++++++++++++++----
 3 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 dom/base/crashtests/504224.html

diff --git a/dom/base/crashtests/504224.html b/dom/base/crashtests/504224.html
new file mode 100644
index 00000000000..71e561d7429
--- /dev/null
+++ b/dom/base/crashtests/504224.html
@@ -0,0 +1,22 @@
+<html class="reftest-wait">
+<head>
+<title>Crash [@ nsFocusManager::GetCommonAncestor], part 2</title>
+</head>
+<body>
+<iframe src="data:text/html;charset=utf-8,%3Chtml%3E%3Chead%3E%3C/head%3E%0A%3Cbody%20onunload%3D%22window.frameElement.parentNode.removeChild%28window.frameElement%29%22%20tabindex%3D%221%22%3E%0A%3Cscript%3E%0Adocument.body.focus%28%29%3B%0A%3C/script%3E%0A%3C/body%3E%0A%3C/html%3E" id="content"></iframe>
+<script>
+var src=document.getElementById('src');
+setInterval(function() {
+  if (!document.getElementById('content')) {
+    var x=document.createElement('iframe');
+    x.src=src;
+    x.id = 'content';
+    document.body.appendChild(x);
+    setTimeout(function() { window.focus(); document.documentElement.removeAttribute('class'); }, 100);
+  } else
+    window.frames[0].location.reload();
+}, 500);
+</script>
+</body>
+</html>
+
diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list
index bed46359d8f..070d6d311b4 100644
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -17,3 +17,4 @@ load 462947.html
 load 439206-1.html
 load 473284.xul
 load 502617.html
+load 504224.html
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index ba93b894cd7..4d8f59ab9f5 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -727,9 +727,6 @@ nsFocusManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent)
 
   // if the content is currently focused in the window, or is an ancestor
   // of the currently focused element, reset the focus within that window.
-  // Note that nothing special needs to happen when the focused node is an
-  // iframe; in that case, DocumentUnloaded should be called to invalidate the
-  // child frame.
   nsCOMPtr<nsIContent> content = window->GetFocusedNode();
   if (content && nsContentUtils::ContentIsDescendantOf(content, aContent)) {
     window->SetFocusedNode(nsnull);
@@ -743,8 +740,24 @@ nsFocusManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent)
 
     // if this window is currently focused, clear the global focused
     // element as well, but don't fire any events.
-    if (window == mFocusedWindow)
+    if (window == mFocusedWindow) {
       mFocusedContent = nsnull;
+    }
+    else {
+      // Check if the node that was focused is an iframe or similar by looking
+      // if it has a subdocument. This would indicate that this focused iframe
+      // and its descendants will be going away. We will need to move the
+      // focus somewhere else, so just clear the focus in the toplevel window
+      // so that no element is focused.
+      nsIDocument* subdoc = aDocument->GetSubDocumentFor(content);
+      if (subdoc) {
+        nsCOMPtr<nsISupports> container = subdoc->GetContainer();
+        nsCOMPtr<nsPIDOMWindow> childWindow = do_GetInterface(container);
+        if (childWindow && IsSameOrAncestor(childWindow, mFocusedWindow)) {
+          ClearFocus(mActiveWindow);
+        }
+      }
+    }
   }
 
   return NS_OK;
@@ -1118,9 +1131,11 @@ nsFocusManager::GetCommonAncestor(nsPIDOMWindow* aWindow1,
 {
   nsCOMPtr<nsIWebNavigation> webnav(do_GetInterface(aWindow1));
   nsCOMPtr<nsIDocShellTreeItem> dsti1 = do_QueryInterface(webnav);
+  NS_ENSURE_TRUE(dsti1, nsnull);
 
   webnav = do_GetInterface(aWindow2);
   nsCOMPtr<nsIDocShellTreeItem> dsti2 = do_QueryInterface(webnav);
+  NS_ENSURE_TRUE(dsti2, nsnull);
 
   nsAutoTPtrArray<nsIDocShellTreeItem, 30> parents1, parents2;
   do {

From c0923705447ac9216167036dbf3147493c2752c6 Mon Sep 17 00:00:00 2001
From: Edward Lee <edilee@mozilla.com>
Date: Wed, 29 Jul 2009 09:51:48 -0700
Subject: [PATCH 067/175] Bug 504384 - Excessive Flickering with the
 Asynchronous Location Bar. r=sdwilsh Don't tell autocomplete that we have 0
 results ongoing when we just started the search, so it doesn't cause the UI
 to show 0 results and immediately show more.

---
 toolkit/components/places/src/nsPlacesAutoComplete.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/toolkit/components/places/src/nsPlacesAutoComplete.js b/toolkit/components/places/src/nsPlacesAutoComplete.js
index 9d95b0fbe8b..c607a553aee 100644
--- a/toolkit/components/places/src/nsPlacesAutoComplete.js
+++ b/toolkit/components/places/src/nsPlacesAutoComplete.js
@@ -402,7 +402,6 @@ nsPlacesAutoComplete.prototype = {
     result.setSearchString(aSearchString);
     result.setListener(this);
     this._result = result;
-    this._notifyResults(true);
 
     // If we are not enabled, we need to return now.
     if (!this._enabled) {

From 4f3522d9d7c0448c071b6898839b0633b88eb9b5 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Wed, 29 Jul 2009 22:23:27 +0200
Subject: [PATCH 068/175] Bug 483437 - PSM doesn't properly escape AVA Values
 in Cert Viewer Details tab, r=nelson+benjamin

---
 build/pgo/certs/cert8.db                      | Bin 65536 -> 65536 bytes
 build/pgo/certs/key3.db                       | Bin 57344 -> 57344 bytes
 build/pgo/server-locations.txt                |   4 +
 security/manager/ssl/src/nsNSSCertHelper.cpp  |  19 +++-
 .../ssl/tests/mochitest/bugs/Makefile.in      |  17 +++-
 .../tests/mochitest/bugs/test_bug480509.html  |  88 ++++++++++++++++++
 .../tests/mochitest/bugs/test_bug484111.html  |  72 ++++++++++++++
 7 files changed, 194 insertions(+), 6 deletions(-)
 create mode 100644 security/manager/ssl/tests/mochitest/bugs/test_bug480509.html
 create mode 100644 security/manager/ssl/tests/mochitest/bugs/test_bug484111.html

diff --git a/build/pgo/certs/cert8.db b/build/pgo/certs/cert8.db
index a6e25b9d59c8e758dbce88ed703609da8009d919..ed2a828a379d203dcf83e134b1a52f583c0e4fef 100644
GIT binary patch
delta 1190
zcmZo@U}<PznPAN*wbAB?J)_cOMh8<7X0t1%D^2B0*P65%Wf<KxoNRd4aI>SsWJ7rl
zW(EdE20jLc)Z*mCg4D#4lEma}BL;>71_nWiI^W5H`*UoW4WtYu48+)&Ls^)G`OC}8
z^^y`(bkj>K^^)^*IT#rjoLL-L9GG|+_zaquI1QQ@ixx05F)}f+D0FZ~O}<#&;Am-J
zY-nL*U~Ft^7$weYh|D$6FjO;80h`Su3o$z{+Yn?j1CmXXwkg)1c)dc^p^t&#c<lZS
zN>haHXta2qTGD%|G)rWiUUb2V!n=LfKgwEM+|i%Oy6&`G>DIYi1+O<tZan(r>rJ+M
zXZ2lg>A9pY44HI#;}rw;WmnuZ1LyiQ+}W+mZ(C#88D!Jruv|clcbyP}vXD-ov5EFH
z)kLi`UN(mqS&pw1yY*`?7i06}h1(?R{e+I3-qFJDtP|YI?C-Z@V_ryIt<0}IW!KBD
zFB047`0?IP--_Q!6$hmcPMP_ODSBe}*8Nd0*@Ex1@i$%g^62ZKv?_=5U+R+t|83qq
z&;PQ0!P}bo2j1A9PZo@PajkWAs0qtErMAnzB<?<3r^+BZV|pB4sc@d!ggZCS2(CW&
zX>*iFH*!Q7GBAR}Sa5%?9JYuw1V<!PNlra8ae)nvRwf1pE#j3kp}Go^s<;>!O7lvJ
zN{dTUQy3Ve88&N_-QZ*tn#|ZB%ad#BV|v?UvQehdWTTB2(~Xok7!fH+7o3tbfhlPc
zG$n!4A}}QxLz0e>iG>MLN`i24rBYDZdC#^vqWS1)zOw6mQI7hFGP^!ZE;#?)A#Re@
z^5y@3N}buScV~M@greOCxkF)@GrzrCVBx6lsS=x1^@nZCpD@<f@3$}<e7sqCeJ}6!
zm5=7SoaQUw*ciTK=YrF%?YqNQaL4+@xow$s+Q05oZ9~_^KY7yr-`826pTXTJ`nqkW
zXhwQ{E)z2&1LI;H17Mf})4Hr6i=u&i6Fj{ep{I8c-+-5mQ>)FR?K>|cBP%Ndb7Lbz
zo<e8p!N7a(Kb~5!ZeRK7=aypkxxUFoK3evd)8$>fs^<m{bB!eXZ|)n^&o2?0dXOt}
zlEA_reTiSAXFfdf@#3Q;AM*=Kwgm=Vy}NGrIr&{v4`v(pKHT2-KVE$17HiA!aE<Hp
z({{|%G23dCm6mHiJ?m&z{eixW=?8+cn?lzvv$L7Tj2z8I42;ksqCi^)SKxy@f|59l
KHdk+L^#TCw3Ak(k

delta 60
zcmZo@U}<PznPAN*veD*<J)_iQMh8=t8>T{Ln*$ws3^yk@_^@miDtpJt$Tyj>L6#-T
Qw8nJf#VFIwHCtP}07_>Ra{vGU

diff --git a/build/pgo/certs/key3.db b/build/pgo/certs/key3.db
index 6238f5da9e5c67c28c4fe8a31441645e57b02941..5309a0e32bf0eb696b431a0186a18fcbfd5186ff 100644
GIT binary patch
delta 2494
zcmV;v2|@ONzypB51CTobC9yoj4-y6dfDg(HN(__<6bW7iOa@*Cvl0+Y29sVU8-L9|
zCmor+<yipp#}8ND;#Q~>8p#3y0R(~qfMzba9-SFjOWnch7I4QneZ1{}FHVAXZzGbU
zdrStW>&<)z5x3HG@u)7V#JC@fPU9Qwn;*81RQcOC=C_;-EYg|_$um0^$9*`A5Y2+B
z9#b{_PFD9kkb^}k4(W;c^_`-*N`EYdrK_cwEE2%CXumL?n5tdn#~wzW5?#c)X3Df7
ztR$=9J~Wi#AM44?RK9|SO_WYCWHRwm5V%33+npB+*oVy%lfh@NWA@Eud`XZ$MO%#k
z%Gb{*A3x{Cpq%FH1E@@#JQdjpXBU}7TqqKxuh_M~1ESAnm^K}H?n5Ej1b@?<_K;yQ
z%0m;cdsV{xQk?|FQ7NKB^9Rxsm8~~mhSuEO(cv{7T8L341z}CLxizO%V%&DZz@b$X
zh1reEpdud5bv2A|m>Kq@4Q(Vk$;q!*gqMAj?>ftj(o^=HEEts0o8oU{jfW4XB3%3o
z(%S8a@W5KdpS7j;_{IGC`hQB6i6EJnKB~+#z=Qizr>LKn>-*9j29kQ7I^v1wcEFv6
zCh?z33HxwQ8V3%K%LkUc7R3oFOqV*)U|X@cn7%gaY=Ttq+yqhLFj5VN#uaJ{S{PF-
z1yV_AjKb2BxF--#J>Gt1CLPihYO`c9I<57wZ$U=O3_)391X;5Efq#s-VOPv9u11I>
zh|)id^Ov&WcvDWX45;?V9VXAT!|tHTom)#3IINbGoaAfR1zzJP_M^Y_=M{eWmT-BC
z3-mF~w22>&l2rR$z}!cF^89o#akTMV$Of39ibx^{WGAAHHL)$7Mi(_QUv9K``DCcY
zO)5W=1gJ07D-!SQA%BlMwpeBENj)@Xfkw!)w=W}vXLI>3;2h$2JK=EIU3l*Xvsi=0
z%MNzej#@!4VH~>flW@=XKwgqMr>Fn<8qB{g+_zL%AwKXP!d7XS_U@oKK_^KhU1ECt
z2DJQE1?%s$0Kwz4Bd?7Ox2fWtM9U6v2(eeBxuDC1hr3s(3n5)hUPiQ<%TIpteSnJ5
z{B9dh_pUq7m<x#&>xQ`%XlHGcUM3rVHt&kG_caIU?*n`U`1Nck?sEUq0s#R8f&zf1
z@c>H>UIu!BytsfnB-IDg%7~Ae3@cf~$v!33$H%*4wiQv=Kwb^sfTL_#Ty$U<n^yrs
z(?bwLPy=A|b7_79GKhTofB;l9d8Da&MQtS6RXS!m{ed{nY;ES2GJ~R1LED3WGd@O|
zd?m|5%?mH5Z4+}uTJ-i(nw07|Wqsff>C^NKHU%A~J{7#hg61n&zOQ+45|Gs19~dHj
zH?taFw_Rk<E)ingvLKLhC7Y$Q0v6`IH4!0#?vq&Qzv?#>zxQvxo3QY!@SFUdjn*Vw
zNHcjuhqV-u$`-R0vbs%8A;z_TKPFpdbW{w}9%87nI{z%Yy6y8N#trvstw!_5Z6(+q
zgN;8*j1fUBE{2K{#-u?ezD$hpBfxW@eiJ2I_2A$fWYZHZIT0n{)3Q5=weg<#%+Zz-
zf#eO_P*MDB?nWgJcjRKc+Ypo}9trq+z@U&lUb^>EkeC~=g!0h-2R1l=^~K)oGY6oQ
zh;sF<XF2uQ)EQG?PeZHuHu{&@KjD*}fyDih-m<324wxV<ymB#Sblqz&x3KGrmv3DC
zJIA|y0>jN^>e4_nKTgSPj?Tp=4Tym4<6_W+3GQ9xAdu@f@!gDqhERxvd$4h1kBcRE
zxxOiY)Dqyvk{9Dt&Xq=gG8Yg`zXA4--)W(7gB56%5S)i6`g#Q(Acdzy+CyaC{EYJn
zyHax0{J%bqGRRibHwaPB9}tu1dI&9`CkmL%vWj$S{lzN-)~%&YF~$uH3abyKIZsNX
zhvhTK_{-43j7$5>yJuqC4<BTm(5!p}Nky1MYBDt#xZK&LIX_i@2RSv5buNX(fDPU#
zj;GZxAM?DZ@mS>Pn!am<D3V7n&pAvl5`6{`0?C-IIU$zqJi=3atf!$UY!#8Xnq2J@
zZ#Bz;iE27jk^=pgN8Q0pm+fy7hZD{34fH=j4AMs}yMU-1Pvf};BQe!QT5}c_!-6_J
z4S_{xbIrtVyr+F3kTkaNuLrfC(?&`~V{tGD4#x$5>mGGNutgw$4x#nNGm~B>8?)sc
z8>0>c0Duq53`z`?35E%j39|t(h6$5iMjL<b%J}OYtAJ&{JIBftkXH_PVNIt30RaSp
z0)PWVKgR3s)N3kpwhhoP)bXuS;A*=i$V*uYZxc{)9xlHhQcF9wtQoiJ-U9*^Ay4~j
zrDKkl(Cf#5?1H8do%Zs%X9;MrQu@GRn>ja7k3EYSdi>5G#=pZF6~jdgSJg7?FfV_k
z>uJ9rxMJHM-CVM)E_O@aG?0MZ=n;Xf`K}|dlVNPXoA5fv{oPCjcbx6$QS6GngWsvX
zgS{e54qDQ1gU{v`q4ScZ4A9+FDQG2d#-*wrR(3IlIQn90K$&t#Ug^K6`~h|f3cORQ
zOsH%`Ggl|!w0z9YNrDl?9#4Os!V7=UoSh(L@{}~=O!uM90MTsfr47#geLhPC!~Q((
zu9jM8#+rNAhru8_fU;fYXh&)bHtal-stJ?~CmA-%pJKjP$>CWr0Zg4Q0>(30eyqVI
z-?iyCKQ-5w_yWoXMFWtRwazo0b(v3XjT=e&o{sLcp7uW$zOOB-<8!tFFSmcaA$sdB
z6*!SGWZ9$VR4X{BUnlW9K^x211xS<(9=15kka98{PPmG;I|#=`GYg+U87xbKZjY8*
zjEDpYhqm+Yxo=>EoG4ElyEvib2+tE@B)CG4#(ui`!igY7ik)`W<T??d{DKYe^`%e?
zh<X0W%FO={Wy`OOrJ^{VrAB{Uz9M8OvjnnZN*V)&?l|MIF};%a{iXq%(Dl+*(E12-
z+a_7{FeFVuw)p|yLIKQ2p@2Z6BtLUipc`^B26}9cu5ig4Mu322<U}lVzeE1;H0zl&
z#xGr3XZT<X?qmP36xLxI04~##slaDe6EI?We0ItSj@#XDcI1y+=bL}X<mFePhnvM!
zp2g$xp8H^0n69}BV+rhAY-d)ESqtmP>!>9_jsO71UB9p*loH%1gh|SzjnZ{$6s|5?
zaHw(Jj@R)WIMKL|X$7v!9(A>y3UKSQ8L`FW_1OmA%`ZjTE<|UcRFccF)G!C8)J7>$
zolJn-yDbkrd^w3yJd7bgrw|qmt`Yzv5-d?OG%J=RVJgf@Ji-A4$Eg<D`n?K+lU^np
Iv*pYi6ReN2SO5S3

delta 86
zcmZoTz}#?vd4e^g(ngyj{6b6&4g9Bg4)C1fS<OG4Uz|UXXS0xi58LLrFmdM1tg&~P
jCKs%!oE#@6z4@t(^kOcA^399}2Y4pOxdA24NDBi1%qAT%

diff --git a/build/pgo/server-locations.txt b/build/pgo/server-locations.txt
index 6eaca35943c..1b698564c40 100644
--- a/build/pgo/server-locations.txt
+++ b/build/pgo/server-locations.txt
@@ -156,3 +156,7 @@ https://sub.sectest1.example.org:443
 # Used while testing the url-classifier
 #
 http://malware.example.com:80
+
+# Bug 483437, 484111
+https://www.bank1.com:443           privileged,cert=escapeattack1
+https://www.bank2.com:443           privileged,cert=escapeattack2
diff --git a/security/manager/ssl/src/nsNSSCertHelper.cpp b/security/manager/ssl/src/nsNSSCertHelper.cpp
index b897fc966e9..8d8d0c36f69 100755
--- a/security/manager/ssl/src/nsNSSCertHelper.cpp
+++ b/security/manager/ssl/src/nsNSSCertHelper.cpp
@@ -885,7 +885,24 @@ ProcessRDN(CERTRDN* rdn, nsAString &finalString, nsINSSComponent *nssComponent)
     if(!decodeItem) {
       return NS_ERROR_FAILURE;
     }
-    avavalue = NS_ConvertUTF8toUTF16((char*)decodeItem->data, decodeItem->len);
+
+    // We know we can fit buffer of this length. CERT_RFC1485_EscapeAndQuote
+    // will fail if we provide smaller buffer then the result can fit to.
+    PRIntn escapedValueCapacity = decodeItem->len * 3 + 3;
+    nsAutoArrayPtr<char> escapedValue;
+    escapedValue = new char[escapedValueCapacity];
+    if (!escapedValue)
+      return NS_ERROR_OUT_OF_MEMORY;
+
+    SECStatus status = CERT_RFC1485_EscapeAndQuote(
+          escapedValue.get(),
+          escapedValueCapacity, 
+          (char*)decodeItem->data, 
+          decodeItem->len);
+    if (SECSuccess != status)
+      return NS_ERROR_FAILURE;
+
+    avavalue = NS_ConvertUTF8toUTF16(escapedValue);
     
     SECITEM_FreeItem(decodeItem, PR_TRUE);
     params[0] = type.get();
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index e27909cd87f..1d6b2305f76 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -40,14 +40,21 @@ DEPTH		= ../../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= security/ssl
+relativesrcdir	= security/ssl/bugs
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
- _CHROME_FILES	= \
-	test_bug413909.html \
-	$(NULL)
+_TEST_FILES = \
+        test_bug480509.html \
+        test_bug484111.html \
+        $(NULL)
 
- libs:: $(_CHROME_FILES)
+_CHROME_FILES = \
+        test_bug413909.html \
+        $(NULL)
+
+libs:: $(_TEST_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
+libs:: $(_CHROME_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_bug480509.html b/security/manager/ssl/tests/mochitest/bugs/test_bug480509.html
new file mode 100644
index 00000000000..4ed9c09b38d
--- /dev/null
+++ b/security/manager/ssl/tests/mochitest/bugs/test_bug480509.html
@@ -0,0 +1,88 @@
+<html>
+<head>
+  <title>Test bug 483437 and bug 480509</title>
+  <script type="text/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>        
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+</head>
+<body onload="onWindowLoad()">
+
+<iframe src="https://www.bank1.com/" onload="onFrameLoad()"></iframe>
+
+<script class="testbody" type="text/javascript">
+
+SimpleTest.waitForExplicitFinish();
+
+function badCertListener() 
+{
+}
+
+badCertListener.prototype = {
+  badCertCaught: false,
+
+  getInterface: function (aIID) {
+    return this.QueryInterface(aIID);
+  },
+
+  QueryInterface: function(aIID) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (aIID.equals(Components.interfaces.nsIBadCertListener2) ||
+        aIID.equals(Components.interfaces.nsIInterfaceRequestor) ||
+        aIID.equals(Components.interfaces.nsISupports))
+      return this;
+
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  },  
+
+  testCert: function(cert1, expected)
+  {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var certDumpTree1 = Components.classes["@mozilla.org/security/nsASN1Tree;1"]
+                       .createInstance(Components.interfaces.nsIASN1Tree);
+    certDumpTree1.loadASN1Structure(cert1.ASN1Structure);
+    var value1 = certDumpTree1.getDisplayData(9);
+    
+    is(value1, expected, "Incorrect subject recognized");
+  },
+  
+  notifyCertProblem: function(socketInfo, sslStatus, targetHost) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var cert = sslStatus.QueryInterface(Components.interfaces.nsISSLStatus)
+      .serverCert;
+    this.testCert(cert, "CN = www.bank1.com\\00www.bad-guy.com\n");
+
+    this.badCertCaught = true;
+    return true;
+  }
+}
+
+function onFrameLoad()
+{
+  ok(false, "Attackers page failed to load");
+}
+
+function onWindowLoad()
+{
+  var req = new XMLHttpRequest();
+  var certListener = new badCertListener();
+  try
+  {
+    req.open("GET", "https://www.bank1.com/", false);
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    req.channel.notificationCallbacks = certListener;
+    req.send(null);
+  }
+  catch(ex)
+  {
+    // ignore
+  }
+  
+  ok(certListener.badCertCaught, "We Caught the invalid certificate");
+  
+  SimpleTest.finish();
+}
+
+</script>
+
+</body>
+</html>
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_bug484111.html b/security/manager/ssl/tests/mochitest/bugs/test_bug484111.html
new file mode 100644
index 00000000000..11fe4d90ab6
--- /dev/null
+++ b/security/manager/ssl/tests/mochitest/bugs/test_bug484111.html
@@ -0,0 +1,72 @@
+<html>
+<head>
+  <title>Test bug 484111</title>
+  <script type="text/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>        
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+</head>
+<body onload="onWindowLoad()">
+
+<iframe src="https://www.bank2.com/" onload="onFrameLoad()"></iframe>
+
+<script class="testbody" type="text/javascript">
+
+SimpleTest.waitForExplicitFinish();
+
+function badCertListener() 
+{
+}
+
+badCertListener.prototype = {
+  badCertCaught: false,
+
+  getInterface: function (aIID) {
+    return this.QueryInterface(aIID);
+  },
+
+  QueryInterface: function(aIID) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (aIID.equals(Components.interfaces.nsIBadCertListener2) ||
+        aIID.equals(Components.interfaces.nsIInterfaceRequestor) ||
+        aIID.equals(Components.interfaces.nsISupports))
+      return this;
+
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  },  
+
+  notifyCertProblem: function(socketInfo, sslStatus, targetHost) {
+    this.badCertCaught = true;
+    return true;
+  }
+}
+
+function onFrameLoad()
+{
+  ok(false, "Attackers page failed to load");
+}
+
+function onWindowLoad()
+{
+  var req = new XMLHttpRequest();
+  var certListener = new badCertListener();
+  try
+  {
+    req.open("GET", "https://www.bank2.com/", false);
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    req.channel.notificationCallbacks = certListener;
+    req.send(null);
+  }
+  catch(ex)
+  {
+    // ignore
+  }
+  
+  ok(certListener.badCertCaught, "We Caught the invalid certificate");
+  
+  SimpleTest.finish();
+}
+
+</script>
+
+</body>
+</html>

From 8e3e2ba2dabebca887d2ec8cda262288b7c3cb61 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Wed, 29 Jul 2009 22:23:27 +0200
Subject: [PATCH 069/175] Bug 483440 - PSM doesn't detect invalid OID encodings
 in Cert Viewer Details tab, r=nelson+johnath

---
 build/pgo/certs/bug483440-attack2b.ca         | 14 +++
 build/pgo/certs/bug483440-attack7.ca          | 16 ++++
 build/pgo/certs/bug483440-pk10oflo.ca         | 14 +++
 security/manager/ssl/src/nsNSSCertHelper.cpp  | 92 ++++++++++++++-----
 .../ssl/tests/mochitest/bugs/Makefile.in      |  1 +
 .../tests/mochitest/bugs/test_bug483440.html  | 65 +++++++++++++
 6 files changed, 179 insertions(+), 23 deletions(-)
 create mode 100644 build/pgo/certs/bug483440-attack2b.ca
 create mode 100644 build/pgo/certs/bug483440-attack7.ca
 create mode 100644 build/pgo/certs/bug483440-pk10oflo.ca
 create mode 100644 security/manager/ssl/tests/mochitest/bugs/test_bug483440.html

diff --git a/build/pgo/certs/bug483440-attack2b.ca b/build/pgo/certs/bug483440-attack2b.ca
new file mode 100644
index 00000000000..8adcf2ac107
--- /dev/null
+++ b/build/pgo/certs/bug483440-attack2b.ca
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICKDCCAZGgAwIBAgIFAIyjFPowDQYJKoZIhvcNAQEFBQAwKDEXMBUGA1UEAwwO
+KgB3d3cubXlDQS5vcmcxDTALBgNVBAMTBG15Q0EwHhcNMDkwMzE0MTg0NzU2WhcN
+MTkwMzE0MTg0NzU2WjBhMRMwEQYDVQQKEwpCYWRndXkgSW5jMRcwFQYDVQQDEw53
+d3cuYmFkZ3V5LmNvbTEZMBcGA1UECxMQSGFja2luZyBEaXZpc2lvbjEWMBQGBFUE
+gAMTDHd3dy5iYW5rLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2YvL
+GgmF0OTLBKz0nYTvR+DlnZai7b2MqAIM9IUEpMfqzJPNYCsXziYXgHtr/do9ppJP
+BhDjeyIGEOSpgBqdkWItxlLopUHnf8VKwnDPPj4KkNyXuTLm60X/ph+/zrjTw+kU
+m+/kVYstgGMuTIoTuu7loxCqqeVlAgc5lzTpUhkCAwEAAaMlMCMwDAYDVR0TAQH/
+BAIwADATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQUFAAOBgQAKHl1G
+vaXftj5QPK3eIT6Q3fWuGKR39grlg5GL/WocPanYycOlm9zvT1Hx95cY6msIXSKp
+xycndJ02ODX35DDgolV6VHUsM9yoagk+eqs5kCqW2qiv3moIshL0yWVhuCobMA+E
+D3wHFCPqVU+igRdCrEQDxZHoFOR4J/DKHfGANg==
+-----END CERTIFICATE-----
diff --git a/build/pgo/certs/bug483440-attack7.ca b/build/pgo/certs/bug483440-attack7.ca
new file mode 100644
index 00000000000..778e7acedd6
--- /dev/null
+++ b/build/pgo/certs/bug483440-attack7.ca
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICljCCAf+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBkDERMA8GBPMlBAMTB2F0
+dGFjazcxEDAOBgOABAMTB2F0dGFjazYxEzARBgZVBP///38TB2F0dGFjazUxEjAQ
+BgVVBAOBgRMHYXR0YWNrNDEUMBIGB1UEgICAgIATB2F0dGFjazMxFDASBgdVBJCA
+gIABEwdhdHRhY2syMRQwEgYHVQSIgICAARMHYXR0YWNrMTAeFw0wOTA0MTMxNDAw
+MzdaFw0yOTA0MTMxNDAwMzdaMIGQMREwDwYE8yUEAxMHYXR0YWNrNzEQMA4GA4AE
+AxMHYXR0YWNrNjETMBEGBlUE////fxMHYXR0YWNrNTESMBAGBVUEA4GBEwdhdHRh
+Y2s0MRQwEgYHVQSAgICAgBMHYXR0YWNrMzEUMBIGB1UEkICAgAETB2F0dGFjazIx
+FDASBgdVBIiAgIABEwdhdHRhY2sxMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQC77fQ1wrywBnVmr8XO0/78/qFOz+sjnMlpBvLx5UImittgMNSgEqNulRDbO0qG
+K4tlFF2sNsS7aOun6Cq7yl2+a8mIljmjzs+iwCLOEAkQTOM4RsdCosJVy/fjwmH1
+xI0uXt5cPkA0FM7B/IZSzWSC+2gY1+u1AhRJ35bXDhu92wIDAQABMA0GCSqGSIb3
+DQEBBQUAA4GBAFZitQjsQJ1+XsxKchBefilaHsi4oncc05P29IXcRbHI8wK2vNk8
+kkG2c6M4a4Rx1R4C3n99NwXH4vyNUbA9FuMSAdjaS3TW3zm8lKNCuIWGuI2Vvefy
++wNcCfb8B4AuP8pZOqqKsspgiBAE1EPPErnb7nMVLCnf+ts9ARXLBZTi
+-----END CERTIFICATE-----
diff --git a/build/pgo/certs/bug483440-pk10oflo.ca b/build/pgo/certs/bug483440-pk10oflo.ca
new file mode 100644
index 00000000000..7daef524b23
--- /dev/null
+++ b/build/pgo/certs/bug483440-pk10oflo.ca
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICMTCCAZqgAwIBAgIFAIyjFTAwDQYJKoZIhvcNAQEFBQAwKDEXMBUGA1UEAwwO
+KgB3d3cubXlDQS5vcmcxDTALBgNVBAMTBG15Q0EwHhcNMDkwMzE0MTg0ODI0WhcN
+MTkwMzE0MTg0ODI0WjBqMRMwEQYDVQQKEwpCYWRndXkgSW5jMRcwFQYDVQQDEw53
+d3cuYmFkZ3V5LmNvbTEZMBcGA1UECxMQSGFja2luZyBEaXZpc2lvbjEfMB0GDVUE
+goCAgICAgICAgAMTDHd3dy5iYW5rLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEA2YvLGgmF0OTLBKz0nYTvR+DlnZai7b2MqAIM9IUEpMfqzJPNYCsXziYX
+gHtr/do9ppJPBhDjeyIGEOSpgBqdkWItxlLopUHnf8VKwnDPPj4KkNyXuTLm60X/
+ph+/zrjTw+kUm+/kVYstgGMuTIoTuu7loxCqqeVlAgc5lzTpUhkCAwEAAaMlMCMw
+DAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQUF
+AAOBgQBr+ekYoADBm6kbHBR1oc/6O9ZciRsTbxIAl3xjA3kNEeiUXXSoe+1dlt3Z
+7D6EaQztqR8usCW728J3vi8p/XxociK3r4aq0Sxu29gp21N1V/Um8y3ssI+Yt9Im
+oHlo5ikUXra5PtGAwi4FymrU5dWlHxYk1PlNP5nsvxdElPZnZA==
+-----END CERTIFICATE-----
diff --git a/security/manager/ssl/src/nsNSSCertHelper.cpp b/security/manager/ssl/src/nsNSSCertHelper.cpp
index 8d8d0c36f69..d67c477577c 100755
--- a/security/manager/ssl/src/nsNSSCertHelper.cpp
+++ b/security/manager/ssl/src/nsNSSCertHelper.cpp
@@ -204,23 +204,21 @@ ProcessSerialNumberDER(SECItem         *serialItem,
 
 static nsresult
 GetDefaultOIDFormat(SECItem *oid,
+                    nsINSSComponent *nssComponent,
                     nsAString &outString,
-		    char separator)
+                    char separator)
 {
   char buf[300];
-  unsigned int len;
-  int written;
+  unsigned int len = 0;
+  int written, invalidCount = 0;
     
-  unsigned long val  = oid->data[0];
-  unsigned int  i    = val % 40;
-  val /= 40;
-  written = PR_snprintf(buf, 300, "%lu%c%u", val, separator, i);
-  if (written < 0)
-    return NS_ERROR_FAILURE;	
-  len = written;
+  unsigned int i;
+  unsigned long val  = 0;
+  PRBool invalid = PR_FALSE;
+  PRBool first = PR_TRUE;
 
   val = 0;
-  for (i = 1; i < oid->len; ++i) {
+  for (i = 0; i < oid->len; ++i) {
     // In this loop, we have to parse a DER formatted 
     // If the first bit is a 1, then the integer is 
     // represented by more than one byte.  If the 
@@ -231,16 +229,64 @@ GetDefaultOIDFormat(SECItem *oid,
 
     j = oid->data[i];
     val = (val << 7) | (j & 0x7f);
-    if (j & 0x80)
-      continue;
-    written = PR_snprintf(&buf[len], sizeof(buf)-len, "%c%lu", 
-			  separator, val);
+    if (j & 0x80) {
+      // - If val is 0 in this block, the OID number particle starts with 0x80
+      // what is specified as an invalid formating.
+      // - If val is larger then 2^32-7, on next left shift by 7 we will loose
+      // the most significant bits, this OID number particle cannot be read
+      // by our implementation.
+      // - If the first bit is set while this is the last component of the OID
+      // we are also in an invalid state.
+      if (val == 0 || (val >= (1 << (32-7))) || (i == oid->len-1)) {
+        invalid = PR_TRUE;
+      }
+
+      if (i < oid->len-1)
+        continue;
+    }
+
+    if (!invalid) {
+      if (first) {
+        unsigned long one = PR_MIN(val/40, 2); // never > 2
+        unsigned long two = val - (one * 40);
+
+        written = PR_snprintf(&buf[len], sizeof(buf)-len, "%lu%c%lu", 
+			      one, separator, two);
+      }
+      else {
+        written = PR_snprintf(&buf[len], sizeof(buf)-len, "%c%lu", 
+			      separator, val);
+      }
+    }
+    else {
+      nsAutoString unknownText;
+      nssComponent->GetPIPNSSBundleString("CertUnknown", 
+                                          unknownText);
+      if (first) {
+        written = PR_snprintf(&buf[len], sizeof(buf)-len, "%s",
+                              NS_ConvertUTF16toUTF8(unknownText).get());
+      }
+      else {
+        written = PR_snprintf(&buf[len], sizeof(buf)-len, "%c%s",
+                              separator, 
+                              NS_ConvertUTF16toUTF8(unknownText).get());
+      }
+
+      if (++invalidCount > 3) {
+        // Allow only 3 occurences of Unknown in OID display string to
+        // prevent bloat.
+        break;
+      }
+    }
+
     if (written < 0)
       return NS_ERROR_FAILURE;
 
     len += written;
     NS_ASSERTION(len < sizeof(buf), "OID data to big to display in 300 chars.");
     val = 0;      
+    invalid = PR_FALSE;
+    first = PR_FALSE;
   }
 
   CopyASCIItoUTF16(buf, outString);
@@ -600,7 +646,7 @@ GetOIDText(SECItem *oid, nsINSSComponent *nssComponent, nsAString &text)
     rv = nssComponent->GetPIPNSSBundleString(bundlekey, text);
   } else {
     nsAutoString text2;
-    rv = GetDefaultOIDFormat(oid, text2, ' ');
+    rv = GetDefaultOIDFormat(oid, nssComponent, text2, ' ');
     if (NS_FAILED(rv))
       return rv;
 
@@ -834,14 +880,14 @@ ProcessExtKeyUsage(SECItem  *extData,
     // of the form CertDumpEKU_<underlined-OID>
     nsAutoString oidname;
     oid = *oids;
-    rv = GetDefaultOIDFormat(oid, oidname, '_');
+    rv = GetDefaultOIDFormat(oid, nssComponent, oidname, '_');
     if (NS_FAILED(rv))
       return rv;
     nsAutoString bundlekey = NS_LITERAL_STRING("CertDumpEKU_")+ oidname;
     NS_ConvertUTF16toUTF8 bk_ascii(bundlekey);
     
     rv = nssComponent->GetPIPNSSBundleString(bk_ascii.get(), local);
-    nsresult rv2 = GetDefaultOIDFormat(oid, oidname, '.');
+    nsresult rv2 = GetDefaultOIDFormat(oid, nssComponent, oidname, '.');
     if (NS_FAILED(rv2))
       return rv2;
     if (NS_SUCCEEDED(rv)) {
@@ -1066,7 +1112,7 @@ ProcessGeneralName(PRArenaPool *arena,
 	  ProcessRawBytes(nssComponent, &current->name.OthName.name, value);
 	}
     } else {
-      rv = GetDefaultOIDFormat(&current->name.OthName.oid, key, ' ');
+      rv = GetDefaultOIDFormat(&current->name.OthName.oid, nssComponent, key, ' ');
       if (NS_FAILED(rv))
 	goto finish;
       ProcessRawBytes(nssComponent, &current->name.OthName.name, value);
@@ -1126,7 +1172,7 @@ ProcessGeneralName(PRArenaPool *arena,
     }
   case certRegisterID:
     nssComponent->GetPIPNSSBundleString("CertDumpRegisterID", key);
-    rv = GetDefaultOIDFormat(&current->name.other, value, '.');
+    rv = GetDefaultOIDFormat(&current->name.other, nssComponent, value, '.');
     if (NS_FAILED(rv))
       goto finish;
     break;
@@ -1356,7 +1402,7 @@ ProcessCertificatePolicies(SECItem  *extData,
       text.Append(local);
       break;
     default:
-      GetDefaultOIDFormat(&policyInfo->policyID, local, '.');
+      GetDefaultOIDFormat(&policyInfo->policyID, nssComponent, local, '.');
       text.Append(local);
     }
 
@@ -1407,7 +1453,7 @@ ProcessCertificatePolicies(SECItem  *extData,
 				 text, nssComponent);
 	  break;
 	default:
-	  GetDefaultOIDFormat(&policyQualifier->qualifierID, local, '.');
+	  GetDefaultOIDFormat(&policyQualifier->qualifierID, nssComponent, local, '.');
 	  text.Append(local);
 	  text.Append(NS_LITERAL_STRING(": "));
 	  ProcessRawBytes(nssComponent, &policyQualifier->qualifierValue, text);
@@ -1545,7 +1591,7 @@ ProcessAuthInfoAccess(SECItem  *extData,
       nssComponent->GetPIPNSSBundleString("CertDumpCAIssuers", local);
       break;
     default:
-      rv = GetDefaultOIDFormat(&desc->method, local, '.');
+      rv = GetDefaultOIDFormat(&desc->method, nssComponent, local, '.');
       if (NS_FAILED(rv))
 	goto finish;
     }
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index 1d6b2305f76..3188726b06a 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -47,6 +47,7 @@ include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \
         test_bug480509.html \
+        test_bug483440.html \
         test_bug484111.html \
         $(NULL)
 
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_bug483440.html b/security/manager/ssl/tests/mochitest/bugs/test_bug483440.html
new file mode 100644
index 00000000000..96035ce58a6
--- /dev/null
+++ b/security/manager/ssl/tests/mochitest/bugs/test_bug483440.html
@@ -0,0 +1,65 @@
+<html>
+<head>
+  <title>Test bug 483437 and bug 480509</title>
+  <script type="text/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>        
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<script class="testbody" type="text/javascript">
+
+netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+var certdb = Components.classes["@mozilla.org/security/x509certdb;1"]
+  .getService(Components.interfaces.nsIX509CertDB);
+
+function test(certNick, expected)
+{
+  var cert1 = certdb.findCertByNickname(null, certNick);
+  var certDumpTree1 = Components.classes["@mozilla.org/security/nsASN1Tree;1"]
+                     .createInstance(Components.interfaces.nsIASN1Tree);
+  certDumpTree1.loadASN1Structure(cert1.ASN1Structure);
+  var value1 = certDumpTree1.getDisplayData(9);
+  
+  is(value1, expected, "Incorrect OID recognized");
+}
+
+test("bug483440-attack2b", 
+     "Object Identifier (2 5 4 Unknown) = www.bank.com\n"+
+     "OU = Hacking Division\n"+
+     "CN = www.badguy.com\nO = Badguy Inc\n");
+
+test("bug483440-pk10oflo",
+     "Object Identifier (2 5 4 Unknown) = www.bank.com\n"+
+     "OU = Hacking Division\n"+
+     "CN = www.badguy.com\nO = Badguy Inc\n");
+
+test("bug483440-attack7",
+
+     // Check 88 80 80 80 01, not leading, have to pass
+     "Object Identifier (2 5 4 2147483649) = attack1\n"+
+     
+     // Check 90 80 80 80 01, not leading, have to fail
+     "Object Identifier (2 5 4 Unknown) = attack2\n"+
+     
+     // Check 80 80 80 80 80, not leading, have to fail
+     "Object Identifier (2 5 4 Unknown) = attack3\n"+
+     
+     // Check 81 81, trailing, have to fail
+     "Object Identifier (2 5 4 3 Unknown) = attack4\n"+
+     
+     // Check FF FF FF 7F, not leading, have to pass
+     "Object Identifier (2 5 4 268435455) = attack5\n"+
+     
+     // Check 80 leading, have to fail
+     "Object Identifier (Unknown 3) = attack6\n"+
+     
+     // Check 14757 = 2*40 + 14677 leading single byle encoded as F325, 
+     // have to pass
+     "Object Identifier (2 14677 4 3) = attack7\n");
+
+</script>
+
+</body>
+</html>

From 4fb015ac9d8df931ca7a44e8a28128f0fe848ace Mon Sep 17 00:00:00 2001
From: Nelson Bolyard <nelson@bolyard.me>
Date: Wed, 29 Jul 2009 14:07:45 -0700
Subject: [PATCH 070/175] Bug 332173 - Problems with regexp parsing of '~' in
 nsIZipReader.findEntries (and other nsWildCard uses).  r=jwalden, a=ss

---
 xpcom/io/nsWildCard.cpp | 449 ++++++++++++++++++++++++----------------
 1 file changed, 275 insertions(+), 174 deletions(-)

diff --git a/xpcom/io/nsWildCard.cpp b/xpcom/io/nsWildCard.cpp
index ff0ac240b5f..1aa82e0f70d 100644
--- a/xpcom/io/nsWildCard.cpp
+++ b/xpcom/io/nsWildCard.cpp
@@ -57,73 +57,75 @@
 
 template<class T>
 static int
-_valid_subexp(const T *expr, T stop)
+_valid_subexp(const T *expr, T stop1, T stop2)
 {
-    register int x,y,t;
-    int nsc,np,tld;
-
-    x=0;nsc=0;tld=0;
-
-    while(expr[x] && (expr[x] != stop)) {
+    register int x;
+    int nsc = 0;     /* Number of special characters */
+    int np;          /* Number of pipe characters in union */
+    int tld = 0;     /* Number of tilde characters */
+ 
+    for (x = 0; expr[x] && (expr[x] != stop1) && (expr[x] != stop2); ++x) {
         switch(expr[x]) {
-          case '~':
-            if(tld) return INVALID_SXP;
-            else ++tld;
-          case '*':
-          case '?':
-          case '^':
-          case '$':
+        case '~':
+            if(tld)                 /* at most one exclusion */
+                return INVALID_SXP;
+            if (stop1)              /* no exclusions within unions */
+                return INVALID_SXP;
+            if (!expr[x+1])          /* exclusion cannot be last character */
+                return INVALID_SXP;
+            if (!x)                 /* exclusion cannot be first character */
+                return INVALID_SXP;
+            ++tld;
+            /* fall through */
+        case '*':
+        case '?':
+        case '$':
             ++nsc;
             break;
-          case '[':
+        case '[':
             ++nsc;
             if((!expr[++x]) || (expr[x] == ']'))
                 return INVALID_SXP;
-            for(;expr[x] && (expr[x] != ']');++x)
-                if(expr[x] == '\\')
-                    if(!expr[++x])
-                        return INVALID_SXP;
+            for(; expr[x] && (expr[x] != ']'); ++x) {
+                if(expr[x] == '\\' && !expr[++x])
+                    return INVALID_SXP;
+            }
             if(!expr[x])
                 return INVALID_SXP;
             break;
-          case '(':
-            ++nsc;np = 0;
-            while(1) {
-                if(expr[++x] == ')')
-                    return INVALID_SXP;
-                for(y=x;(expr[y]) && (expr[y] != '|') && (expr[y] != ')');++y)
-                    if(expr[y] == '\\')
-                        if(!expr[++y])
-                            return INVALID_SXP;
-                if(!expr[y])
-                    return INVALID_SXP;
-                if(expr[y] == '|')
-                    ++np;
-                t = ::_valid_subexp(&expr[x],expr[y]);
-                if(t == INVALID_SXP)
+        case '(':
+            ++nsc;
+            if (stop1)                  /* no nested unions */
+                return INVALID_SXP;
+            np = -1;
+            do {
+                int t = ::_valid_subexp(&expr[++x], T(')'), T('|'));
+                if(t == 0 || t == INVALID_SXP)
                     return INVALID_SXP;
                 x+=t;
-                if(expr[x] == ')') {
-                    if(!np)
-                        return INVALID_SXP;
-                    break;
-                }
-            }
+                if(!expr[x])
+                    return INVALID_SXP;
+                ++np;
+            } while (expr[x] == '|' );
+            if(np < 1)  /* must be at least one pipe */
+                return INVALID_SXP;
             break;
-          case ')':
-          case ']':
+        case ')':
+        case ']':
+        case '|':
             return INVALID_SXP;
-          case '\\':
+        case '\\':
+            ++nsc;
             if(!expr[++x])
                 return INVALID_SXP;
-          default:
+            break;
+        default:
             break;
         }
-        ++x;
     }
-    if((!stop) && (!nsc))
-        return NON_SXP;
-    return ((expr[x] == stop) ? x : INVALID_SXP);
+    if((!stop1) && (!nsc)) /* must be at least one special character */
+         return NON_SXP;
+    return ((expr[x] == stop1 || expr[x] == stop2) ? x : INVALID_SXP);
 }
 
 
@@ -131,7 +133,7 @@ template<class T>
 int
 NS_WildCardValid_(const T *expr)
 {
-    int x = ::_valid_subexp(expr, T('\0'));
+    int x = ::_valid_subexp(expr, T('\0'), T('\0'));
     return (x < 0 ? x : VALID_SXP);
 }
 
@@ -155,166 +157,265 @@ NS_WildCardValid(const PRUnichar *expr)
 #define ABORTED -1
 
 template<class T>
-static int _shexp_match(const T *str, const T *expr, PRBool case_insensitive);
+static int
+_shexp_match(const T *str, const T *expr, PRBool case_insensitive, unsigned int level);
 
+/**
+ * Count characters until we reach a NUL character or either of the
+ * two delimiter characters, stop1 or stop2.  If we encounter a bracketed
+ * expression, look only for NUL or ']' inside it.  Do not look for stop1
+ * or stop2 inside it. Return ABORTED if bracketed expression is unterminated.
+ * Handle all escaping.
+ * Return index in input string of first stop found, or ABORTED if not found.
+ * If "dest" is non-NULL, copy counted characters to it and NUL terminate.
+ */
 template<class T>
 static int
-_handle_union(const T *str, const T *expr, PRBool case_insensitive)
+_scan_and_copy(const T *expr, T stop1, T stop2, T *dest)
 {
-    T *e2 = (T *) NS_Alloc(sizeof(T)*nsCharTraits<T>::length(expr));
-    register int t,p2,p1 = 1;
-    int cp;
+    register int sx;     /* source index */
+    register char cc;
 
-    while(1) {
-        for(cp=1;expr[cp] != ')';cp++)
-            if(expr[cp] == '\\')
-                ++cp;
-        for(p2 = 0;(expr[p1] != '|') && (p1 != cp);p1++,p2++) {
-            if(expr[p1] == '\\')
-                e2[p2++] = expr[p1++];
-            e2[p2] = expr[p1];
+    for (sx = 0; (cc = expr[sx]) && cc != stop1 && cc != stop2; sx++) {
+        if (cc == '\\') {
+            if (!expr[++sx])
+                return ABORTED; /* should be impossible */
         }
-        for (t=cp+1; ((e2[p2] = expr[t]) != 0); ++t,++p2) {}
-        if(::_shexp_match(str,e2, case_insensitive) == MATCH) {
-            NS_Free(e2);
-            return MATCH;
+        else if (cc == '[') {
+            while ((cc = expr[++sx]) && cc != ']') {
+                if(cc == '\\' && !expr[++sx])
+                    return ABORTED;
+            }
+            if (!cc)
+                return ABORTED; /* should be impossible */
         }
-        if(p1 == cp) {
-            NS_Free(e2);
-            return NOMATCH;
-        }
-        else ++p1;
     }
+    if (dest && sx) {
+        /* Copy all but the closing delimiter. */
+        memcpy(dest, expr, sx * sizeof(T));
+        dest[sx] = 0;
+    }
+    return cc ? sx : ABORTED; /* index of closing delimiter */
 }
 
+/* On input, expr[0] is the opening parenthesis of a union.
+ * See if any of the alternatives in the union matches as a pattern.
+ * The strategy is to take each of the alternatives, in turn, and append
+ * the rest of the expression (after the closing ')' that marks the end of
+ * this union) to that alternative, and then see if the resultant expression
+ * matches the input string.  Repeat this until some alternative matches,
+ * or we have an abort.
+ */
+template<class T>
+static int
+_handle_union(const T *str, const T *expr, PRBool case_insensitive,
+              unsigned int level)
+{
+    register int sx;     /* source index */
+    int cp;              /* source index of closing parenthesis */
+    int count;
+    int ret   = NOMATCH;
+    T *e2;
+
+    /* Find the closing parenthesis that ends this union in the expression */
+    cp = ::_scan_and_copy(expr, T(')'), T('\0'), static_cast<T*>(NULL));
+    if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */
+        return ABORTED;
+    ++cp;                /* now index of char after closing parenthesis */
+    e2 = (T *) NS_Alloc(1 + nsCharTraits<T>::length(expr));
+    if (!e2)
+        return ABORTED;
+    for (sx = 1; ret == NOMATCH && expr[sx] && expr[sx] != ')'; ++sx) {
+        /* Here, expr[sx] is one character past the preceeding '(' or '|'. */
+        /* Copy everything up to the next delimiter to e2 */
+        count = ::_scan_and_copy(expr + sx, T(')'), T('|'), e2);
+        if (count == ABORTED || !count) {
+            ret = ABORTED;
+            break;
+        }
+        sx += count;
+        /* Append everything after closing parenthesis to e2. This is safe. */
+        nsCharTraits<T>::copy(e2 + count, expr + cp, nsCharTraits<T>::length(expr + cp) + 1);
+        ret = ::_shexp_match(str, e2, case_insensitive, level + 1);
+    }
+    NS_Free(e2);
+    if (sx < 2)
+        ret = ABORTED;
+    return ret;
+}
+
+/* returns 1 if val is in range from start..end, case insensitive. */
+static int
+_is_char_in_range(int start, int end, int val)
+{
+    char map[256];
+    memset(map, 0, sizeof map);
+    while (start <= end)
+        map[tolower(start++)] = 1;
+    return map[tolower(val)];
+}
 
 template<class T>
 static int
-_shexp_match(const T *str, const T *expr, PRBool case_insensitive)
+_shexp_match(const T *str, const T *expr, PRBool case_insensitive,
+             unsigned int level)
 {
-    register int x,y;
+    register int x;   /* input string index */
+    register int y;   /* expression index */
     int ret,neg;
 
-    ret = 0;
-    for(x=0,y=0;expr[y];++y,++x) {
-        if((!str[x]) && (expr[y] != '(') && (expr[y] != '$') && (expr[y] != '*'))
-            ret = ABORTED;
-        else {
-            switch(expr[y]) {
-              case '$':
-                if( (str[x]) )
-                    ret = NOMATCH;
-                else
-                    --x;             /* we don't want loop to increment x */
-                break;
-              case '*':
-                while(expr[++y] == '*'){}
-                if(!expr[y])
+    if (level > 20)      /* Don't let the stack get too deep. */
+        return ABORTED;
+    for(x = 0, y = 0; expr[y]; ++y, ++x) {
+        if((!str[x]) && (expr[y] != '$') && (expr[y] != '*')) {
+            return NOMATCH;
+        }
+        switch(expr[y]) {
+        case '$':
+            if(str[x])
+                return NOMATCH;
+            --x;                 /* we don't want loop to increment x */
+            break;
+        case '*':
+            while(expr[++y] == '*'){}
+            if(!expr[y])
+                return MATCH;
+            while(str[x]) {
+                ret = ::_shexp_match(&str[x++], &expr[y], case_insensitive,
+                                     level + 1);
+                switch(ret) {
+                case NOMATCH:
+                    continue;
+                case ABORTED:
+                    return ABORTED;
+                default:
                     return MATCH;
-                while(str[x]) {
-                    switch(::_shexp_match(&str[x++],&expr[y], case_insensitive)) {
-                      case NOMATCH:
-                        continue;
-                      case ABORTED:
-                        ret = ABORTED;
-                        break;
-                      default:
-                        return MATCH;
-                    }
-                    break;
                 }
-                if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
-                    return MATCH;
-                else
-                    ret = ABORTED;
-                break;
-              case '[':
-                neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
-                if (neg)
-                    ++y;
-
-                if ((isalnum(expr[y])) && (expr[y+1] == '-') &&
-                   (isalnum(expr[y+2])) && (expr[y+3] == ']'))
-                    {
-                        int start = expr[y], end = expr[y+2];
-
-                        /* Droolproofing for pinheads not included */
-                        if(neg ^ ((str[x] < start) || (str[x] > end))) {
-                            ret = NOMATCH;
-                            break;
-                        }
-                        y+=3;
-                    }
-                else {
-                    int matched;
-
-                    for (matched=0;expr[y] != ']';y++) {
-                        /* match an escaped ']' character */
-                        if('\\' == expr[y] && ']' == expr[y+1]) {
-                            if(']' == str[x])
-                                matched |= 1;
-                            y++; /* move an extra char to compensate for '\\' */
-                            continue;
-                        }
-                        matched |= (str[x] == expr[y]);
-                    }
-                    if (neg ^ (!matched))
-                        ret = NOMATCH;
-                }
-                break;
-              case '(':
-                return ::_handle_union(&str[x],&expr[y], case_insensitive);
-                break;
-              case '?':
-                break;
-              case '\\':
+            }
+            if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
+                return MATCH;
+            else
+                return NOMATCH;
+        case '[': {
+            T start, end = 0;
+            int i;
+            neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
+            if (neg)
                 ++y;
-              default:
-                if(case_insensitive)
-                  {
-                    if(toupper(str[x]) != toupper(expr[y]))
-                        ret = NOMATCH;
-                  }
-                else
-                  {
-                    if(str[x] != expr[y])
-                        ret = NOMATCH;
-                  }
-                break;
+            i = y;
+            start = expr[i++];
+            if (start == '\\')
+                start = expr[i++];
+            if (isalnum(int(start)) && expr[i++] == '-') {
+                end = expr[i++];
+                if (end == '\\')
+                    end = expr[i++];
+            }
+            if (isalnum(int(end)) && expr[i] == ']') {
+                /* This is a range form: a-b */
+                T val = str[x];
+                if (end < start) { /* swap them */
+                    T tmp = end;
+                    end = start;
+                    start = tmp;
+                }
+                if (case_insensitive && isalpha(int(val))) {
+                    val = ::_is_char_in_range(int(start), int(end), int(val));
+                    if (neg == val)
+                        return NOMATCH;
+                }
+                else if (neg != ((val < start) || (val > end))) {
+                    return NOMATCH;
+                }
+                y = i;
+            }
+            else {
+                /* Not range form */
+                int matched = 0;
+                for (; expr[y] != ']'; y++) {
+                    if (expr[y] == '\\')
+                        ++y;
+                    if(case_insensitive)
+                        matched |= (toupper(int(str[x])) == toupper(int(expr[y])));
+                    else
+                        matched |= (str[x] == expr[y]);
+                }
+                if (neg == matched)
+                    return NOMATCH;
             }
         }
-        if(ret)
+        break;
+        case '(':
+            if (!expr[y+1])
+                return ABORTED;
+            return ::_handle_union(&str[x], &expr[y], case_insensitive, level + 1);
+        case '?':
             break;
+        case ')':
+        case ']':
+        case '|':
+            return ABORTED;
+        case '\\':
+            ++y;
+            /* fall through */
+        default:
+            if(case_insensitive) {
+                if(toupper(int(str[x])) != toupper(int(expr[y])))
+                    return NOMATCH;
+            }
+            else {
+                if(str[x] != expr[y])
+                    return NOMATCH;
+            }
+            break;
+        }
     }
-    return (ret ? ret : (str[x] ? NOMATCH : MATCH));
+    return (str[x] ? NOMATCH : MATCH);
 }
 
 
 template<class T>
-int
-NS_WildCardMatch_(const T *str, const T *xp, PRBool case_insensitive)
+static int
+ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive)
 {
-    T *expr = NS_strdup(xp);
+    T *expr = NULL;
+    int x, ret = MATCH;
 
+    if (!nsCharTraits<T>::find(xp, nsCharTraits<T>::length(xp), T('~')))
+        return _shexp_match(str, xp, case_insensitive, 0);
+
+    expr = (T *) NS_Alloc(nsCharTraits<T>::length(xp) + 1);
     if(!expr)
-        return 1;
+        return NOMATCH;
 
-    for(int x=nsCharTraits<T>::length(expr)-1;x;--x) {
-        if((expr[x] == '~') && (expr[x-1] != '\\')) {
-            expr[x] = '\0';
-            if(::_shexp_match(str,&expr[++x], case_insensitive) == MATCH)
-                goto punt;
-            break;
+    x = ::_scan_and_copy(expr, T('~'), T('\0'), static_cast<T*>(NULL));
+    if (x != ABORTED && expr[x] == '~') {
+        expr[x++] = '\0';
+        ret = ::_shexp_match(str, &expr[x], case_insensitive, 0);
+        switch (ret) {
+        case NOMATCH: ret = MATCH;   break;
+        case MATCH:   ret = NOMATCH; break;
+        default:                     break;
         }
     }
-    if(::_shexp_match(str,expr, case_insensitive) == MATCH) {
-        NS_Free(expr);
-        return 0;
-    }
+    if (ret == MATCH)
+        ret = ::_shexp_match(str, expr, case_insensitive, 0);
 
-  punt:
     NS_Free(expr);
-    return 1;
+    return ret;
+}
+
+template<class T>
+NS_COM int
+NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive)
+{
+    int is_valid = NS_WildCardValid(expr);
+    switch(is_valid) {
+        case INVALID_SXP:
+            return -1;
+        default:
+            return ns_WildCardMatch(str, expr, case_insensitive);
+    }
 }
 
 NS_COM int

From 4df669c633a682f4491dde927e1cff62652c7179 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 29 Jul 2009 23:50:25 +0200
Subject: [PATCH 071/175] Bug 507219 - Crash in nsNavHistoryResult::OnVisit,
 r=dietrich

---
 toolkit/components/places/src/nsNavHistoryResult.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolkit/components/places/src/nsNavHistoryResult.cpp b/toolkit/components/places/src/nsNavHistoryResult.cpp
index 4b1538a7dbf..c0462e30c3b 100644
--- a/toolkit/components/places/src/nsNavHistoryResult.cpp
+++ b/toolkit/components/places/src/nsNavHistoryResult.cpp
@@ -3838,6 +3838,7 @@ RemoveBookmarkFolderObserversCallback(nsTrimInt64HashKey::KeyType aKey,
 }
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsNavHistoryResult)
+  tmp->StopObserving();
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mRootNode)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mView)
   tmp->mBookmarkFolderObservers.Enumerate(&RemoveBookmarkFolderObserversCallback, nsnull);

From d43f814b3a7fa21fc4fe562bb698d9e64a659223 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 29 Jul 2009 23:50:31 +0200
Subject: [PATCH 072/175] Bug 502860 - some of the seventh month's history
 entries missing in grouped by date history, r=sdwilsh Includes fix for Bug
 501439 - History shows month-name 'March' for February

---
 .../components/places/src/nsNavHistory.cpp    |  8 ++++--
 .../places/tests/unit/test_history_sidebar.js | 25 +++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index 3720f11aa2f..7592006c674 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -3563,9 +3563,9 @@ PlacesSQLQueryBuilder::SelectAsDay()
           // From start of epoch
           sqlFragmentContainerBeginTime = NS_LITERAL_CSTRING(
             "(datetime(0, 'unixepoch')*1000000)");
-          // To start of 6 months ago
+          // To start of 6 months ago ( 5 months + this month).
           sqlFragmentContainerEndTime = NS_LITERAL_CSTRING(
-            "(strftime('%s','now','localtime','start of day','-6 months','utc')*1000000)");
+            "(strftime('%s','now','localtime','start of month','-5 months','utc')*1000000)");
           // Search for the same timeframe.
           sqlFragmentSearchBeginTime = sqlFragmentContainerBeginTime;
           sqlFragmentSearchEndTime = sqlFragmentContainerEndTime;
@@ -3577,6 +3577,10 @@ PlacesSQLQueryBuilder::SelectAsDay()
         PRExplodedTime tm;
         PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &tm);
         PRUint16 currentYear = tm.tm_year;
+        // Set day before month, setting month without day could cause issues.
+        // For example setting month to February when today is 30, since
+        // February has not 30 days, will return March instead.
+        tm.tm_mday = 1;
         tm.tm_month -= MonthIndex;
         PR_NormalizeTime(&tm, PR_LocalTimeParameters);
         // tm_month starts from 0 while GetMonthName expects a 1-based index.
diff --git a/toolkit/components/places/tests/unit/test_history_sidebar.js b/toolkit/components/places/tests/unit/test_history_sidebar.js
index 11fce85176b..37f213326de 100644
--- a/toolkit/components/places/tests/unit/test_history_sidebar.js
+++ b/toolkit/components/places/tests/unit/test_history_sidebar.js
@@ -82,6 +82,19 @@ function add_normalized_visit(aURI, aTime, aDayOffset) {
   return visitId;
 }
 
+function days_for_x_months_ago(aNowObj, aMonths) {
+  var oldTime = new Date();
+  // Set day before month, otherwise we could try to calculate 30 February, or
+  // other not existant days.
+  oldTime.setDate(1);
+  oldTime.setMonth(aNowObj.getMonth() - aMonths);
+  oldTime.setHours(0);
+  oldTime.setMinutes(0);
+  oldTime.setSeconds(0);
+  // Stay larger for eventual timezone issues, add 2 days.
+  return parseInt((aNowObj - oldTime) / (1000*60*60*24)) + 2;
+}
+
 var nowObj = new Date();
 // This test relies on en-US locale
 // Offset is number of days
@@ -90,8 +103,12 @@ var containers = [
   { label: "Yesterday"           , offset: -1                    , visible: true },
   { label: "Last 7 days"         , offset: -3                    , visible: true },
   { label: "This month"          , offset: -8                    , visible: nowObj.getDate() > 8 },
-  { label: ""                    , offset: -nowObj.getDate()-1   , visible: true },
-  { label: "Older than 6 months" , offset: -nowObj.getDate()-186 , visible: true },
+  { label: ""                    , offset: -days_for_x_months_ago(nowObj, 0)   , visible: true },
+  { label: ""                    , offset: -days_for_x_months_ago(nowObj, 1)   , visible: true },
+  { label: ""                    , offset: -days_for_x_months_ago(nowObj, 2)   , visible: true },
+  { label: ""                    , offset: -days_for_x_months_ago(nowObj, 3)   , visible: true },
+  { label: ""                    , offset: -days_for_x_months_ago(nowObj, 4)   , visible: true },
+  { label: "Older than 6 months" , offset: -days_for_x_months_ago(nowObj, 5) , visible: true },
 ];
 
 var visibleContainers = containers.filter(
@@ -130,12 +147,16 @@ function fill_history() {
 
   var cc = root.childCount;
   print("Found containers:");
+  var previousLabels = [];
   for (var i = 0; i < cc; i++) {
     var container = visibleContainers[i];
     var node = root.getChild(i);
     print(node.title);
     if (container.label)
       do_check_eq(node.title, container.label);
+    // Check labels are not repeated.
+    do_check_eq(previousLabels.indexOf(node.title), -1);
+    previousLabels.push(node.title);
   }
   do_check_eq(cc, visibleContainers.length);
   root.containerOpen = false;

From 169ff8e415823af409c0b8c28b9b056d71b3b1a1 Mon Sep 17 00:00:00 2001
From: David Dahl <ddahl@mozilla.com>
Date: Wed, 29 Jul 2009 23:50:37 +0200
Subject: [PATCH 073/175] Bug 479089 - Need to test that removing a page from
 autocomplete actually removes a page, r=sdwilsh

---
 ...st_autocomplete_on_value_removed_479089.js | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js

diff --git a/toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js b/toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js
new file mode 100644
index 00000000000..ad1c93692b1
--- /dev/null
+++ b/toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js
@@ -0,0 +1,83 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Places unit test code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   David Dahl <ddahl@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Need to test that removing a page from autocomplete actually removes a page
+ * Description From  Shawn Wilsher :sdwilsh   2009-02-18 11:29:06 PST
+ * We don't test the code path of onValueRemoved
+ * for the autocomplete implementation
+ * Bug 479089
+ */
+
+var ios = Cc["@mozilla.org/network/io-service;1"].
+getService(Components.interfaces.nsIIOService);
+
+var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
+getService(Ci.nsINavHistoryService);
+
+function run_test()
+{
+  // QI to nsIAutoCompleteSimpleResultListener
+  var historyService = histsvc.QueryInterface(Components.interfaces.nsIAutoCompleteSimpleResultListener);
+
+  // add history visit
+  var now = Date.now() * 1000;
+  var uri = ios.newURI("http://foo.mozilla.com/", null, null);
+  var ref = ios.newURI("http://mozilla.com/", null, null);
+  var visit = histsvc.addVisit(uri, now, ref, 1, false, 0);
+  // create a query object
+  var query = historyService.getNewQuery();
+  // create the options object we will never use
+  var options = historyService.getNewQueryOptions();
+  // look for this uri only
+  query.uri = uri;
+  // execute
+  var queryRes = historyService.executeQuery(query, options);
+  // open the result container
+  queryRes.root.containerOpen = true;
+  // debug queries
+  // dump_table("moz_places_view");
+  do_check_eq(queryRes.root.childCount, 1);  
+  // call the untested code path
+  historyService.onValueRemoved(null, uri.spec, true);
+  // make sure it is GONE from the DB
+  do_check_eq(queryRes.root.childCount, 0);
+  // close the container
+  queryRes.root.containerOpen = false;
+}
+

From 30bdfb2e8d6a8dee1d630de39f451f4170c6afd0 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 29 Jul 2009 23:50:42 +0200
Subject: [PATCH 074/175] Bug 494749 - mochitest-browser-chrome:
 browser_490040.js times out intermittently, refactoring of the test,
 r=dietrich

---
 .../test/browser/browser_490040.js            | 111 ++++++++++--------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/browser/components/sessionstore/test/browser/browser_490040.js b/browser/components/sessionstore/test/browser/browser_490040.js
index 5bb48bf0c1e..1fb939442bf 100644
--- a/browser/components/sessionstore/test/browser/browser_490040.js
+++ b/browser/components/sessionstore/test/browser/browser_490040.js
@@ -38,51 +38,69 @@
 function test() {
   /** Test for Bug 490040 **/
 
-  let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
-  let os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+  let ss = Cc["@mozilla.org/browser/sessionstore;1"].
+           getService(Ci.nsISessionStore);
+  let os = Cc["@mozilla.org/observer-service;1"].
+           getService(Ci.nsIObserverService);
+  let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
+           getService(Ci.nsIWindowWatcher);
 
   waitForExplicitFinish();
 
-  function testWithState(aState, aCallback) {
-    // ensure we can store the window if need be
+  function testWithState(aState) {
+    // Ensure we can store the window if needed.
     let curClosedWindowCount = ss.getClosedWindowCount();
-    gPrefService.setIntPref("browser.sessionstore.max_windows_undo", curClosedWindowCount + 1);
+    gPrefService.setIntPref("browser.sessionstore.max_windows_undo",
+                            curClosedWindowCount + 1);
 
-    let theWin = openDialog(location, "_blank", "chrome,all,dialog=no");
-    theWin.addEventListener("load", function(aEvent) {
-      theWin.removeEventListener("load", arguments.callee, true);
+    let windowObserver = {
+      observe: function(aSubject, aTopic, aData) {
+        let theWin = aSubject.QueryInterface(Ci.nsIDOMWindow);
 
-      ss.setWindowState(theWin, JSON.stringify(aState.windowState), true);
+        switch(aTopic) {
+          case "domwindowopened":
+            theWin.addEventListener("load", function () {
+              theWin.removeEventListener("load", arguments.callee, false);
+              executeSoon(function() {
+                // Close the window as soon as the first tab loads, or
+                // immediately if there are no tabs.
+                if (aState.windowState.windows[0].tabs[0].entries.length) {
+                  theWin.gBrowser.addEventListener("load", function() {
+                    theWin.gBrowser.removeEventListener("load",
+                                                        arguments.callee, true);
+                    theWin.close();
+                  }, true);
+                } else {
+                  executeSoon(function() {
+                    theWin.close();
+                  });
+                }
+                ss.setWindowState(theWin, JSON.stringify(aState.windowState),
+                                  true);
+              });
+            }, false);
+            break;
 
-      let observer = {
-        QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                               Ci.nsISupportsWeakReference]),
-        observe: function(aSubject, aTopic, aData) {
-          let _this = this;
-          // use executeSoon to ensure this happens after SS observer
-          executeSoon(function() {
-            is(ss.getClosedWindowCount(), curClosedWindowCount + (aState.shouldBeAdded ? 1 : 0),
-               "That window should " + (aState.shouldBeAdded ? "" : "not ") + "be restorable");
-            os.removeObserver(_this, "domwindowclosed");
-            executeSoon(aCallback);
-          });
+          case "domwindowclosed":
+            ww.unregisterNotification(this);
+            // Use executeSoon to ensure this happens after SS observer.
+            executeSoon(function() {
+              is(ss.getClosedWindowCount(),
+                 curClosedWindowCount + (aState.shouldBeAdded ? 1 : 0),
+                 "That window should " + (aState.shouldBeAdded ? "" : "not ") +
+                 "be restorable");
+              executeSoon(runNextTest);
+            });
+            break;
         }
-      };
-      os.addObserver(observer, "domwindowclosed", true);
-
-      // Close the window as soon as the first tab loads, or immediately if
-      // there are no tabs.
-      if (aState.windowState.windows[0].tabs[0].entries.length) {
-        theWin.gBrowser.addEventListener("load", function() {
-          theWin.gBrowser.removeEventListener("load", arguments.callee, true);
-          theWin.close();
-        }, true);
-      } else {
-        executeSoon(function() {
-          theWin.close();
-        });
       }
-    }, true);
+    }
+    ww.registerNotification(windowObserver);
+    ww.openWindow(null,
+                  location,
+                  "_blank",
+                  "chrome,all,dialog=no",
+                  null);
   }
 
   // Only windows with open tabs are restorable. Windows where a lone tab is
@@ -128,15 +146,16 @@ function test() {
     }
   ];
 
-  testWithState(states[0], function() {
-    testWithState(states[1], function() {
-      testWithState(states[2], function() {
-        testWithState(states[3], function() {
-          gPrefService.clearUserPref("browser.sessionstore.max_windows_undo");
-          finish();
-        });
-      });
-    });
-  });
+  function runNextTest() {
+    if (states.length) {
+      let state = states.shift();
+      testWithState(state);
+    }
+    else {
+      gPrefService.clearUserPref("browser.sessionstore.max_windows_undo");
+      finish();
+    }
+  }
+  runNextTest();
 }
 

From 8520ce448259e23f3766841aaa420a5c2ce22d8c Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Wed, 29 Jul 2009 18:10:50 -0400
Subject: [PATCH 075/175] Bug 269908. <legend> default style changes restrict
 styling options. r+sr=bzbarsky

---
 layout/base/nsCSSFrameConstructor.cpp  |  8 ++++++--
 layout/generic/nsHTMLReflowState.cpp   |  5 ++++-
 layout/reftests/bugs/269908-1-ref.html | 11 +++++++++++
 layout/reftests/bugs/269908-1.html     | 11 +++++++++++
 layout/reftests/bugs/269908-2-ref.html |  8 ++++++++
 layout/reftests/bugs/269908-2.html     |  8 ++++++++
 layout/reftests/bugs/269908-3-ref.html |  8 ++++++++
 layout/reftests/bugs/269908-3.html     |  8 ++++++++
 layout/reftests/bugs/269908-4-ref.html |  8 ++++++++
 layout/reftests/bugs/269908-4.html     |  8 ++++++++
 layout/reftests/bugs/269908-5-ref.html |  8 ++++++++
 layout/reftests/bugs/269908-5.html     |  8 ++++++++
 layout/reftests/bugs/reftest.list      |  5 +++++
 layout/style/forms.css                 | 16 ++++++++--------
 14 files changed, 109 insertions(+), 11 deletions(-)
 create mode 100644 layout/reftests/bugs/269908-1-ref.html
 create mode 100644 layout/reftests/bugs/269908-1.html
 create mode 100644 layout/reftests/bugs/269908-2-ref.html
 create mode 100644 layout/reftests/bugs/269908-2.html
 create mode 100644 layout/reftests/bugs/269908-3-ref.html
 create mode 100644 layout/reftests/bugs/269908-3.html
 create mode 100644 layout/reftests/bugs/269908-4-ref.html
 create mode 100644 layout/reftests/bugs/269908-4.html
 create mode 100644 layout/reftests/bugs/269908-5-ref.html
 create mode 100644 layout/reftests/bugs/269908-5.html

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 58682106cc0..50018c46959 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -3653,8 +3653,12 @@ nsCSSFrameConstructor::FindHTMLData(nsIContent* aContent,
       (!aParentFrame ||
        (aParentFrame->GetType() != nsGkAtoms::fieldSetFrame &&
         aParentFrame->GetStyleContext()->GetPseudoType() !=
-          nsCSSAnonBoxes::fieldsetContent))) {
-    // <legend> is only special inside fieldset frames
+          nsCSSAnonBoxes::fieldsetContent) ||
+       aStyleContext->GetStyleDisplay()->IsFloating() ||
+       aStyleContext->GetStyleDisplay()->IsAbsolutelyPositioned())) {
+    // <legend> is only special inside fieldset frames, but for floated or
+    // absolutely positioned legends we want to construct by display type and
+    // not do special legend stuff
     // XXXbz it would be nice if we could just decide this based on the parent
     // tag, and hence just use a SIMPLE_TAG_CHAIN for legend below, but the
     // fact that with XBL we could end up with this legend element in some
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index fade1dd6761..7bdde4a9c4c 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -1831,6 +1831,9 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
     } else {
       PRBool isBlock =
         NS_CSS_FRAME_TYPE_BLOCK == NS_FRAME_GET_TYPE(mFrameType);
+      // make sure legend frames with display:block and width:auto still
+      // shrink-wrap
+      PRBool shrinkWrap = !isBlock || frame->GetType() == nsGkAtoms::legendFrame;
       nsSize size =
         frame->ComputeSize(rendContext,
                            nsSize(aContainingBlockWidth,
@@ -1844,7 +1847,7 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
                                     mComputedPadding.TopBottom()),
                            nsSize(mComputedPadding.LeftRight(),
                                   mComputedPadding.TopBottom()),
-                           !isBlock);
+                           shrinkWrap);
 
       mComputedWidth = size.width;
       mComputedHeight = size.height;
diff --git a/layout/reftests/bugs/269908-1-ref.html b/layout/reftests/bugs/269908-1-ref.html
new file mode 100644
index 00000000000..38cccd6ec86
--- /dev/null
+++ b/layout/reftests/bugs/269908-1-ref.html
@@ -0,0 +1,11 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<div style="float: left; display: block; padding-left: 0px; padding-right: 0px;">test</div>
+</fieldset>
+<fieldset>
+<div style="float: right; display: block; padding-left: 0px; padding-right: 0px;">test</div>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-1.html b/layout/reftests/bugs/269908-1.html
new file mode 100644
index 00000000000..2578eac89ac
--- /dev/null
+++ b/layout/reftests/bugs/269908-1.html
@@ -0,0 +1,11 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<legend style="float: left; padding-left: 0px; padding-right: 0px;">test</legend>
+</fieldset>
+<fieldset>
+<legend style="float: right; padding-left: 0px; padding-right: 0px;">test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-2-ref.html b/layout/reftests/bugs/269908-2-ref.html
new file mode 100644
index 00000000000..3a986102eb0
--- /dev/null
+++ b/layout/reftests/bugs/269908-2-ref.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset style="position: relative">
+<div style="position: absolute; top 15px; left: 22px; display: block; padding-left: 0px; padding-right: 0px;">test</div>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-2.html b/layout/reftests/bugs/269908-2.html
new file mode 100644
index 00000000000..90ceea356de
--- /dev/null
+++ b/layout/reftests/bugs/269908-2.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset style="position: relative">
+<legend style="position: absolute; top 15px; left: 22px; padding-left: 0px; padding-right: 0px;">test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-3-ref.html b/layout/reftests/bugs/269908-3-ref.html
new file mode 100644
index 00000000000..114c58bff68
--- /dev/null
+++ b/layout/reftests/bugs/269908-3-ref.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<div style="position: absolute; top 17px; left: 19px; display: block; padding-left: 0px; padding-right: 0px;">test</div>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-3.html b/layout/reftests/bugs/269908-3.html
new file mode 100644
index 00000000000..6d36ac1693c
--- /dev/null
+++ b/layout/reftests/bugs/269908-3.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<legend style="position: absolute; top 17px; left: 19px; padding-left: 0px; padding-right: 0px;">test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-4-ref.html b/layout/reftests/bugs/269908-4-ref.html
new file mode 100644
index 00000000000..58f6ccffef2
--- /dev/null
+++ b/layout/reftests/bugs/269908-4-ref.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<div style="position: fixed; top 21px; left: 13px; display: block; padding-left: 0px; padding-right: 0px;">test</div>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-4.html b/layout/reftests/bugs/269908-4.html
new file mode 100644
index 00000000000..cfa207ac543
--- /dev/null
+++ b/layout/reftests/bugs/269908-4.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<legend style="position: fixed; top 21px; left: 13px; padding-left: 0px; padding-right: 0px;">test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-5-ref.html b/layout/reftests/bugs/269908-5-ref.html
new file mode 100644
index 00000000000..03a7a816d76
--- /dev/null
+++ b/layout/reftests/bugs/269908-5-ref.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<legend>test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-5.html b/layout/reftests/bugs/269908-5.html
new file mode 100644
index 00000000000..a8bf121e5a3
--- /dev/null
+++ b/layout/reftests/bugs/269908-5.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<legend style="width: auto;">test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index f425172aff1..8a02851e58e 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -227,6 +227,11 @@ skip-if(MOZ_WIDGET_TOOLKIT=="cocoa") != 240536-resizer-ltr.xul 240536-resizer-rt
 == 262151-1.html 262151-1-ref.html
 == 262998-1.html 262998-1-ref.html
 == 267353-1.html 267353-1-ref.html
+== 269908-1.html 269908-1-ref.html
+== 269908-2.html 269908-2-ref.html
+== 269908-3.html 269908-3-ref.html
+== 269908-4.html 269908-4-ref.html
+== 269908-5.html 269908-5-ref.html
 == 271747-1a.html 271747-1-ref.html
 == 271747-1b.html 271747-1-ref.html
 == 272646-1.xul 272646-1-ref.xul
diff --git a/layout/style/forms.css b/layout/style/forms.css
index d7745abe2c3..978d8ae7b2c 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -53,14 +53,14 @@ fieldset > legend {
   padding-left: 2px;
   padding-right: 2px;
   border: none;
-  position: static ! important;
-  float: none ! important;
-  width: -moz-fit-content ! important;
-  min-width: 0 ! important;
-  max-width: none ! important;
-  height: auto ! important;
-  min-height: 0 ! important;
-  max-height: none ! important;
+  position: static;
+  float: none;
+  width: -moz-fit-content;
+  min-width: 0;
+  max-width: none;
+  height: auto;
+  min-height: 0;
+  max-height: none;
   white-space: nowrap;
 }
 

From d925bda685cdc18c8767fb43fd9baa1c3dd6ea3d Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Wed, 29 Jul 2009 18:10:50 -0400
Subject: [PATCH 076/175] Bug 503814. iframe contents shifted slightly due to
 rounding issue. r+sr=roc

---
 gfx/public/nsCoord.h                             |  5 +++++
 gfx/public/nsRect.h                              | 12 ++++++------
 layout/reftests/pixel-rounding/iframe-1-ref.html |  6 ++++++
 layout/reftests/pixel-rounding/iframe-1.html     |  6 ++++++
 layout/reftests/pixel-rounding/reftest.list      |  2 ++
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 layout/reftests/pixel-rounding/iframe-1-ref.html
 create mode 100644 layout/reftests/pixel-rounding/iframe-1.html

diff --git a/gfx/public/nsCoord.h b/gfx/public/nsCoord.h
index 624aae165b8..eb28a240eb6 100644
--- a/gfx/public/nsCoord.h
+++ b/gfx/public/nsCoord.h
@@ -365,6 +365,11 @@ inline PRInt32 NSToIntRound(float aValue)
   return NS_lroundf(aValue);
 }
 
+inline PRInt32 NSToIntRoundUp(float aValue)
+{
+  return PRInt32(NS_floorf(aValue + 0.5f));
+}
+
 /* 
  * App Unit/Pixel conversions
  */
diff --git a/gfx/public/nsRect.h b/gfx/public/nsRect.h
index 9d523288b84..f6c7bb05897 100644
--- a/gfx/public/nsRect.h
+++ b/gfx/public/nsRect.h
@@ -324,12 +324,12 @@ inline nsIntRect
 nsRect::ToNearestPixels(nscoord aAppUnitsPerPixel) const
 {
   nsIntRect rect;
-  rect.x = NSToIntRound(NSAppUnitsToFloatPixels(x, float(aAppUnitsPerPixel)));
-  rect.y = NSToIntRound(NSAppUnitsToFloatPixels(y, float(aAppUnitsPerPixel)));
-  rect.width  = NSToIntRound(NSAppUnitsToFloatPixels(XMost(),
-                             float(aAppUnitsPerPixel))) - rect.x;
-  rect.height = NSToIntRound(NSAppUnitsToFloatPixels(YMost(),
-                             float(aAppUnitsPerPixel))) - rect.y;
+  rect.x = NSToIntRoundUp(NSAppUnitsToFloatPixels(x, float(aAppUnitsPerPixel)));
+  rect.y = NSToIntRoundUp(NSAppUnitsToFloatPixels(y, float(aAppUnitsPerPixel)));
+  rect.width  = NSToIntRoundUp(NSAppUnitsToFloatPixels(XMost(),
+                               float(aAppUnitsPerPixel))) - rect.x;
+  rect.height = NSToIntRoundUp(NSAppUnitsToFloatPixels(YMost(),
+                               float(aAppUnitsPerPixel))) - rect.y;
   return rect;
 }
 
diff --git a/layout/reftests/pixel-rounding/iframe-1-ref.html b/layout/reftests/pixel-rounding/iframe-1-ref.html
new file mode 100644
index 00000000000..bc38a6fffdf
--- /dev/null
+++ b/layout/reftests/pixel-rounding/iframe-1-ref.html
@@ -0,0 +1,6 @@
+<html>
+<body style="background-color: rgb(255,0,0)">
+<iframe style="position: fixed; top: 11" src="data:text/html,<body style='background-color: rgba(0,0,255,0.5)'>">
+</iframe>
+</body>
+</html>
diff --git a/layout/reftests/pixel-rounding/iframe-1.html b/layout/reftests/pixel-rounding/iframe-1.html
new file mode 100644
index 00000000000..c98f73cb378
--- /dev/null
+++ b/layout/reftests/pixel-rounding/iframe-1.html
@@ -0,0 +1,6 @@
+<html>
+<body style="background-color: rgb(255,0,0)">
+<iframe style="position: fixed; top: 10.5" src="data:text/html,<body style='background-color: rgba(0,0,255,0.5)'>">
+</iframe>
+</body>
+</html>
diff --git a/layout/reftests/pixel-rounding/reftest.list b/layout/reftests/pixel-rounding/reftest.list
index d32576127e0..eb76cfc8886 100644
--- a/layout/reftests/pixel-rounding/reftest.list
+++ b/layout/reftests/pixel-rounding/reftest.list
@@ -175,3 +175,5 @@ fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == background-image-tiling.html background
 != border-image-width-0.html border-image-width-10.html
 == border-image-width-4.html border-image-width-0.html
 == border-image-width-9.html border-image-width-0.html
+
+== iframe-1.html iframe-1-ref.html

From cf34b5b9a6a83606148bc067f3eb7ee4b9fa6707 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Wed, 29 Jul 2009 18:10:50 -0400
Subject: [PATCH 077/175] Bug 504269. background color of iframe not drawn on
 print. r+sr=roc

---
 layout/base/nsLayoutUtils.cpp | 24 ++++++++++++++++++------
 layout/style/ua.css           |  5 -----
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 985847a35fa..d04241d3b4c 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1083,12 +1083,24 @@ nsLayoutUtils::PaintFrame(nsIRenderingContext* aRenderingContext, nsIFrame* aFra
     }
   }
 
-  // For printing, this function is first called on an nsPageFrame, which
-  // creates a display list with a PageContent item. The PageContent item's
-  // paint function calls this function on the nsPageFrame's child which is
-  // an nsPageContentFrame. We only want to add the canvas background color
-  // item once, for the nsPageContentFrame.
-  if (NS_SUCCEEDED(rv) && aFrame->GetType() != nsGkAtoms::pageFrame) {
+  nsIAtom* frameType = aFrame->GetType();
+  // For the viewport frame in print preview/page layout we want to paint
+  // the grey background behind the page, not the canvas color.
+  if (frameType == nsGkAtoms::viewportFrame &&
+      aFrame->PresContext()->IsRootPaginatedDocument() &&
+      (aFrame->PresContext()->Type() == nsPresContext::eContext_PrintPreview ||
+       aFrame->PresContext()->Type() == nsPresContext::eContext_PageLayout)) {
+    nsRect bounds = nsRect(builder.ToReferenceFrame(aFrame),
+                           aFrame->GetSize());
+    rv = list.AppendNewToBottom(new (&builder) nsDisplaySolidColor(
+           aFrame, bounds, NS_RGB(115, 115, 115)));
+  } else if (frameType != nsGkAtoms::pageFrame) {
+    // For printing, this function is first called on an nsPageFrame, which
+    // creates a display list with a PageContent item. The PageContent item's
+    // paint function calls this function on the nsPageFrame's child which is
+    // an nsPageContentFrame. We only want to add the canvas background color
+    // item once, for the nsPageContentFrame.
+
     // Add the canvas background color.
     rv = aFrame->PresContext()->PresShell()->AddCanvasBackgroundColorItem(
            builder, list, aFrame, nsnull, aBackstop);
diff --git a/layout/style/ua.css b/layout/style/ua.css
index f7a1e07463d..e6cf8a45d21 100644
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -213,11 +213,6 @@
     cursor: default !important;
   }
 
-  *|*::-moz-viewport, *|*::-moz-viewport-scroll, *|*::-moz-canvas,
-  *|*::-moz-scrolled-canvas {
-    background-color: #737373 !important;
-  }
-
 }
 
 /* XML parse error reporting */

From cc9115ac643014584cf2543d867eced0e3351108 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Wed, 29 Jul 2009 18:11:26 -0500
Subject: [PATCH 078/175] Bug 499816 - Minimizing Firefox opens and gives focus
 to minimized Steam windows. (r=jmathies, sr=roc)

---
 widget/src/windows/nsWindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 1bad616d74a..d6976c8f08d 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -1415,9 +1415,9 @@ NS_IMETHODIMP nsWindow::SetSizeMode(PRInt32 aMode) {
       case nsSizeMode_Minimized :
         mode = sTrimOnMinimize ? SW_MINIMIZE : SW_SHOWMINIMIZED;
         if (!sTrimOnMinimize) {
-          // Find the next window that is visible and not minimized.
+          // Find the next window that is enabled, visible, and not minimized.
           HWND hwndBelow = ::GetNextWindow(mWnd, GW_HWNDNEXT);
-          while (hwndBelow && (!::IsWindowVisible(hwndBelow) ||
+          while (hwndBelow && (!::IsWindowEnabled(hwndBelow) || !::IsWindowVisible(hwndBelow) ||
                                ::IsIconic(hwndBelow))) {
             hwndBelow = ::GetNextWindow(hwndBelow, GW_HWNDNEXT);
           }

From 15b3d9fd2a4e8fabd0d02b72f1f6be4705d6b738 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Wed, 29 Jul 2009 16:24:14 -0700
Subject: [PATCH 079/175] Backed out changeset ab1686101bfb, pending orange
 investigation

--HG--
extra : rebase_source : ad872bd18b36237fcc450f5fdc61d6579b532518
---
 xpcom/io/nsWildCard.cpp | 471 ++++++++++++++++------------------------
 1 file changed, 185 insertions(+), 286 deletions(-)

diff --git a/xpcom/io/nsWildCard.cpp b/xpcom/io/nsWildCard.cpp
index 1aa82e0f70d..ff0ac240b5f 100644
--- a/xpcom/io/nsWildCard.cpp
+++ b/xpcom/io/nsWildCard.cpp
@@ -57,75 +57,73 @@
 
 template<class T>
 static int
-_valid_subexp(const T *expr, T stop1, T stop2)
+_valid_subexp(const T *expr, T stop)
 {
-    register int x;
-    int nsc = 0;     /* Number of special characters */
-    int np;          /* Number of pipe characters in union */
-    int tld = 0;     /* Number of tilde characters */
- 
-    for (x = 0; expr[x] && (expr[x] != stop1) && (expr[x] != stop2); ++x) {
+    register int x,y,t;
+    int nsc,np,tld;
+
+    x=0;nsc=0;tld=0;
+
+    while(expr[x] && (expr[x] != stop)) {
         switch(expr[x]) {
-        case '~':
-            if(tld)                 /* at most one exclusion */
-                return INVALID_SXP;
-            if (stop1)              /* no exclusions within unions */
-                return INVALID_SXP;
-            if (!expr[x+1])          /* exclusion cannot be last character */
-                return INVALID_SXP;
-            if (!x)                 /* exclusion cannot be first character */
-                return INVALID_SXP;
-            ++tld;
-            /* fall through */
-        case '*':
-        case '?':
-        case '$':
+          case '~':
+            if(tld) return INVALID_SXP;
+            else ++tld;
+          case '*':
+          case '?':
+          case '^':
+          case '$':
             ++nsc;
             break;
-        case '[':
+          case '[':
             ++nsc;
             if((!expr[++x]) || (expr[x] == ']'))
                 return INVALID_SXP;
-            for(; expr[x] && (expr[x] != ']'); ++x) {
-                if(expr[x] == '\\' && !expr[++x])
-                    return INVALID_SXP;
-            }
+            for(;expr[x] && (expr[x] != ']');++x)
+                if(expr[x] == '\\')
+                    if(!expr[++x])
+                        return INVALID_SXP;
             if(!expr[x])
                 return INVALID_SXP;
             break;
-        case '(':
-            ++nsc;
-            if (stop1)                  /* no nested unions */
-                return INVALID_SXP;
-            np = -1;
-            do {
-                int t = ::_valid_subexp(&expr[++x], T(')'), T('|'));
-                if(t == 0 || t == INVALID_SXP)
+          case '(':
+            ++nsc;np = 0;
+            while(1) {
+                if(expr[++x] == ')')
+                    return INVALID_SXP;
+                for(y=x;(expr[y]) && (expr[y] != '|') && (expr[y] != ')');++y)
+                    if(expr[y] == '\\')
+                        if(!expr[++y])
+                            return INVALID_SXP;
+                if(!expr[y])
+                    return INVALID_SXP;
+                if(expr[y] == '|')
+                    ++np;
+                t = ::_valid_subexp(&expr[x],expr[y]);
+                if(t == INVALID_SXP)
                     return INVALID_SXP;
                 x+=t;
-                if(!expr[x])
-                    return INVALID_SXP;
-                ++np;
-            } while (expr[x] == '|' );
-            if(np < 1)  /* must be at least one pipe */
-                return INVALID_SXP;
+                if(expr[x] == ')') {
+                    if(!np)
+                        return INVALID_SXP;
+                    break;
+                }
+            }
             break;
-        case ')':
-        case ']':
-        case '|':
+          case ')':
+          case ']':
             return INVALID_SXP;
-        case '\\':
-            ++nsc;
+          case '\\':
             if(!expr[++x])
                 return INVALID_SXP;
-            break;
-        default:
+          default:
             break;
         }
+        ++x;
     }
-    if((!stop1) && (!nsc)) /* must be at least one special character */
-         return NON_SXP;
-    return ((expr[x] == stop1 || expr[x] == stop2) ? x : INVALID_SXP);
+    if((!stop) && (!nsc))
+        return NON_SXP;
+    return ((expr[x] == stop) ? x : INVALID_SXP);
 }
 
 
@@ -133,7 +131,7 @@ template<class T>
 int
 NS_WildCardValid_(const T *expr)
 {
-    int x = ::_valid_subexp(expr, T('\0'), T('\0'));
+    int x = ::_valid_subexp(expr, T('\0'));
     return (x < 0 ? x : VALID_SXP);
 }
 
@@ -157,265 +155,166 @@ NS_WildCardValid(const PRUnichar *expr)
 #define ABORTED -1
 
 template<class T>
-static int
-_shexp_match(const T *str, const T *expr, PRBool case_insensitive, unsigned int level);
-
-/**
- * Count characters until we reach a NUL character or either of the
- * two delimiter characters, stop1 or stop2.  If we encounter a bracketed
- * expression, look only for NUL or ']' inside it.  Do not look for stop1
- * or stop2 inside it. Return ABORTED if bracketed expression is unterminated.
- * Handle all escaping.
- * Return index in input string of first stop found, or ABORTED if not found.
- * If "dest" is non-NULL, copy counted characters to it and NUL terminate.
- */
-template<class T>
-static int
-_scan_and_copy(const T *expr, T stop1, T stop2, T *dest)
-{
-    register int sx;     /* source index */
-    register char cc;
-
-    for (sx = 0; (cc = expr[sx]) && cc != stop1 && cc != stop2; sx++) {
-        if (cc == '\\') {
-            if (!expr[++sx])
-                return ABORTED; /* should be impossible */
-        }
-        else if (cc == '[') {
-            while ((cc = expr[++sx]) && cc != ']') {
-                if(cc == '\\' && !expr[++sx])
-                    return ABORTED;
-            }
-            if (!cc)
-                return ABORTED; /* should be impossible */
-        }
-    }
-    if (dest && sx) {
-        /* Copy all but the closing delimiter. */
-        memcpy(dest, expr, sx * sizeof(T));
-        dest[sx] = 0;
-    }
-    return cc ? sx : ABORTED; /* index of closing delimiter */
-}
-
-/* On input, expr[0] is the opening parenthesis of a union.
- * See if any of the alternatives in the union matches as a pattern.
- * The strategy is to take each of the alternatives, in turn, and append
- * the rest of the expression (after the closing ')' that marks the end of
- * this union) to that alternative, and then see if the resultant expression
- * matches the input string.  Repeat this until some alternative matches,
- * or we have an abort.
- */
-template<class T>
-static int
-_handle_union(const T *str, const T *expr, PRBool case_insensitive,
-              unsigned int level)
-{
-    register int sx;     /* source index */
-    int cp;              /* source index of closing parenthesis */
-    int count;
-    int ret   = NOMATCH;
-    T *e2;
-
-    /* Find the closing parenthesis that ends this union in the expression */
-    cp = ::_scan_and_copy(expr, T(')'), T('\0'), static_cast<T*>(NULL));
-    if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */
-        return ABORTED;
-    ++cp;                /* now index of char after closing parenthesis */
-    e2 = (T *) NS_Alloc(1 + nsCharTraits<T>::length(expr));
-    if (!e2)
-        return ABORTED;
-    for (sx = 1; ret == NOMATCH && expr[sx] && expr[sx] != ')'; ++sx) {
-        /* Here, expr[sx] is one character past the preceeding '(' or '|'. */
-        /* Copy everything up to the next delimiter to e2 */
-        count = ::_scan_and_copy(expr + sx, T(')'), T('|'), e2);
-        if (count == ABORTED || !count) {
-            ret = ABORTED;
-            break;
-        }
-        sx += count;
-        /* Append everything after closing parenthesis to e2. This is safe. */
-        nsCharTraits<T>::copy(e2 + count, expr + cp, nsCharTraits<T>::length(expr + cp) + 1);
-        ret = ::_shexp_match(str, e2, case_insensitive, level + 1);
-    }
-    NS_Free(e2);
-    if (sx < 2)
-        ret = ABORTED;
-    return ret;
-}
-
-/* returns 1 if val is in range from start..end, case insensitive. */
-static int
-_is_char_in_range(int start, int end, int val)
-{
-    char map[256];
-    memset(map, 0, sizeof map);
-    while (start <= end)
-        map[tolower(start++)] = 1;
-    return map[tolower(val)];
-}
+static int _shexp_match(const T *str, const T *expr, PRBool case_insensitive);
 
 template<class T>
 static int
-_shexp_match(const T *str, const T *expr, PRBool case_insensitive,
-             unsigned int level)
+_handle_union(const T *str, const T *expr, PRBool case_insensitive)
 {
-    register int x;   /* input string index */
-    register int y;   /* expression index */
-    int ret,neg;
+    T *e2 = (T *) NS_Alloc(sizeof(T)*nsCharTraits<T>::length(expr));
+    register int t,p2,p1 = 1;
+    int cp;
 
-    if (level > 20)      /* Don't let the stack get too deep. */
-        return ABORTED;
-    for(x = 0, y = 0; expr[y]; ++y, ++x) {
-        if((!str[x]) && (expr[y] != '$') && (expr[y] != '*')) {
+    while(1) {
+        for(cp=1;expr[cp] != ')';cp++)
+            if(expr[cp] == '\\')
+                ++cp;
+        for(p2 = 0;(expr[p1] != '|') && (p1 != cp);p1++,p2++) {
+            if(expr[p1] == '\\')
+                e2[p2++] = expr[p1++];
+            e2[p2] = expr[p1];
+        }
+        for (t=cp+1; ((e2[p2] = expr[t]) != 0); ++t,++p2) {}
+        if(::_shexp_match(str,e2, case_insensitive) == MATCH) {
+            NS_Free(e2);
+            return MATCH;
+        }
+        if(p1 == cp) {
+            NS_Free(e2);
             return NOMATCH;
         }
-        switch(expr[y]) {
-        case '$':
-            if(str[x])
-                return NOMATCH;
-            --x;                 /* we don't want loop to increment x */
-            break;
-        case '*':
-            while(expr[++y] == '*'){}
-            if(!expr[y])
-                return MATCH;
-            while(str[x]) {
-                ret = ::_shexp_match(&str[x++], &expr[y], case_insensitive,
-                                     level + 1);
-                switch(ret) {
-                case NOMATCH:
-                    continue;
-                case ABORTED:
-                    return ABORTED;
-                default:
-                    return MATCH;
-                }
-            }
-            if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
-                return MATCH;
-            else
-                return NOMATCH;
-        case '[': {
-            T start, end = 0;
-            int i;
-            neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
-            if (neg)
-                ++y;
-            i = y;
-            start = expr[i++];
-            if (start == '\\')
-                start = expr[i++];
-            if (isalnum(int(start)) && expr[i++] == '-') {
-                end = expr[i++];
-                if (end == '\\')
-                    end = expr[i++];
-            }
-            if (isalnum(int(end)) && expr[i] == ']') {
-                /* This is a range form: a-b */
-                T val = str[x];
-                if (end < start) { /* swap them */
-                    T tmp = end;
-                    end = start;
-                    start = tmp;
-                }
-                if (case_insensitive && isalpha(int(val))) {
-                    val = ::_is_char_in_range(int(start), int(end), int(val));
-                    if (neg == val)
-                        return NOMATCH;
-                }
-                else if (neg != ((val < start) || (val > end))) {
-                    return NOMATCH;
-                }
-                y = i;
-            }
-            else {
-                /* Not range form */
-                int matched = 0;
-                for (; expr[y] != ']'; y++) {
-                    if (expr[y] == '\\')
-                        ++y;
-                    if(case_insensitive)
-                        matched |= (toupper(int(str[x])) == toupper(int(expr[y])));
-                    else
-                        matched |= (str[x] == expr[y]);
-                }
-                if (neg == matched)
-                    return NOMATCH;
-            }
-        }
-        break;
-        case '(':
-            if (!expr[y+1])
-                return ABORTED;
-            return ::_handle_union(&str[x], &expr[y], case_insensitive, level + 1);
-        case '?':
-            break;
-        case ')':
-        case ']':
-        case '|':
-            return ABORTED;
-        case '\\':
-            ++y;
-            /* fall through */
-        default:
-            if(case_insensitive) {
-                if(toupper(int(str[x])) != toupper(int(expr[y])))
-                    return NOMATCH;
-            }
-            else {
-                if(str[x] != expr[y])
-                    return NOMATCH;
-            }
-            break;
-        }
+        else ++p1;
     }
-    return (str[x] ? NOMATCH : MATCH);
 }
 
 
 template<class T>
 static int
-ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive)
+_shexp_match(const T *str, const T *expr, PRBool case_insensitive)
 {
-    T *expr = NULL;
-    int x, ret = MATCH;
+    register int x,y;
+    int ret,neg;
 
-    if (!nsCharTraits<T>::find(xp, nsCharTraits<T>::length(xp), T('~')))
-        return _shexp_match(str, xp, case_insensitive, 0);
+    ret = 0;
+    for(x=0,y=0;expr[y];++y,++x) {
+        if((!str[x]) && (expr[y] != '(') && (expr[y] != '$') && (expr[y] != '*'))
+            ret = ABORTED;
+        else {
+            switch(expr[y]) {
+              case '$':
+                if( (str[x]) )
+                    ret = NOMATCH;
+                else
+                    --x;             /* we don't want loop to increment x */
+                break;
+              case '*':
+                while(expr[++y] == '*'){}
+                if(!expr[y])
+                    return MATCH;
+                while(str[x]) {
+                    switch(::_shexp_match(&str[x++],&expr[y], case_insensitive)) {
+                      case NOMATCH:
+                        continue;
+                      case ABORTED:
+                        ret = ABORTED;
+                        break;
+                      default:
+                        return MATCH;
+                    }
+                    break;
+                }
+                if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
+                    return MATCH;
+                else
+                    ret = ABORTED;
+                break;
+              case '[':
+                neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
+                if (neg)
+                    ++y;
 
-    expr = (T *) NS_Alloc(nsCharTraits<T>::length(xp) + 1);
-    if(!expr)
-        return NOMATCH;
+                if ((isalnum(expr[y])) && (expr[y+1] == '-') &&
+                   (isalnum(expr[y+2])) && (expr[y+3] == ']'))
+                    {
+                        int start = expr[y], end = expr[y+2];
 
-    x = ::_scan_and_copy(expr, T('~'), T('\0'), static_cast<T*>(NULL));
-    if (x != ABORTED && expr[x] == '~') {
-        expr[x++] = '\0';
-        ret = ::_shexp_match(str, &expr[x], case_insensitive, 0);
-        switch (ret) {
-        case NOMATCH: ret = MATCH;   break;
-        case MATCH:   ret = NOMATCH; break;
-        default:                     break;
+                        /* Droolproofing for pinheads not included */
+                        if(neg ^ ((str[x] < start) || (str[x] > end))) {
+                            ret = NOMATCH;
+                            break;
+                        }
+                        y+=3;
+                    }
+                else {
+                    int matched;
+
+                    for (matched=0;expr[y] != ']';y++) {
+                        /* match an escaped ']' character */
+                        if('\\' == expr[y] && ']' == expr[y+1]) {
+                            if(']' == str[x])
+                                matched |= 1;
+                            y++; /* move an extra char to compensate for '\\' */
+                            continue;
+                        }
+                        matched |= (str[x] == expr[y]);
+                    }
+                    if (neg ^ (!matched))
+                        ret = NOMATCH;
+                }
+                break;
+              case '(':
+                return ::_handle_union(&str[x],&expr[y], case_insensitive);
+                break;
+              case '?':
+                break;
+              case '\\':
+                ++y;
+              default:
+                if(case_insensitive)
+                  {
+                    if(toupper(str[x]) != toupper(expr[y]))
+                        ret = NOMATCH;
+                  }
+                else
+                  {
+                    if(str[x] != expr[y])
+                        ret = NOMATCH;
+                  }
+                break;
+            }
         }
+        if(ret)
+            break;
     }
-    if (ret == MATCH)
-        ret = ::_shexp_match(str, expr, case_insensitive, 0);
-
-    NS_Free(expr);
-    return ret;
+    return (ret ? ret : (str[x] ? NOMATCH : MATCH));
 }
 
+
 template<class T>
-NS_COM int
-NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive)
+int
+NS_WildCardMatch_(const T *str, const T *xp, PRBool case_insensitive)
 {
-    int is_valid = NS_WildCardValid(expr);
-    switch(is_valid) {
-        case INVALID_SXP:
-            return -1;
-        default:
-            return ns_WildCardMatch(str, expr, case_insensitive);
+    T *expr = NS_strdup(xp);
+
+    if(!expr)
+        return 1;
+
+    for(int x=nsCharTraits<T>::length(expr)-1;x;--x) {
+        if((expr[x] == '~') && (expr[x-1] != '\\')) {
+            expr[x] = '\0';
+            if(::_shexp_match(str,&expr[++x], case_insensitive) == MATCH)
+                goto punt;
+            break;
+        }
     }
+    if(::_shexp_match(str,expr, case_insensitive) == MATCH) {
+        NS_Free(expr);
+        return 0;
+    }
+
+  punt:
+    NS_Free(expr);
+    return 1;
 }
 
 NS_COM int

From 473bf742cd33fc3b8f7c59cac0179c3473e8c3ae Mon Sep 17 00:00:00 2001
From: Nelson Bolyard <nelson@bolyard.me>
Date: Wed, 29 Jul 2009 14:07:45 -0700
Subject: [PATCH 080/175] Bug 332173 - Problems with regexp parsing of '~' in
 nsIZipReader.findEntries (and other nsWildCard uses).  r=jwalden, a=ss

---
 xpcom/io/nsWildCard.cpp | 451 ++++++++++++++++++++++++----------------
 1 file changed, 277 insertions(+), 174 deletions(-)

diff --git a/xpcom/io/nsWildCard.cpp b/xpcom/io/nsWildCard.cpp
index ff0ac240b5f..90f3d718178 100644
--- a/xpcom/io/nsWildCard.cpp
+++ b/xpcom/io/nsWildCard.cpp
@@ -57,73 +57,75 @@
 
 template<class T>
 static int
-_valid_subexp(const T *expr, T stop)
+_valid_subexp(const T *expr, T stop1, T stop2)
 {
-    register int x,y,t;
-    int nsc,np,tld;
-
-    x=0;nsc=0;tld=0;
-
-    while(expr[x] && (expr[x] != stop)) {
+    register int x;
+    int nsc = 0;     /* Number of special characters */
+    int np;          /* Number of pipe characters in union */
+    int tld = 0;     /* Number of tilde characters */
+ 
+    for (x = 0; expr[x] && (expr[x] != stop1) && (expr[x] != stop2); ++x) {
         switch(expr[x]) {
-          case '~':
-            if(tld) return INVALID_SXP;
-            else ++tld;
-          case '*':
-          case '?':
-          case '^':
-          case '$':
+        case '~':
+            if(tld)                 /* at most one exclusion */
+                return INVALID_SXP;
+            if (stop1)              /* no exclusions within unions */
+                return INVALID_SXP;
+            if (!expr[x+1])          /* exclusion cannot be last character */
+                return INVALID_SXP;
+            if (!x)                 /* exclusion cannot be first character */
+                return INVALID_SXP;
+            ++tld;
+            /* fall through */
+        case '*':
+        case '?':
+        case '$':
             ++nsc;
             break;
-          case '[':
+        case '[':
             ++nsc;
             if((!expr[++x]) || (expr[x] == ']'))
                 return INVALID_SXP;
-            for(;expr[x] && (expr[x] != ']');++x)
-                if(expr[x] == '\\')
-                    if(!expr[++x])
-                        return INVALID_SXP;
+            for(; expr[x] && (expr[x] != ']'); ++x) {
+                if(expr[x] == '\\' && !expr[++x])
+                    return INVALID_SXP;
+            }
             if(!expr[x])
                 return INVALID_SXP;
             break;
-          case '(':
-            ++nsc;np = 0;
-            while(1) {
-                if(expr[++x] == ')')
-                    return INVALID_SXP;
-                for(y=x;(expr[y]) && (expr[y] != '|') && (expr[y] != ')');++y)
-                    if(expr[y] == '\\')
-                        if(!expr[++y])
-                            return INVALID_SXP;
-                if(!expr[y])
-                    return INVALID_SXP;
-                if(expr[y] == '|')
-                    ++np;
-                t = ::_valid_subexp(&expr[x],expr[y]);
-                if(t == INVALID_SXP)
+        case '(':
+            ++nsc;
+            if (stop1)                  /* no nested unions */
+                return INVALID_SXP;
+            np = -1;
+            do {
+                int t = ::_valid_subexp(&expr[++x], T(')'), T('|'));
+                if(t == 0 || t == INVALID_SXP)
                     return INVALID_SXP;
                 x+=t;
-                if(expr[x] == ')') {
-                    if(!np)
-                        return INVALID_SXP;
-                    break;
-                }
-            }
+                if(!expr[x])
+                    return INVALID_SXP;
+                ++np;
+            } while (expr[x] == '|' );
+            if(np < 1)  /* must be at least one pipe */
+                return INVALID_SXP;
             break;
-          case ')':
-          case ']':
+        case ')':
+        case ']':
+        case '|':
             return INVALID_SXP;
-          case '\\':
+        case '\\':
+            ++nsc;
             if(!expr[++x])
                 return INVALID_SXP;
-          default:
+            break;
+        default:
             break;
         }
-        ++x;
     }
-    if((!stop) && (!nsc))
-        return NON_SXP;
-    return ((expr[x] == stop) ? x : INVALID_SXP);
+    if((!stop1) && (!nsc)) /* must be at least one special character */
+         return NON_SXP;
+    return ((expr[x] == stop1 || expr[x] == stop2) ? x : INVALID_SXP);
 }
 
 
@@ -131,7 +133,7 @@ template<class T>
 int
 NS_WildCardValid_(const T *expr)
 {
-    int x = ::_valid_subexp(expr, T('\0'));
+    int x = ::_valid_subexp(expr, T('\0'), T('\0'));
     return (x < 0 ? x : VALID_SXP);
 }
 
@@ -155,166 +157,267 @@ NS_WildCardValid(const PRUnichar *expr)
 #define ABORTED -1
 
 template<class T>
-static int _shexp_match(const T *str, const T *expr, PRBool case_insensitive);
+static int
+_shexp_match(const T *str, const T *expr, PRBool case_insensitive, unsigned int level);
 
+/**
+ * Count characters until we reach a NUL character or either of the
+ * two delimiter characters, stop1 or stop2.  If we encounter a bracketed
+ * expression, look only for NUL or ']' inside it.  Do not look for stop1
+ * or stop2 inside it. Return ABORTED if bracketed expression is unterminated.
+ * Handle all escaping.
+ * Return index in input string of first stop found, or ABORTED if not found.
+ * If "dest" is non-NULL, copy counted characters to it and NUL terminate.
+ */
 template<class T>
 static int
-_handle_union(const T *str, const T *expr, PRBool case_insensitive)
+_scan_and_copy(const T *expr, T stop1, T stop2, T *dest)
 {
-    T *e2 = (T *) NS_Alloc(sizeof(T)*nsCharTraits<T>::length(expr));
-    register int t,p2,p1 = 1;
-    int cp;
+    register int sx;     /* source index */
+    register char cc;
 
-    while(1) {
-        for(cp=1;expr[cp] != ')';cp++)
-            if(expr[cp] == '\\')
-                ++cp;
-        for(p2 = 0;(expr[p1] != '|') && (p1 != cp);p1++,p2++) {
-            if(expr[p1] == '\\')
-                e2[p2++] = expr[p1++];
-            e2[p2] = expr[p1];
+    for (sx = 0; (cc = expr[sx]) && cc != stop1 && cc != stop2; sx++) {
+        if (cc == '\\') {
+            if (!expr[++sx])
+                return ABORTED; /* should be impossible */
         }
-        for (t=cp+1; ((e2[p2] = expr[t]) != 0); ++t,++p2) {}
-        if(::_shexp_match(str,e2, case_insensitive) == MATCH) {
-            NS_Free(e2);
-            return MATCH;
+        else if (cc == '[') {
+            while ((cc = expr[++sx]) && cc != ']') {
+                if(cc == '\\' && !expr[++sx])
+                    return ABORTED;
+            }
+            if (!cc)
+                return ABORTED; /* should be impossible */
         }
-        if(p1 == cp) {
-            NS_Free(e2);
-            return NOMATCH;
-        }
-        else ++p1;
     }
+    if (dest && sx) {
+        /* Copy all but the closing delimiter. */
+        memcpy(dest, expr, sx * sizeof(T));
+        dest[sx] = 0;
+    }
+    return cc ? sx : ABORTED; /* index of closing delimiter */
 }
 
+/* On input, expr[0] is the opening parenthesis of a union.
+ * See if any of the alternatives in the union matches as a pattern.
+ * The strategy is to take each of the alternatives, in turn, and append
+ * the rest of the expression (after the closing ')' that marks the end of
+ * this union) to that alternative, and then see if the resultant expression
+ * matches the input string.  Repeat this until some alternative matches,
+ * or we have an abort.
+ */
+template<class T>
+static int
+_handle_union(const T *str, const T *expr, PRBool case_insensitive,
+              unsigned int level)
+{
+    register int sx;     /* source index */
+    int cp;              /* source index of closing parenthesis */
+    int count;
+    int ret   = NOMATCH;
+    T *e2;
+
+    /* Find the closing parenthesis that ends this union in the expression */
+    cp = ::_scan_and_copy(expr, T(')'), T('\0'), static_cast<T*>(NULL));
+    if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */
+        return ABORTED;
+    ++cp;                /* now index of char after closing parenthesis */
+    e2 = (T *) NS_Alloc(1 + nsCharTraits<T>::length(expr));
+    if (!e2)
+        return ABORTED;
+    for (sx = 1; ; ++sx) {
+        /* Here, expr[sx] is one character past the preceeding '(' or '|'. */
+        /* Copy everything up to the next delimiter to e2 */
+        count = ::_scan_and_copy(expr + sx, T(')'), T('|'), e2);
+        if (count == ABORTED || !count) {
+            ret = ABORTED;
+            break;
+        }
+        sx += count;
+        /* Append everything after closing parenthesis to e2. This is safe. */
+        nsCharTraits<T>::copy(e2 + count, expr + cp, nsCharTraits<T>::length(expr + cp) + 1);
+        ret = ::_shexp_match(str, e2, case_insensitive, level + 1);
+        if (ret != NOMATCH || !expr[sx] || expr[sx] == ')')
+            break;
+    }
+    NS_Free(e2);
+    if (sx < 2)
+        ret = ABORTED;
+    return ret;
+}
+
+/* returns 1 if val is in range from start..end, case insensitive. */
+static int
+_is_char_in_range(int start, int end, int val)
+{
+    char map[256];
+    memset(map, 0, sizeof map);
+    while (start <= end)
+        map[tolower(start++)] = 1;
+    return map[tolower(val)];
+}
 
 template<class T>
 static int
-_shexp_match(const T *str, const T *expr, PRBool case_insensitive)
+_shexp_match(const T *str, const T *expr, PRBool case_insensitive,
+             unsigned int level)
 {
-    register int x,y;
+    register int x;   /* input string index */
+    register int y;   /* expression index */
     int ret,neg;
 
-    ret = 0;
-    for(x=0,y=0;expr[y];++y,++x) {
-        if((!str[x]) && (expr[y] != '(') && (expr[y] != '$') && (expr[y] != '*'))
-            ret = ABORTED;
-        else {
-            switch(expr[y]) {
-              case '$':
-                if( (str[x]) )
-                    ret = NOMATCH;
-                else
-                    --x;             /* we don't want loop to increment x */
-                break;
-              case '*':
-                while(expr[++y] == '*'){}
-                if(!expr[y])
+    if (level > 20)      /* Don't let the stack get too deep. */
+        return ABORTED;
+    for(x = 0, y = 0; expr[y]; ++y, ++x) {
+        if((!str[x]) && (expr[y] != '$') && (expr[y] != '*')) {
+            return NOMATCH;
+        }
+        switch(expr[y]) {
+        case '$':
+            if(str[x])
+                return NOMATCH;
+            --x;                 /* we don't want loop to increment x */
+            break;
+        case '*':
+            while(expr[++y] == '*'){}
+            if(!expr[y])
+                return MATCH;
+            while(str[x]) {
+                ret = ::_shexp_match(&str[x++], &expr[y], case_insensitive,
+                                     level + 1);
+                switch(ret) {
+                case NOMATCH:
+                    continue;
+                case ABORTED:
+                    return ABORTED;
+                default:
                     return MATCH;
-                while(str[x]) {
-                    switch(::_shexp_match(&str[x++],&expr[y], case_insensitive)) {
-                      case NOMATCH:
-                        continue;
-                      case ABORTED:
-                        ret = ABORTED;
-                        break;
-                      default:
-                        return MATCH;
-                    }
-                    break;
                 }
-                if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
-                    return MATCH;
-                else
-                    ret = ABORTED;
-                break;
-              case '[':
-                neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
-                if (neg)
-                    ++y;
-
-                if ((isalnum(expr[y])) && (expr[y+1] == '-') &&
-                   (isalnum(expr[y+2])) && (expr[y+3] == ']'))
-                    {
-                        int start = expr[y], end = expr[y+2];
-
-                        /* Droolproofing for pinheads not included */
-                        if(neg ^ ((str[x] < start) || (str[x] > end))) {
-                            ret = NOMATCH;
-                            break;
-                        }
-                        y+=3;
-                    }
-                else {
-                    int matched;
-
-                    for (matched=0;expr[y] != ']';y++) {
-                        /* match an escaped ']' character */
-                        if('\\' == expr[y] && ']' == expr[y+1]) {
-                            if(']' == str[x])
-                                matched |= 1;
-                            y++; /* move an extra char to compensate for '\\' */
-                            continue;
-                        }
-                        matched |= (str[x] == expr[y]);
-                    }
-                    if (neg ^ (!matched))
-                        ret = NOMATCH;
-                }
-                break;
-              case '(':
-                return ::_handle_union(&str[x],&expr[y], case_insensitive);
-                break;
-              case '?':
-                break;
-              case '\\':
+            }
+            if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
+                return MATCH;
+            else
+                return NOMATCH;
+        case '[': {
+            T start, end = 0;
+            int i;
+            neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
+            if (neg)
                 ++y;
-              default:
-                if(case_insensitive)
-                  {
-                    if(toupper(str[x]) != toupper(expr[y]))
-                        ret = NOMATCH;
-                  }
-                else
-                  {
-                    if(str[x] != expr[y])
-                        ret = NOMATCH;
-                  }
-                break;
+            i = y;
+            start = expr[i++];
+            if (start == '\\')
+                start = expr[i++];
+            if (isalnum(int(start)) && expr[i++] == '-') {
+                end = expr[i++];
+                if (end == '\\')
+                    end = expr[i++];
+            }
+            if (isalnum(int(end)) && expr[i] == ']') {
+                /* This is a range form: a-b */
+                T val = str[x];
+                if (end < start) { /* swap them */
+                    T tmp = end;
+                    end = start;
+                    start = tmp;
+                }
+                if (case_insensitive && isalpha(int(val))) {
+                    val = ::_is_char_in_range(int(start), int(end), int(val));
+                    if (neg == val)
+                        return NOMATCH;
+                }
+                else if (neg != ((val < start) || (val > end))) {
+                    return NOMATCH;
+                }
+                y = i;
+            }
+            else {
+                /* Not range form */
+                int matched = 0;
+                for (; expr[y] != ']'; y++) {
+                    if (expr[y] == '\\')
+                        ++y;
+                    if(case_insensitive)
+                        matched |= (toupper(int(str[x])) == toupper(int(expr[y])));
+                    else
+                        matched |= (str[x] == expr[y]);
+                }
+                if (neg == matched)
+                    return NOMATCH;
             }
         }
-        if(ret)
+        break;
+        case '(':
+            if (!expr[y+1])
+                return ABORTED;
+            return ::_handle_union(&str[x], &expr[y], case_insensitive, level + 1);
+        case '?':
             break;
+        case ')':
+        case ']':
+        case '|':
+            return ABORTED;
+        case '\\':
+            ++y;
+            /* fall through */
+        default:
+            if(case_insensitive) {
+                if(toupper(int(str[x])) != toupper(int(expr[y])))
+                    return NOMATCH;
+            }
+            else {
+                if(str[x] != expr[y])
+                    return NOMATCH;
+            }
+            break;
+        }
     }
-    return (ret ? ret : (str[x] ? NOMATCH : MATCH));
+    return (str[x] ? NOMATCH : MATCH);
 }
 
 
 template<class T>
-int
-NS_WildCardMatch_(const T *str, const T *xp, PRBool case_insensitive)
+static int
+ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive)
 {
-    T *expr = NS_strdup(xp);
+    T *expr = NULL;
+    int x, ret = MATCH;
 
+    if (!nsCharTraits<T>::find(xp, nsCharTraits<T>::length(xp), T('~')))
+        return _shexp_match(str, xp, case_insensitive, 0);
+
+    expr = (T *) NS_Alloc(nsCharTraits<T>::length(xp) + 1);
     if(!expr)
-        return 1;
+        return NOMATCH;
 
-    for(int x=nsCharTraits<T>::length(expr)-1;x;--x) {
-        if((expr[x] == '~') && (expr[x-1] != '\\')) {
-            expr[x] = '\0';
-            if(::_shexp_match(str,&expr[++x], case_insensitive) == MATCH)
-                goto punt;
-            break;
+    x = ::_scan_and_copy(expr, T('~'), T('\0'), static_cast<T*>(NULL));
+    if (x != ABORTED && expr[x] == '~') {
+        expr[x++] = '\0';
+        ret = ::_shexp_match(str, &expr[x], case_insensitive, 0);
+        switch (ret) {
+        case NOMATCH: ret = MATCH;   break;
+        case MATCH:   ret = NOMATCH; break;
+        default:                     break;
         }
     }
-    if(::_shexp_match(str,expr, case_insensitive) == MATCH) {
-        NS_Free(expr);
-        return 0;
-    }
+    if (ret == MATCH)
+        ret = ::_shexp_match(str, expr, case_insensitive, 0);
 
-  punt:
     NS_Free(expr);
-    return 1;
+    return ret;
+}
+
+template<class T>
+NS_COM int
+NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive)
+{
+    int is_valid = NS_WildCardValid(expr);
+    switch(is_valid) {
+        case INVALID_SXP:
+            return -1;
+        default:
+            return ns_WildCardMatch(str, expr, case_insensitive);
+    }
 }
 
 NS_COM int

From d5d76dcf776758b0cde8b9b88c910cb012af559e Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Wed, 29 Jul 2009 17:24:50 -0700
Subject: [PATCH 081/175] Bug 506805 - Remove locking in AsyncExecuteStatements
 This removes the use of the shared mutex in AsyncExecuteStatements.  We now
 rely on PR_AtomicSet and the volatile keyword.  This results in zero lock
 contention between the calling thread and the background thread if cancel is
 ever called. r=asuth r=bent sr=vlad

---
 .../public/mozIStoragePendingStatement.idl    |   6 +-
 .../src/mozStorageAsyncStatementExecution.cpp | 102 ++++--------------
 .../src/mozStorageAsyncStatementExecution.h   |  39 ++-----
 storage/src/mozStorageConnection.cpp          |   3 +-
 storage/src/mozStorageConnection.h            |   8 --
 .../test/unit/test_statement_executeAsync.js  |  20 ++--
 6 files changed, 44 insertions(+), 134 deletions(-)

diff --git a/storage/public/mozIStoragePendingStatement.idl b/storage/public/mozIStoragePendingStatement.idl
index d2c74ec2177..be9d34f94a6 100644
--- a/storage/public/mozIStoragePendingStatement.idl
+++ b/storage/public/mozIStoragePendingStatement.idl
@@ -39,7 +39,7 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(fc3c5fdc-9a87-4757-b01f-4ace2670a3a0)]
+[scriptable, uuid(00da7d20-3768-4398-bedc-e310c324b3f0)]
 interface mozIStoragePendingStatement : nsISupports {
 
   /**
@@ -48,8 +48,6 @@ interface mozIStoragePendingStatement : nsISupports {
    *
    * @note For read statements (such as SELECT), you will no longer receive any
    *       notifications about results once cancel is called.
-   *
-   * @returns true if canceled successfully, false otherwise.
    */
-   boolean cancel();
+   void cancel();
 };
diff --git a/storage/src/mozStorageAsyncStatementExecution.cpp b/storage/src/mozStorageAsyncStatementExecution.cpp
index 2e1b2d51a7f..e1a3e4bdc39 100644
--- a/storage/src/mozStorageAsyncStatementExecution.cpp
+++ b/storage/src/mozStorageAsyncStatementExecution.cpp
@@ -205,8 +205,7 @@ AsyncExecuteStatements::AsyncExecuteStatements(StatementDataArray &aStatements,
 , mMaxWait(TimeDuration::FromMilliseconds(MAX_MILLISECONDS_BETWEEN_RESULTS))
 , mIntervalStart(TimeStamp::Now())
 , mState(PENDING)
-, mCancelRequested(PR_FALSE)
-, mMutex(aConnection->sharedAsyncExecutionMutex)
+, mCancelRequested(0)
 {
   (void)mStatements.SwapElements(aStatements);
   NS_ASSERTION(mStatements.Length(), "We weren't given any statements!");
@@ -222,9 +221,6 @@ AsyncExecuteStatements::shouldNotify()
   NS_ASSERTION(onCallingThread, "runEvent not running on the calling thread!");
 #endif
 
-  // We do not need to acquire mMutex here because it can only ever be written
-  // to on the calling thread, and the only thread that can call us is the
-  // calling thread, so we know that our access is serialized.
   return !mCancelRequested;
 }
 
@@ -232,8 +228,6 @@ bool
 AsyncExecuteStatements::bindExecuteAndProcessStatement(StatementData &aData,
                                                        bool aLastStatement)
 {
-  mMutex.AssertNotCurrentThreadOwns();
-
   sqlite3_stmt *stmt(aData);
   BindingParamsArray *paramsArray(aData);
 
@@ -247,10 +241,7 @@ AsyncExecuteStatements::bindExecuteAndProcessStatement(StatementData &aData,
     error = (*itr)->bind(stmt);
     if (error) {
       // Set our error state.
-      {
-        MutexAutoLock mutex(mMutex);
-        mState = ERROR;
-      }
+      (void)::PR_AtomicSet(const_cast<PRInt32 *>(&mState), ERROR);
 
       // And notify.
       (void)notifyError(error);
@@ -273,13 +264,6 @@ bool
 AsyncExecuteStatements::executeAndProcessStatement(sqlite3_stmt *aStatement,
                                                    bool aLastStatement)
 {
-  mMutex.AssertNotCurrentThreadOwns();
-
-  // We need to hold the mutex for statement execution so we can properly
-  // reflect state in case we are canceled.  We release the mutex in a few areas
-  // in order to allow for cancelation to occur.
-  MutexAutoLock lockedScope(mMutex);
-
   // Execute our statement
   bool hasResults;
   do {
@@ -291,7 +275,7 @@ AsyncExecuteStatements::executeAndProcessStatement(sqlite3_stmt *aStatement,
 
     // If we have been canceled, there is no point in going on...
     if (mCancelRequested) {
-      mState = CANCELED;
+      (void)::PR_AtomicSet(const_cast<PRInt32 *>(&mState), CANCELED);
       return false;
     }
 
@@ -300,16 +284,11 @@ AsyncExecuteStatements::executeAndProcessStatement(sqlite3_stmt *aStatement,
     if (mCallback && hasResults &&
         NS_FAILED(buildAndNotifyResults(aStatement))) {
       // We had an error notifying, so we notify on error and stop processing.
-      mState = ERROR;
+      (void)::PR_AtomicSet(const_cast<PRInt32 *>(&mState), ERROR);
 
-      {
-        // Drop our mutex because notifyError doesn't want it held.
-        MutexAutoUnlock unlockedScope(mMutex);
-
-        // Notify, and stop processing statements.
-        (void)notifyError(mozIStorageError::ERROR,
-                          "An error occurred while notifying about results");
-      }
+      // Notify, and stop processing statements.
+      (void)notifyError(mozIStorageError::ERROR,
+                        "An error occurred while notifying about results");
 
       return false;
     }
@@ -320,11 +299,9 @@ AsyncExecuteStatements::executeAndProcessStatement(sqlite3_stmt *aStatement,
   checkAndLogStatementPerformance(aStatement);
 #endif
 
-  // If we are done, we need to set our state accordingly while we still hold
-  // our mutex.  We would have already returned if we were canceled or had
-  // an error at this point.
+  // If we are done, we need to set our state accordingly.
   if (aLastStatement)
-    mState = COMPLETED;
+    (void)::PR_AtomicSet(const_cast<PRInt32 *>(&mState), COMPLETED);
 
   return true;
 }
@@ -332,8 +309,6 @@ AsyncExecuteStatements::executeAndProcessStatement(sqlite3_stmt *aStatement,
 bool
 AsyncExecuteStatements::executeStatement(sqlite3_stmt *aStatement)
 {
-  mMutex.AssertCurrentThreadOwns();
-
   while (true) {
     int rc = ::sqlite3_step(aStatement);
     // Stop if we have no more results.
@@ -346,25 +321,17 @@ AsyncExecuteStatements::executeStatement(sqlite3_stmt *aStatement)
 
     // Some errors are not fatal, and we can handle them and continue.
     if (rc == SQLITE_BUSY) {
-      // We do not want to hold our mutex while we yield.
-      MutexAutoUnlock cancelationScope(mMutex);
-
       // Yield, and try again
       (void)::PR_Sleep(PR_INTERVAL_NO_WAIT);
       continue;
     }
 
     // Set an error state.
-    mState = ERROR;
+    (void)::PR_AtomicSet(const_cast<PRInt32 *>(&mState), ERROR);
 
-    {
-      // Drop our mutex because notifyError doesn't want it held.
-      MutexAutoUnlock unlockedScope(mMutex);
-
-      // And notify.
-      sqlite3 *db = ::sqlite3_db_handle(aStatement);
-      (void)notifyError(rc, ::sqlite3_errmsg(db));
-    }
+    // And notify.
+    sqlite3 *db = ::sqlite3_db_handle(aStatement);
+    (void)notifyError(rc, ::sqlite3_errmsg(db));
 
     // Finally, indicate that we should stop processing.
     return false;
@@ -375,12 +342,6 @@ nsresult
 AsyncExecuteStatements::buildAndNotifyResults(sqlite3_stmt *aStatement)
 {
   NS_ASSERTION(mCallback, "Trying to dispatch results without a callback!");
-  mMutex.AssertCurrentThreadOwns();
-
-  // At this point, it is safe to not hold the mutex and allow for cancelation.
-  // We may add an event to the calling thread, but that thread will not end
-  // up running when it checks back with us to see if it should run.
-  MutexAutoUnlock cancelationScope(mMutex);
 
   // Build result object if we need it.
   if (!mResultSet)
@@ -417,7 +378,6 @@ AsyncExecuteStatements::buildAndNotifyResults(sqlite3_stmt *aStatement)
 nsresult
 AsyncExecuteStatements::notifyComplete()
 {
-  mMutex.AssertNotCurrentThreadOwns();
   NS_ASSERTION(mState != PENDING,
                "Still in a pending state when calling Complete!");
 
@@ -432,7 +392,7 @@ AsyncExecuteStatements::notifyComplete()
     if (mState == COMPLETED) {
       nsresult rv = mTransactionManager->Commit();
       if (NS_FAILED(rv)) {
-        mState = ERROR;
+        (void)::PR_AtomicSet(const_cast<PRInt32 *>(&mState), ERROR);
         (void)notifyError(mozIStorageError::ERROR,
                           "Transaction failed to commit");
       }
@@ -447,7 +407,7 @@ AsyncExecuteStatements::notifyComplete()
   // Notify about completion iff we have a callback.
   if (mCallback) {
     nsRefPtr<CompletionNotifier> completionEvent =
-      new CompletionNotifier(mCallback, mState);
+      new CompletionNotifier(mCallback, static_cast<ExecutionState>(mState));
     NS_ENSURE_TRUE(completionEvent, NS_ERROR_OUT_OF_MEMORY);
 
     // We no longer own mCallback (the CompletionNotifier takes ownership).
@@ -463,8 +423,6 @@ nsresult
 AsyncExecuteStatements::notifyError(PRInt32 aErrorCode,
                                     const char *aMessage)
 {
-  mMutex.AssertNotCurrentThreadOwns();
-
   if (!mCallback)
     return NS_OK;
 
@@ -477,8 +435,6 @@ AsyncExecuteStatements::notifyError(PRInt32 aErrorCode,
 nsresult
 AsyncExecuteStatements::notifyError(mozIStorageError *aError)
 {
-  mMutex.AssertNotCurrentThreadOwns();
-
   if (!mCallback)
     return NS_OK;
 
@@ -492,7 +448,6 @@ AsyncExecuteStatements::notifyError(mozIStorageError *aError)
 nsresult
 AsyncExecuteStatements::notifyResults()
 {
-  mMutex.AssertNotCurrentThreadOwns();
   NS_ASSERTION(mCallback, "notifyResults called without a callback!");
 
   nsRefPtr<CallbackResultNotifier> notifier =
@@ -515,7 +470,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(
 //// mozIStoragePendingStatement
 
 NS_IMETHODIMP
-AsyncExecuteStatements::Cancel(PRBool *_successful)
+AsyncExecuteStatements::Cancel()
 {
 #ifdef DEBUG
   PRBool onCallingThread = PR_FALSE;
@@ -527,17 +482,11 @@ AsyncExecuteStatements::Cancel(PRBool *_successful)
   // we are trying to cancel.
   NS_ENSURE_FALSE(mCancelRequested, NS_ERROR_UNEXPECTED);
 
-  {
-    MutexAutoLock lockedScope(mMutex);
+  // Indicate that we want to try and cancel at the next cancelation point.
+  (void)::PR_AtomicSet(const_cast<PRInt32 *>(&mCancelRequested), 1);
 
-    // We need to indicate that we want to try and cancel now.
-    mCancelRequested = true;
-
-    // Establish if we can cancel
-    *_successful = (mState == PENDING);
-  }
-
-  // Note, it is possible for us to return false here, and end up canceling
+  // Note:  While we are requesting to cancel here, it is possible that we will
+  // not actually be able to.  However, we will still suppress handleResult
   // events that have been dispatched to the calling thread.  This is OK,
   // however, because only read statements (such as SELECT) are going to be
   // posting events to the calling thread that actually check if they should
@@ -553,15 +502,10 @@ NS_IMETHODIMP
 AsyncExecuteStatements::Run()
 {
   // Do not run if we have been canceled.
-  bool cancelRequested;
-  {
-    MutexAutoLock lockedScope(mMutex);
-    cancelRequested = mCancelRequested;
-    if (cancelRequested)
-      mState = CANCELED;
-  }
-  if (cancelRequested)
+  if (mCancelRequested) {
+    (void)::PR_AtomicSet(const_cast<PRInt32 *>(&mState), CANCELED);
     return notifyComplete();
+  }
 
   // If there is more than one statement, run it in a transaction.  We assume
   // that we have been given write statements since getting a batch of read
diff --git a/storage/src/mozStorageAsyncStatementExecution.h b/storage/src/mozStorageAsyncStatementExecution.h
index 0afa365026e..00438148f2b 100644
--- a/storage/src/mozStorageAsyncStatementExecution.h
+++ b/storage/src/mozStorageAsyncStatementExecution.h
@@ -44,7 +44,6 @@
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
-#include "mozilla/Mutex.h"
 #include "mozilla/TimeStamp.h"
 
 #include "mozIStoragePendingStatement.h"
@@ -118,8 +117,6 @@ private:
    * occurs, or we are canceled.  If aLastStatement is true, we should set
    * mState accordingly.
    *
-   * @pre mMutex is not held
-   *
    * @param aData
    *        The StatementData to bind, execute, and then process.
    * @param aLastStatement
@@ -134,8 +131,6 @@ private:
    * Executes a given statement until completion, an error occurs, or we are
    * canceled.  If aLastStatement is true, we should set mState accordingly.
    *
-   * @pre mMutex is not held
-   *
    * @param aStatement
    *        The statement to execute and then process.
    * @param aLastStatement
@@ -149,8 +144,6 @@ private:
   /**
    * Executes a statement to completion, properly handling any error conditions.
    *
-   * @pre mMutex is held
-   *
    * @param aStatement
    *        The statement to execute to completion.
    * @returns true if results were obtained, false otherwise.
@@ -161,8 +154,6 @@ private:
    * Builds a result set up with a row from a given statement.  If we meet the
    * right criteria, go ahead and notify about this results too.
    *
-   * @pre mMutex is held
-   *
    * @param aStatement
    *        The statement to get the row data from.
    */
@@ -170,16 +161,12 @@ private:
 
   /**
    * Notifies callback about completion, and does any necessary cleanup.
-   *
-   * @pre mMutex is not held
    */
   nsresult notifyComplete();
 
   /**
    * Notifies callback about an error.
    *
-   * @pre mMutex is not held
-   *
    * @param aErrorCode
    *        The error code defined in mozIStorageError for the error.
    * @param aMessage
@@ -192,8 +179,6 @@ private:
 
   /**
    * Notifies the callback about a result set.
-   *
-   * @pre mMutex is not held
    */
   nsresult notifyResults();
 
@@ -216,24 +201,20 @@ private:
   TimeStamp mIntervalStart;
 
   /**
-   * Indicates our state of execution.
+   * Indicates our state of execution.  This is one of the values in the
+   * ExecutionState enum.
+   *
+   * @note This should only be set with PR_Atomic* functions.
    */
-  ExecutionState mState;
+  volatile PRInt32 mState;
 
   /**
-   * Indicates if we should try to cancel at a cancelation point.
+   * Indicates if we should try to cancel at a cancelation point or not.  This
+   * is evaluated as a boolean.
+   *
+   * @note This should only be set with PR_Atomic* functions.
    */
-  bool mCancelRequested;
-
-  /**
-   * This is the mutex tat protects our state from changing between threads.
-   * This includes the following variables:
-   *   - mState
-   *   - mCancelRequested is only set on the calling thread while the lock is
-   *     held.  It is always read from within the lock on the background thread,
-   *     but not on the calling thread (see shouldNotify for why).
-   */
-  Mutex &mMutex;
+  volatile PRInt32 mCancelRequested;
 };
 
 } // namespace storage
diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp
index 83e7db3905e..2103042a4b9 100644
--- a/storage/src/mozStorageConnection.cpp
+++ b/storage/src/mozStorageConnection.cpp
@@ -245,8 +245,7 @@ aggregateFunctionFinalHelper(sqlite3_context *aCtx)
 //// Connection
 
 Connection::Connection(Service *aService)
-: sharedAsyncExecutionMutex("Connection::sharedAsyncExecutionMutex")
-, mDBConn(nsnull)
+: mDBConn(nsnull)
 , mAsyncExecutionMutex(nsAutoLock::NewLock("AsyncExecutionMutex"))
 , mAsyncExecutionThreadShuttingDown(PR_FALSE)
 , mTransactionMutex(nsAutoLock::NewLock("TransactionMutex"))
diff --git a/storage/src/mozStorageConnection.h b/storage/src/mozStorageConnection.h
index c47bd90905b..65afdab3235 100644
--- a/storage/src/mozStorageConnection.h
+++ b/storage/src/mozStorageConnection.h
@@ -43,7 +43,6 @@
 
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
-#include "mozilla/Mutex.h"
 
 #include "nsString.h"
 #include "nsInterfaceHashtable.h"
@@ -93,13 +92,6 @@ public:
    */
   already_AddRefed<nsIEventTarget> getAsyncExecutionTarget();
 
-  /**
-   * Mutex used by asynchronous statements to protect state.  The mutex is
-   * declared on the connection object because there is no contention between
-   * asynchronous statements (they are serialized on mAsyncExecutionThread).
-   */
-  Mutex sharedAsyncExecutionMutex;
-
 private:
   ~Connection();
 
diff --git a/storage/test/unit/test_statement_executeAsync.js b/storage/test/unit/test_statement_executeAsync.js
index 6c2fa58aadc..724d7a3cb91 100644
--- a/storage/test/unit/test_statement_executeAsync.js
+++ b/storage/test/unit/test_statement_executeAsync.js
@@ -373,7 +373,6 @@ function test_immediate_cancellation()
     "DELETE FROM test WHERE id = ?"
   );
   stmt.bindInt32Parameter(0, 0);
-  let reason = Ci.mozIStorageStatementCallback.REASON_CANCELED;
   var pendingStatement = stmt.executeAsync({
     handleResult: function(aResultSet)
     {
@@ -389,7 +388,9 @@ function test_immediate_cancellation()
     {
       print("handleCompletion(" + aReason +
             ") for test_immediate_cancellation");
-      do_check_eq(reason, aReason);
+      // It is possible that we finished before we canceled.
+      do_check_true(aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED ||
+                    aReason == Ci.mozIStorageStatementCallback.REASON_CANCELED);
 
       // Run the next test.
       run_next_test();
@@ -397,10 +398,7 @@ function test_immediate_cancellation()
   });
 
   // Cancel immediately
-  if (!pendingStatement.cancel()) {
-    // It is possible that we finished before we canceled
-    reason = Ci.mozIStorageStatementCallback.REASON_FINISHED;
-  }
+  pendingStatement.cancel()
 
   stmt.finalize();
 }
@@ -411,7 +409,6 @@ function test_double_cancellation()
     "DELETE FROM test WHERE id = ?"
   );
   stmt.bindInt32Parameter(0, 0);
-  let reason = Ci.mozIStorageStatementCallback.REASON_CANCELED;
   var pendingStatement = stmt.executeAsync({
     handleResult: function(aResultSet)
     {
@@ -427,7 +424,9 @@ function test_double_cancellation()
     {
       print("handleCompletion(" + aReason +
             ") for test_double_cancellation");
-      do_check_eq(reason, aReason);
+      // It is possible that we finished before we canceled.
+      do_check_true(aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED ||
+                    aReason == Ci.mozIStorageStatementCallback.REASON_CANCELED);
 
       // Run the next test.
       run_next_test();
@@ -435,10 +434,7 @@ function test_double_cancellation()
   });
 
   // Cancel immediately
-  if (!pendingStatement.cancel()) {
-    // It is possible that we finished before we canceled
-    reason = Ci.mozIStorageStatementCallback.REASON_FINISHED;
-  }
+  pendingStatement.cancel()
 
   // And cancel again - expect an exception
   try {

From 68865640268c6f02a301763b2d128d7e005d4a9a Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Wed, 29 Jul 2009 22:28:29 -0400
Subject: [PATCH 082/175] This test is testing stuff that is just not true
 anymore now

---
 layout/reftests/bugs/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 8a02851e58e..dbd870863d8 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -811,7 +811,7 @@ random == 403134-1.html 403134-1-ref.html # bug 405377
 != 404030-1-notref2.html 404030-1.html
 == 404123-1.html 404123-1-ref.html
 == 404123-2.html 404123-2-ref.html
-== 404123-3.html 404123-3-ref.html
+!= 404123-3.html 404123-3-ref.html
 HTTP(..) == 404149-1.xul 404149-1-ref.xul # HTTP for fonts directory access
 == 404180-1.html 404180-1-ref.html
 == 404301-1.html 404301-1-ref.html

From ac5422ca8846e13cd4e5135b083448f8747af780 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 30 Jul 2009 15:15:50 +1200
Subject: [PATCH 083/175] b=493541 hook jemalloc into glibc's malloc
 r=bsmedberg

---
 memory/jemalloc/jemalloc.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
index 516d64259f4..a3952dee01c 100644
--- a/memory/jemalloc/jemalloc.c
+++ b/memory/jemalloc/jemalloc.c
@@ -7069,6 +7069,10 @@ _malloc_postfork(void)
  */
 /******************************************************************************/
 
+#ifdef HAVE_LIBDL
+#  include <dlfcn.h>
+#endif
+
 #ifdef MOZ_MEMORY_DARWIN
 static malloc_zone_t zone;
 static struct malloc_introspection_t zone_introspect;
@@ -7229,4 +7233,27 @@ jemalloc_darwin_init(void)
 		sizeof(malloc_zone_t *) * (malloc_num_zones - 1));
 	malloc_zones[0] = &zone;
 }
+
+#elif defined(__GLIBC__) && !defined(__UCLIBC__)
+/*
+ * glibc provides the RTLD_DEEPBIND flag for dlopen which can make it possible
+ * to inconsistently reference libc's malloc(3)-compatible functions
+ * (bug 493541).
+ *
+ * These definitions interpose hooks in glibc.  The functions are actually
+ * passed an extra argument for the caller return address, which will be
+ * ignored.
+ */
+void (*__free_hook)(void *ptr) = free;
+void *(*__malloc_hook)(size_t size) = malloc;
+void *(*__realloc_hook)(void *ptr, size_t size) = realloc;
+void *(*__memalign_hook)(size_t alignment, size_t size) = memalign;
+
+#elif defined(RTLD_DEEPBIND)
+/*
+ * XXX On systems that support RTLD_GROUP or DF_1_GROUP, do their
+ * implementations permit similar inconsistencies?  Should STV_SINGLETON
+ * visibility be used for interposition where available?
+ */
+#  error "Interposing malloc is unsafe on this system without libc malloc hooks."
 #endif

From a831616bfa98ecf0191e8c0bce1d7528efea01c4 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 30 Jul 2009 15:23:56 +1200
Subject: [PATCH 084/175] whitespace change to force rebuild with dae91a0884c9

---
 toolkit/xre/nsAppRunner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 06a0c46c295..1c5870399ae 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -604,7 +604,7 @@ class nsXULAppInfo : public nsIXULAppInfo,
                      public nsICrashReporter,
 #endif
                      public nsIXULRuntime
-                     
+
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED

From 660fb71019166af371e1beee4e8b2150afb137f1 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 14:48:13 +1200
Subject: [PATCH 085/175] Bug 467914. GetOverflowRectRelativeToSelf shouldn't
 always expect a preEffectsBBox. r=dbaron

--HG--
extra : rebase_source : cc6cd0bf3f4b11785b85baeaf74bd9ef7725c42f
---
 layout/generic/crashtests/467914-1.html   | 3 +++
 layout/generic/crashtests/crashtests.list | 1 +
 layout/generic/nsFrame.cpp                | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 layout/generic/crashtests/467914-1.html

diff --git a/layout/generic/crashtests/467914-1.html b/layout/generic/crashtests/467914-1.html
new file mode 100644
index 00000000000..1066a6c8a73
--- /dev/null
+++ b/layout/generic/crashtests/467914-1.html
@@ -0,0 +1,3 @@
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:mathml="http://www.w3.org/1998/Math/MathML">
+<mathml:munder style="-moz-transform: translate(50px);clip-path: url(#h);"/>
+</window>
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index a1d68cafc43..047c4b65db9 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -222,6 +222,7 @@ load 457380-1.html
 load 463741-1.html
 load 465651-1.html
 load 467487-1.html
+load 467914-1.html
 load 468207-1.html
 load 469859-1.xhtml
 load 472587-1.xhtml
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index bd49f69a088..0d69168a530 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -4023,8 +4023,11 @@ nsIFrame::GetOverflowRectRelativeToSelf() const
   if (!(mState & NS_FRAME_MAY_BE_TRANSFORMED_OR_HAVE_RENDERING_OBSERVERS) ||
       !GetStyleDisplay()->HasTransform())
     return GetOverflowRect();
-  return *static_cast<nsRect*>
+  nsRect* preEffectsBBox = static_cast<nsRect*>
     (GetProperty(nsGkAtoms::preEffectsBBoxProperty));
+  if (!preEffectsBBox)
+    return GetOverflowRect();
+  return *preEffectsBBox;
 }
 
 void

From da0b2fce240de8c58780f7dd349c917eea9c81c4 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 14:54:42 +1200
Subject: [PATCH 086/175] Bug 506615. XUL decks should not have wididgets.
 r=dbaron

--HG--
extra : rebase_source : 5d6728b11a121565f828f27e8abed5e0172aa069
---
 layout/generic/nsContainerFrame.cpp    |  9 +++----
 layout/generic/nsFrame.cpp             |  9 -------
 layout/generic/nsIFrame.h              |  8 ++----
 layout/xul/base/src/nsBoxFrame.cpp     | 12 ---------
 layout/xul/base/src/nsDeckFrame.h      |  4 ---
 layout/xul/base/src/nsLeafBoxFrame.cpp | 12 ---------
 view/public/nsIViewManager.h           |  7 ++++-
 view/src/nsView.cpp                    | 37 +++++++++++++++++++-------
 view/src/nsView.h                      |  4 +++
 view/src/nsViewManager.cpp             | 25 +++--------------
 10 files changed, 47 insertions(+), 80 deletions(-)

diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index f6f1423077b..58f7a791ad9 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -617,11 +617,10 @@ nsContainerFrame::SyncFrameViewProperties(nsPresContext*  aPresContext,
 
     if (!aStyleContext->GetStyleVisibility()->IsVisible() &&
         !aFrame->SupportsVisibilityHidden()) {
-      // If it's a scrollable frame that can't hide its scrollbars,
-      // hide the view. This means that child elements can't override
-      // their parent's visibility, but it's not practical to leave it
-      // visible in all cases because the scrollbars will be showing
-      // XXXldb Does the view system really enforce this correctly?
+      // If it's a subdocument frame or a plugin, hide the view and
+      // any associated widget.
+      // These are leaf elements so this is OK, no descendant can be
+      // visibility:visible.
       viewIsVisible = PR_FALSE;
     } else if (IsMenuPopup(aFrame)) {
       // if the view is for a popup, don't show the view if the popup is closed
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 0d69168a530..6168c7ed0ad 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -6717,15 +6717,6 @@ nsFrame::SetParent(const nsIFrame* aParent)
   else if (wasBoxWrapped && !IsBoxWrapped())
     DeleteProperty(nsGkAtoms::boxMetricsProperty);
 
-  if (aParent && aParent->IsBoxFrame()) {
-    if (aParent->ChildrenMustHaveWidgets()) {
-        nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
-        nsIView* view = GetView();
-        if (!view->HasWidget())
-          CreateWidgetForView(view);
-    }
-  }
-
   return NS_OK;
 }
 
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index def82baab31..6bea51a15af 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -107,10 +107,9 @@ struct nsMargin;
 typedef class nsIFrame nsIBox;
 
 // IID for the nsIFrame interface
-// 7b437d20-a34e-11dd-ad8b-0800200c9a66
 #define NS_IFRAME_IID \
-  { 0x7b437d20, 0xa34e, 0x11dd, \
-    { 0xad, 0x8b, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66 } }
+  { 0x7e9018b5, 0x5405, 0x4e2b, \
+    { 0x87, 0x67, 0xe2, 0xb4, 0xb1, 0x3e, 0xc1, 0x69 } }
 
 /**
  * Indication of how the frame can be split. This is used when doing runaround
@@ -2286,9 +2285,6 @@ NS_PTR_TO_INT32(frame->GetProperty(nsGkAtoms::embeddingLevel))
   NS_IMETHOD DumpBox(FILE* out)=0;
 #endif
 
-  // Only nsDeckFrame requires that all its children have widgets
-  virtual PRBool ChildrenMustHaveWidgets() const { return PR_FALSE; }
-
   /**
    * @return PR_TRUE if this text frame ends with a newline character.  It
    * should return PR_FALSE if this is not a text frame.
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index 5b2e4cefb11..fe6bd386ca0 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -205,18 +205,6 @@ nsBoxFrame::Init(nsIContent*      aContent,
 
   MarkIntrinsicWidthsDirty();
 
-  // see if we need a widget
-  if (aParent && aParent->IsBoxFrame()) {
-    if (aParent->ChildrenMustHaveWidgets()) {
-        rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        nsIView* view = GetView();
-        if (!view->HasWidget())
-           view->CreateWidget(kWidgetCID);   
-    }
-  }
-
   CacheAttributes();
 
 #ifdef DEBUG_LAYOUT
diff --git a/layout/xul/base/src/nsDeckFrame.h b/layout/xul/base/src/nsDeckFrame.h
index 741ba5315c1..6fe832a83a0 100644
--- a/layout/xul/base/src/nsDeckFrame.h
+++ b/layout/xul/base/src/nsDeckFrame.h
@@ -75,10 +75,6 @@ public:
 
   virtual nsIAtom* GetType() const;
 
-#ifndef MOZ_GFX_OPTIMIZE_MOBILE
-  virtual PRBool ChildrenMustHaveWidgets() const { return PR_TRUE; }
-#endif
-
 #ifdef NS_DEBUG
   NS_IMETHOD GetFrameName(nsAString& aResult) const
   {
diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/base/src/nsLeafBoxFrame.cpp
index dec1019d00c..07448fe5743 100644
--- a/layout/xul/base/src/nsLeafBoxFrame.cpp
+++ b/layout/xul/base/src/nsLeafBoxFrame.cpp
@@ -98,18 +98,6 @@ nsLeafBoxFrame::Init(
   nsresult  rv = nsLeafFrame::Init(aContent, aParent, aPrevInFlow);
   NS_ENSURE_SUCCESS(rv, rv);
 
-   // see if we need a widget
-  if (aParent && aParent->IsBoxFrame()) {
-    if (aParent->ChildrenMustHaveWidgets()) {
-        rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE); 
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        nsIView* view = GetView();
-        if (!view->HasWidget())
-           view->CreateWidget(kWidgetCID);   
-    }
-  }
-  
   mMouseThrough = unset;
 
   UpdateMouseThrough();
diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h
index 840421b5e4f..ec4825e4c1b 100644
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@@ -256,7 +256,12 @@ public:
                          PRBool aRepaintExposedAreaOnly = PR_FALSE) = 0;
 
   /**
-   * Set the visibility of a view.
+   * Set the visibility of a view. Hidden views have the effect of hiding
+   * their descendants as well. This does not affect painting, so layout
+   * is responsible for ensuring that content in hidden views is not
+   * painted nor handling events. It does affect the visibility of widgets;
+   * if a view is hidden, descendant views with widgets have their widgets
+   * hidden.
    * The view manager generates the appropriate dirty regions.
    * @param aView view to change visibility state of
    * @param visible new visibility state
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 228e74597f2..1fff95629f5 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -52,7 +52,6 @@ static nsEventStatus HandleEvent(nsGUIEvent *aEvent);
 
 
 //#define SHOW_VIEW_BORDERS
-//#define HIDE_ALL_WIDGETS
 
 // {34297A07-A8FD-d811-87C6-000244212BCB}
 #define VIEW_WRAPPER_IID \
@@ -338,6 +337,15 @@ void nsView::ResetWidgetBounds(PRBool aRecurse, PRBool aMoveOnly,
   }
 }
 
+PRBool nsView::IsEffectivelyVisible()
+{
+  for (nsView* v = this; v; v = v->mParent) {
+    if (v->GetVisibility() == nsViewVisibility_kHide)
+      return PR_FALSE;
+  }
+  return PR_TRUE;
+}
+
 nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
 {
   nsCOMPtr<nsIDeviceContext> dx;
@@ -354,7 +362,7 @@ nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
     viewBounds += offset;
 
     if (parentWidget && aType == eWindowType_popup &&
-        mVis == nsViewVisibility_kShow) {
+        IsEffectivelyVisible()) {
       nsIntPoint screenPoint = parentWidget->WidgetToScreenOffset();
       viewBounds += nsPoint(NSIntPixelsToAppUnits(screenPoint.x, p2a),
                             NSIntPixelsToAppUnits(screenPoint.y, p2a));
@@ -433,29 +441,38 @@ void nsView::SetDimensions(const nsRect& aRect, PRBool aPaint, PRBool aResizeWid
   }
 }
 
-NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility)
+void nsView::NotifyEffectiveVisibilityChanged(PRBool aEffectivelyVisible)
 {
-
-  mVis = aVisibility;
-
-  if (aVisibility == nsViewVisibility_kHide)
+  if (!aEffectivelyVisible)
   {
     DropMouseGrabbing();
   }
 
   if (nsnull != mWindow)
   {
-#ifndef HIDE_ALL_WIDGETS
-    if (mVis == nsViewVisibility_kShow)
+    if (aEffectivelyVisible)
     {
       DoResetWidgetBounds(PR_FALSE, PR_TRUE);
       mWindow->Show(PR_TRUE);
     }
     else
-#endif
       mWindow->Show(PR_FALSE);
   }
 
+  for (nsView* child = mFirstChild; child; child = child->mNextSibling) {
+    if (child->mVis == nsViewVisibility_kHide) {
+      // It was effectively hidden and still is
+      continue;
+    }
+    // Our child is visible if we are
+    child->NotifyEffectiveVisibilityChanged(aEffectivelyVisible);
+  }
+}
+
+NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility)
+{
+  mVis = aVisibility;
+  NotifyEffectiveVisibilityChanged(IsEffectivelyVisible());
   return NS_OK;
 }
 
diff --git a/view/src/nsView.h b/view/src/nsView.h
index 8baf66500c5..ad12aa1dade 100644
--- a/view/src/nsView.h
+++ b/view/src/nsView.h
@@ -166,6 +166,8 @@ public:
   void SetPositionIgnoringChildWidgets(nscoord aX, nscoord aY);
   nsresult LoadWidget(const nsCID &aClassIID);
 
+  void NotifyEffectiveVisibilityChanged(PRBool aEffectivelyVisible);
+
   // Update the cached RootViewManager for all view manager descendents,
   // If the hierarchy is being removed, aViewManagerParent points to the view
   // manager for the hierarchy's old parent, and will have its mouse grab
@@ -193,6 +195,8 @@ public:
 
   nsIntRect CalcWidgetBounds(nsWindowType aType);
 
+  PRBool IsEffectivelyVisible();
+
 protected:
   // Do the actual work of ResetWidgetBounds, unconditionally.  Don't
   // call this method if we have no widget.
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index 440ddfd1b3f..eebb505cf6b 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -110,14 +110,8 @@ public:
 
 static PRBool IsViewVisible(nsView *aView)
 {
-  for (nsIView *view = aView; view; view = view->GetParent()) {
-    // We don't check widget visibility here because in the future (with
-    // the better approach to this that's in attachment 160801 on bug
-    // 227361), callers of the equivalent to this function should be able
-    // to rely on being notified when the result of this function changes.
-    if (view->GetVisibility() == nsViewVisibility_kHide)
-      return PR_FALSE;
-  }
+  if (!aView->IsEffectivelyVisible())
+    return PR_FALSE;
 
   // Find out if the root view is visible by asking the view observer
   // (this won't be needed anymore if we link view trees across chrome /
@@ -1231,8 +1225,7 @@ NS_IMETHODIMP nsViewManager::GrabMouseEvents(nsIView *aView, PRBool &aResult)
 
   // Along with nsView::SetVisibility, we enforce that the mouse grabber
   // can never be a hidden view.
-  if (aView && static_cast<nsView*>(aView)->GetVisibility()
-               == nsViewVisibility_kHide) {
+  if (aView && static_cast<nsView*>(aView)->IsEffectivelyVisible()) {
     aView = nsnull;
   }
 
@@ -1587,16 +1580,6 @@ NS_IMETHODIMP nsViewManager::SetViewVisibility(nsIView *aView, nsViewVisibility
         }
       }
     }
-
-    // Any child views not associated with frames might not get their visibility
-    // updated, so propagate our visibility to them. This is important because
-    // hidden views should have all hidden children.
-    for (nsView* childView = view->GetFirstChild(); childView;
-         childView = childView->GetNextSibling()) {
-      if (!childView->GetClientData()) {
-        childView->SetVisibility(aVisible);
-      }
-    }
   }
   return NS_OK;
 }
@@ -1967,7 +1950,7 @@ NS_IMETHODIMP nsViewManager::GetRectVisibility(nsIView *aView,
   }
 
   // is this view even visible?
-  if (view->GetVisibility() == nsViewVisibility_kHide) {
+  if (!view->IsEffectivelyVisible()) {
     return NS_OK; 
   }
 

From 95c44491cd862fe0316a1bd3288e24dea6d70a3b Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 14:56:52 +1200
Subject: [PATCH 087/175] Bug 506304. Walk all the way up to the nearest widget
 when computing event coordinates for windowless plugins. r=bz

--HG--
extra : rebase_source : be25ce5ffbae7c90cf0b211ae818046873b6e09a
---
 layout/generic/nsObjectFrame.cpp | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 0936741f5a2..53b354167d5 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1045,23 +1045,9 @@ nsIntPoint nsObjectFrame::GetWindowOriginInPixels(PRBool aWindowless)
   // if it's windowless, let's make sure we have our origin set right
   // it may need to be corrected, like after scrolling
   if (aWindowless && parentWithView) {
-    // XXX Should this be replaced by nsIView::GetNearestWidget?
-    // The implementation below doesn't handle cases where the widget's origin
-    // doesn't coincide with its view's origin.
-
-    nsIViewManager* parentVM = parentWithView->GetViewManager();
-
-    // Walk up all the views and add up their positions until we
-    // reach the first view with a window (non-null widget). This will give us our
-    // position relative to the containing window which is what we want to give the plugin
-    nsIView* theView = parentWithView;
-    while (theView && !theView->GetWidget()) {
-      if (theView->GetViewManager() != parentVM)
-        break;
-
-      origin += theView->GetPosition();
-      theView = theView->GetParent();
-    }  
+    nsPoint offsetToWidget;
+    parentWithView->GetNearestWidget(&offsetToWidget);
+    origin += offsetToWidget;
   }
 
   return nsIntPoint(PresContext()->AppUnitsToDevPixels(origin.x),

From 22e45a4c15957e4d5481df7307f8de48ed1c22ab Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 14:59:41 +1200
Subject: [PATCH 088/175] Bug 492309. Remove useless gfxTextRuNnFactory flags.
 r=vlad

--HG--
extra : rebase_source : 4cdbc37f404c07f509adbfb581c662187813bc4a
---
 gfx/thebes/public/gfxFont.h                 | 37 +++------------------
 gfx/thebes/public/gfxTextRunCache.h         |  3 +-
 gfx/thebes/public/gfxTextRunWordCache.h     | 16 ++++-----
 gfx/thebes/src/gfxAtsuiFonts.cpp            |  1 -
 gfx/thebes/src/gfxCoreTextFonts.cpp         |  1 -
 gfx/thebes/src/gfxFT2Fonts.cpp              |  2 --
 gfx/thebes/src/gfxFont.cpp                  | 24 -------------
 gfx/thebes/src/gfxOS2Fonts.cpp              |  2 --
 gfx/thebes/src/gfxPangoFonts.cpp            |  2 --
 gfx/thebes/src/gfxTextRunWordCache.cpp      |  4 +--
 gfx/thebes/src/gfxWindowsFonts.cpp          |  2 --
 gfx/thebes/test/gfxFontSelectionTest.cpp    |  1 -
 gfx/thebes/test/gfxTextRunPerfTest.cpp      |  1 -
 layout/generic/nsTextFrameThebes.cpp        |  7 +---
 layout/generic/nsTextRunTransformations.cpp |  6 ++--
 15 files changed, 19 insertions(+), 90 deletions(-)

diff --git a/gfx/thebes/public/gfxFont.h b/gfx/thebes/public/gfxFont.h
index 795cac374be..ef2d98603a8 100644
--- a/gfx/thebes/public/gfxFont.h
+++ b/gfx/thebes/public/gfxFont.h
@@ -745,25 +745,16 @@ public:
          * on the spacing provider.
          */
         TEXT_ENABLE_SPACING          = 0x0008,
-        /**
-         * When set, GetSpacing can return negative spacing.
-         */
-        TEXT_ENABLE_NEGATIVE_SPACING = 0x0010,
         /**
          * When set, GetHyphenationBreaks may return true for some character
          * positions, otherwise it will always return false for all characters.
          */
-        TEXT_ENABLE_HYPHEN_BREAKS    = 0x0040,
+        TEXT_ENABLE_HYPHEN_BREAKS    = 0x0010,
         /**
          * When set, the text has no characters above 255 and it is stored
          * in the textrun in 8-bit format.
          */
-        TEXT_IS_8BIT                 = 0x0080,
-        /**
-         * When set, the text may have UTF16 surrogate pairs, otherwise it
-         * doesn't.
-         */
-        TEXT_HAS_SURROGATES          = 0x0100,
+        TEXT_IS_8BIT                 = 0x0020,
         /**
          * When set, the RunMetrics::mBoundingBox field will be initialized
          * properly based on glyph extents, in particular, glyph extents that
@@ -771,18 +762,18 @@ public:
          * and advance width of the glyph). When not set, it may just be the
          * standard font-box even if glyphs overflow.
          */
-        TEXT_NEED_BOUNDING_BOX       = 0x0200,
+        TEXT_NEED_BOUNDING_BOX       = 0x0040,
         /**
          * When set, optional ligatures are disabled. Ligatures that are
          * required for legible text should still be enabled.
          */
-        TEXT_DISABLE_OPTIONAL_LIGATURES = 0x0400,
+        TEXT_DISABLE_OPTIONAL_LIGATURES = 0x0080,
         /**
          * When set, the textrun should favour speed of construction over
          * quality. This may involve disabling ligatures and/or kerning or
          * other effects.
          */
-        TEXT_OPTIMIZE_SPEED          = 0x0800
+        TEXT_OPTIMIZE_SPEED          = 0x0100
     };
 
     /**
@@ -1196,7 +1187,6 @@ public:
             FLAG_NOT_MISSING              = 0x01,
             FLAG_NOT_CLUSTER_START        = 0x02,
             FLAG_NOT_LIGATURE_GROUP_START = 0x04,
-            FLAG_LOW_SURROGATE            = 0x08,
             
             GLYPH_COUNT_MASK = 0x00FFFF00U,
             GLYPH_COUNT_SHIFT = 8
@@ -1222,9 +1212,6 @@ public:
         PRUint32 GetSimpleGlyph() const { return mValue & GLYPH_MASK; }
 
         PRBool IsMissing() const { return (mValue & (FLAG_NOT_MISSING|FLAG_IS_SIMPLE_GLYPH)) == 0; }
-        PRBool IsLowSurrogate() const {
-            return (mValue & (FLAG_LOW_SURROGATE|FLAG_IS_SIMPLE_GLYPH)) == FLAG_LOW_SURROGATE;
-        }
         PRBool IsClusterStart() const {
             return (mValue & FLAG_IS_SIMPLE_GLYPH) || !(mValue & FLAG_NOT_CLUSTER_START);
         }
@@ -1271,15 +1258,6 @@ public:
                 (aGlyphCount << GLYPH_COUNT_SHIFT);
             return *this;
         }
-        /**
-         * Low surrogates don't have any glyphs and are not the start of
-         * a cluster or ligature group.
-         */
-        CompressedGlyph& SetLowSurrogate() {
-            mValue = (mValue & FLAG_CAN_BREAK_BEFORE) | FLAG_NOT_MISSING |
-                FLAG_LOW_SURROGATE;
-            return *this;
-        }
         PRUint32 GetGlyphCount() const {
             NS_ASSERTION(!IsSimpleGlyph(), "Expected non-simple-glyph");
             return (mValue & GLYPH_COUNT_MASK) >> GLYPH_COUNT_SHIFT;
@@ -1351,11 +1329,6 @@ public:
 
     // API for setting up the textrun glyphs. Should only be called by
     // things that construct textruns.
-    /**
-     * Record every character that is the second half of a surrogate pair.
-     * This should be called after creating a Unicode textrun.
-     */
-    void RecordSurrogates(const PRUnichar *aString);
     /**
      * We've found a run of text that should use a particular font. Call this
      * only during initialization when font substitution has been computed.
diff --git a/gfx/thebes/public/gfxTextRunCache.h b/gfx/thebes/public/gfxTextRunCache.h
index 92d09446de3..dbc6d97878d 100644
--- a/gfx/thebes/public/gfxTextRunCache.h
+++ b/gfx/thebes/public/gfxTextRunCache.h
@@ -52,8 +52,7 @@ public:
      * Get a textrun for the given text, using a global cache. The textrun
      * must be released via ReleaseTextRun, not deleted.
      * Do not set any state in the textrun (e.g. actual or potential linebreaks).
-     * Flags IS_8BIT, IS_ASCII and HAS_SURROGATES are automatically set
-     * appropriately.
+     * Flags IS_8BIT and IS_ASCII are automatically set appropriately.
      * Flag IS_PERSISTENT must NOT be set unless aText is guaranteed to live
      * forever.
      * The string can contain any characters, invalid ones will be stripped
diff --git a/gfx/thebes/public/gfxTextRunWordCache.h b/gfx/thebes/public/gfxTextRunWordCache.h
index bc5dc9226a9..9584c955755 100644
--- a/gfx/thebes/public/gfxTextRunWordCache.h
+++ b/gfx/thebes/public/gfxTextRunWordCache.h
@@ -70,10 +70,10 @@ public:
      * Create a textrun using cached words.
      * Invalid characters (see gfxFontGroup::IsInvalidChar) will be automatically
      * treated as invisible missing.
-     * @param aFlags the flags TEXT_IS_ASCII and TEXT_HAS_SURROGATES must be set
-     * by the caller, if applicable; TEXT_IN_CACHE is added if we
-     * have a reference to the textrun in the cache and RemoveTextRun must
-     * be called when the textrun dies.
+     * @param aFlags the flag TEXT_IS_ASCII must be set by the caller,
+     * if applicable; TEXT_IN_CACHE is added if we have a reference to
+     * the textrun in the cache and RemoveTextRun must be called when the
+     * textrun dies.
      */
     static gfxTextRun *MakeTextRun(const PRUnichar *aText, PRUint32 aLength,
                                    gfxFontGroup *aFontGroup,
@@ -83,10 +83,10 @@ public:
      * Create a textrun using cached words.
      * Invalid characters (see gfxFontGroup::IsInvalidChar) will be automatically
      * treated as invisible missing.
-     * @param aFlags the flags TEXT_IS_ASCII and TEXT_HAS_SURROGATES must be set
-     * by the caller, if applicable; TEXT_IN_CACHE is added if we
-     * have a reference to the textrun in the cache and RemoveTextRun must
-     * be called when the textrun dies.
+     * @param aFlags the flag TEXT_IS_ASCII must be set by the caller,
+     * if applicable; TEXT_IN_CACHE is added if we have a reference to
+     * the textrun in the cache and RemoveTextRun must be called when the
+     * textrun dies.
      */
     static gfxTextRun *MakeTextRun(const PRUint8 *aText, PRUint32 aLength,
                                    gfxFontGroup *aFontGroup,
diff --git a/gfx/thebes/src/gfxAtsuiFonts.cpp b/gfx/thebes/src/gfxAtsuiFonts.cpp
index c743ef770a7..5aa2bd715d0 100644
--- a/gfx/thebes/src/gfxAtsuiFonts.cpp
+++ b/gfx/thebes/src/gfxAtsuiFonts.cpp
@@ -714,7 +714,6 @@ gfxAtsuiFontGroup::MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
     if (!textRun)
         return nsnull;
 
-    textRun->RecordSurrogates(aString);
     gfxPlatformMac::SetupClusterBoundaries(textRun, aString);
 
     PRUint32 maxLen;
diff --git a/gfx/thebes/src/gfxCoreTextFonts.cpp b/gfx/thebes/src/gfxCoreTextFonts.cpp
index 5d31b8ea4f7..9f138b33e3b 100644
--- a/gfx/thebes/src/gfxCoreTextFonts.cpp
+++ b/gfx/thebes/src/gfxCoreTextFonts.cpp
@@ -721,7 +721,6 @@ gfxCoreTextFontGroup::MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
     if (!textRun)
         return nsnull;
 
-    textRun->RecordSurrogates(aString);
     gfxPlatformMac::SetupClusterBoundaries(textRun, aString);
 
     nsAutoString utf16;
diff --git a/gfx/thebes/src/gfxFT2Fonts.cpp b/gfx/thebes/src/gfxFT2Fonts.cpp
index d3b2d4381bf..8a7ef15ddbb 100644
--- a/gfx/thebes/src/gfxFT2Fonts.cpp
+++ b/gfx/thebes/src/gfxFT2Fonts.cpp
@@ -289,8 +289,6 @@ gfxTextRun *gfxFT2FontGroup::MakeTextRun(const PRUnichar* aString, PRUint32 aLen
     if (!textRun)
         return nsnull;
 
-    textRun->RecordSurrogates(aString);
-
     mString.Assign(nsDependentSubstring(aString, aString + aLength));
 
     InitTextRun(textRun);
diff --git a/gfx/thebes/src/gfxFont.cpp b/gfx/thebes/src/gfxFont.cpp
index ffc3953f4d8..75f22c58367 100644
--- a/gfx/thebes/src/gfxFont.cpp
+++ b/gfx/thebes/src/gfxFont.cpp
@@ -2377,30 +2377,6 @@ gfxTextRun::SetMissingGlyph(PRUint32 aIndex, PRUint32 aChar)
     mCharacterGlyphs[aIndex].SetMissing(1);
 }
 
-void
-gfxTextRun::RecordSurrogates(const PRUnichar *aString)
-{
-    // !! FIXME !!
-    //
-    // This is called from the platform font implementations when making text runs, but currently it
-    // doesn't do anything because callers do not (consistently, or ever?) set the TEXT_HAS_SURROGATES flag.
-    // However, I have not seen anything that relies on the surrogate flag on glyphs, so perhaps we can
-    // simply eliminate this and remove that flag from gfxTextRunFactory?
-
-    if (!(mFlags & gfxTextRunFactory::TEXT_HAS_SURROGATES))
-        return;
-
-    // Remember which characters are low surrogates (the second half of
-    // a surrogate pair).
-    PRUint32 i;
-    gfxTextRun::CompressedGlyph g;
-    for (i = 0; i < mCharacterCount; ++i) {
-        if (NS_IS_LOW_SURROGATE(aString[i])) {
-            SetGlyphs(i, g.SetLowSurrogate(), nsnull);
-        }
-    }
-}
-
 static void
 ClearCharacters(gfxTextRun::CompressedGlyph *aGlyphs, PRUint32 aLength)
 {
diff --git a/gfx/thebes/src/gfxOS2Fonts.cpp b/gfx/thebes/src/gfxOS2Fonts.cpp
index 861520fcb49..bc6b45ca5a4 100644
--- a/gfx/thebes/src/gfxOS2Fonts.cpp
+++ b/gfx/thebes/src/gfxOS2Fonts.cpp
@@ -548,8 +548,6 @@ gfxTextRun *gfxOS2FontGroup::MakeTextRun(const PRUnichar* aString, PRUint32 aLen
 
     mEnableKerning = !(aFlags & gfxTextRunFactory::TEXT_OPTIMIZE_SPEED);
 
-    textRun->RecordSurrogates(aString);
-
     nsCAutoString utf8;
     PRInt32 headerLen = AppendDirectionalIndicatorUTF8(textRun->IsRightToLeft(), utf8);
     AppendUTF16toUTF8(Substring(aString, aString + aLength), utf8);
diff --git a/gfx/thebes/src/gfxPangoFonts.cpp b/gfx/thebes/src/gfxPangoFonts.cpp
index aaa0b2686d6..316a64a399f 100644
--- a/gfx/thebes/src/gfxPangoFonts.cpp
+++ b/gfx/thebes/src/gfxPangoFonts.cpp
@@ -2860,8 +2860,6 @@ gfxPangoFontGroup::MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
     if (!run)
         return nsnull;
 
-    run->RecordSurrogates(aString);
-
     nsCAutoString utf8;
     PRInt32 headerLen = AppendDirectionalIndicatorUTF8(run->IsRightToLeft(), utf8);
     AppendUTF16toUTF8(Substring(aString, aString + aLength), utf8);
diff --git a/gfx/thebes/src/gfxTextRunWordCache.cpp b/gfx/thebes/src/gfxTextRunWordCache.cpp
index 35e051ace1b..e92cca0d502 100644
--- a/gfx/thebes/src/gfxTextRunWordCache.cpp
+++ b/gfx/thebes/src/gfxTextRunWordCache.cpp
@@ -93,8 +93,8 @@ public:
      * Create a textrun using cached words.
      * Invalid characters (see gfxFontGroup::IsInvalidChar) will be automatically
      * treated as invisible missing.
-     * @param aFlags the flags TEXT_IS_ASCII and TEXT_HAS_SURROGATES must be set
-     * by the caller, if applicable
+     * @param aFlags the flag TEXT_IS_ASCII must be set by the caller,
+     * if applicable
      * @param aIsInCache if true is returned, then RemoveTextRun must be called
      * before the textrun changes or dies.
      */
diff --git a/gfx/thebes/src/gfxWindowsFonts.cpp b/gfx/thebes/src/gfxWindowsFonts.cpp
index aec428abc3e..9a97fcc180b 100644
--- a/gfx/thebes/src/gfxWindowsFonts.cpp
+++ b/gfx/thebes/src/gfxWindowsFonts.cpp
@@ -1477,8 +1477,6 @@ gfxWindowsFontGroup::MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
         return nsnull;
     NS_ASSERTION(aParams->mContext, "MakeTextRun called without a gfxContext");
 
-    textRun->RecordSurrogates(aString);
-    
 #ifdef FORCE_UNISCRIBE
     const PRBool isComplex = PR_TRUE;
 #else
diff --git a/gfx/thebes/test/gfxFontSelectionTest.cpp b/gfx/thebes/test/gfxFontSelectionTest.cpp
index 77f0b6422c0..6109babd075 100644
--- a/gfx/thebes/test/gfxFontSelectionTest.cpp
+++ b/gfx/thebes/test/gfxFontSelectionTest.cpp
@@ -304,7 +304,6 @@ RunTest (TestEntry *test, gfxContext *ctx) {
         length = strlen(test->string);
         textRun = gfxTextRunWordCache::MakeTextRun(reinterpret_cast<PRUint8*>(test->string), length, fontGroup, &params, flags);
     } else {
-        flags |= gfxTextRunFactory::TEXT_HAS_SURROGATES; // just in case
         NS_ConvertUTF8toUTF16 str(nsDependentCString(test->string));
         length = str.Length();
         textRun = gfxTextRunWordCache::MakeTextRun(str.get(), length, fontGroup, &params, flags);
diff --git a/gfx/thebes/test/gfxTextRunPerfTest.cpp b/gfx/thebes/test/gfxTextRunPerfTest.cpp
index 84b57672d9f..483dd2ab6d7 100644
--- a/gfx/thebes/test/gfxTextRunPerfTest.cpp
+++ b/gfx/thebes/test/gfxTextRunPerfTest.cpp
@@ -119,7 +119,6 @@ RunTest (TestEntry *test, gfxContext *ctx) {
         length = strlen(test->mString);
         textRun = fontGroup->MakeTextRun(reinterpret_cast<const PRUint8*>(test->mString), length, &params, flags);
     } else {
-        flags |= gfxTextRunFactory::TEXT_HAS_SURROGATES; // just in case
         NS_ConvertUTF8toUTF16 str(nsDependentCString(test->mString));
         length = str.Length();
         textRun = fontGroup->MakeTextRun(str.get(), length, &params, flags);
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index dca4e620f05..5bad68046cb 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -1434,12 +1434,7 @@ BuildTextRunsScanner::GetNextBreakBeforeFrame(PRUint32* aIndex)
 static PRUint32
 GetSpacingFlags(nscoord spacing)
 {
-  if (!spacing)
-    return 0;
-  if (spacing > 0)
-    return gfxTextRunFactory::TEXT_ENABLE_SPACING;
-  return gfxTextRunFactory::TEXT_ENABLE_SPACING |
-         gfxTextRunFactory::TEXT_ENABLE_NEGATIVE_SPACING;
+  return spacing ? gfxTextRunFactory::TEXT_ENABLE_SPACING : 0;
 }
 
 static gfxFontGroup*
diff --git a/layout/generic/nsTextRunTransformations.cpp b/layout/generic/nsTextRunTransformations.cpp
index f0b5fb1cdd1..635b580f889 100644
--- a/layout/generic/nsTextRunTransformations.cpp
+++ b/layout/generic/nsTextRunTransformations.cpp
@@ -173,15 +173,13 @@ MergeCharactersInTextRun(gfxTextRun* aDest, gfxTextRun* aSrc,
       // to merge S's (uppercase &szlig;), so it's not worth it.
 
       if (k + 1 < iter.GetStringEnd() && aCharsToMerge[k + 1]) {
-        NS_ASSERTION(g.IsClusterStart() && g.IsLigatureGroupStart() &&
-                     !g.IsLowSurrogate(),
+        NS_ASSERTION(g.IsClusterStart() && g.IsLigatureGroupStart(),
                      "Don't know how to merge this stuff");
         continue;
       }
 
       NS_ASSERTION(mergeRunStart == k ||
-                   (g.IsClusterStart() && g.IsLigatureGroupStart() &&
-                    !g.IsLowSurrogate()),
+                   (g.IsClusterStart() && g.IsLigatureGroupStart()),
                    "Don't know how to merge this stuff");
 
       // If the start of the merge run is actually a character that should

From 0eeaa34755a75f6d48b1cbb3dcdf46cbe7de325d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 15:02:22 +1200
Subject: [PATCH 089/175] Bug 504311. Don't reframe text when white-space
 changes between preformatted values, or between non-preformatted values. r=bz

--HG--
extra : rebase_source : 7f545ad1d85bcda74d18d9308539b45149a4a194
---
 layout/style/crashtests/504311-1.xul    | 24 ++++++++++++++++++++++++
 layout/style/crashtests/crashtests.list |  1 +
 layout/style/nsStyleStruct.cpp          |  3 ++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 layout/style/crashtests/504311-1.xul

diff --git a/layout/style/crashtests/504311-1.xul b/layout/style/crashtests/504311-1.xul
new file mode 100644
index 00000000000..e2d40fa70a0
--- /dev/null
+++ b/layout/style/crashtests/504311-1.xul
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="f()">
+
+	<script type="text/javascript">
+		<![CDATA[
+			function f ()
+			{
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                var tb = document. getElementById ("tb01");
+				var inputField = tb. inputField;
+				var editor = inputField. QueryInterface (Components. interfaces. nsIDOMNSEditableElement). editor;
+				editor = editor. QueryInterface (Components. interfaces. nsIEditor);
+				editor = editor. QueryInterface (Components. interfaces. nsIPlaintextEditor);
+				editor. wrapWidth = -1;
+			}
+		]]>
+	</script>
+	
+	<textbox id="tb01" multiline="true"/>
+
+</window>
diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list
index fe390f391c1..97ebd56f53e 100644
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -39,3 +39,4 @@ load 473914-1.html
 skip load long-url-list-stack-overflow.html # skipped due to being slow (bug 477490)
 load 495269-1.html
 load 495269-2.html
+load 504311-1.xul
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index beaa8ab012e..49eb59a0043 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1873,13 +1873,14 @@ nsStyleText::~nsStyleText(void) { }
 
 nsChangeHint nsStyleText::CalcDifference(const nsStyleText& aOther) const
 {
-  if (mWhiteSpace != aOther.mWhiteSpace) {
+  if (NewlineIsSignificant() != aOther.NewlineIsSignificant()) {
     // This may require construction of suppressed text frames
     return NS_STYLE_HINT_FRAMECHANGE;
   }
 
   if ((mTextAlign != aOther.mTextAlign) ||
       (mTextTransform != aOther.mTextTransform) ||
+      (mWhiteSpace != aOther.mWhiteSpace) ||
       (mWordWrap != aOther.mWordWrap) ||
       (mLetterSpacing != aOther.mLetterSpacing) ||
       (mLineHeight != aOther.mLineHeight) ||

From 328491c8bba43d5001f54a434c80e557c0bf9b34 Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Thu, 30 Jul 2009 15:55:51 +0800
Subject: [PATCH 090/175] Bug 452564 - can't create accessibles for table
 children when visibility style of table is changed, r=ginn.chen, sr=roc

---
 layout/base/nsFrameManager.cpp | 65 ++++++++++++++++++++--------------
 layout/base/nsFrameManager.h   |  3 +-
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp
index ac4a6ebb797..8572d1057eb 100644
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -1082,7 +1082,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
                                       nsIFrame          *aFrame,
                                       nsIContent        *aParentContent,
                                       nsStyleChangeList *aChangeList, 
-                                      nsChangeHint       aMinChange)
+                                      nsChangeHint       aMinChange,
+                                      PRBool             aFireAccessibilityEvents)
 {
   // It would be nice if we could make stronger assertions here; they
   // would let us simplify the ?: expressions below setting |content|
@@ -1146,9 +1147,12 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
       // can't be trusted because it assumes any changes to the parent
       // style context provider will be automatically propagated to
       // the frame(s) with child style contexts.
+
+      // Accessibility: we don't need to fire a11y events for child provider
+      // frame because it is visible or hidden withitn this frame.
       assumeDifferenceHint = ReResolveStyleContext(aPresContext, providerFrame,
                                                    aParentContent, aChangeList,
-                                                   aMinChange);
+                                                   aMinChange, PR_FALSE);
 
       // The provider's new context becomes the parent context of
       // aFrame's context.
@@ -1368,7 +1372,32 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
         }      
       }
     }
-    
+
+    PRBool fireAccessibilityEvents = aFireAccessibilityEvents;
+#ifdef ACCESSIBILITY
+    if (fireAccessibilityEvents && mPresShell->IsAccessibilityActive() &&
+        aFrame->GetStyleVisibility()->IsVisible() != isVisible &&
+        !aFrame->GetPrevContinuation()) {
+      // A significant enough change occured that this part
+      // of the accessible tree is no longer valid. Fire event for primary
+      // frames only and if it wasn't fired for parent frame already.
+
+      // XXX: bug 355521. Visibility does not affect descendents with
+      // visibility set. Work on a separate, accurate mechanism for dealing with
+      // visibility changes.
+      nsCOMPtr<nsIAccessibilityService> accService = 
+        do_GetService("@mozilla.org/accessibilityService;1");
+      if (accService) {
+        PRUint32 event = isVisible ?
+          nsIAccessibleEvent::EVENT_ASYNCH_HIDE :
+          nsIAccessibleEvent::EVENT_ASYNCH_SHOW;
+        accService->InvalidateSubtreeFor(mPresShell, aFrame->GetContent(),
+                                         event);
+        fireAccessibilityEvents = PR_FALSE;
+      }
+    }
+#endif
+
     if (!(aMinChange & nsChangeHint_ReconstructFrame)) {
       
       // There is no need to waste time crawling into a frame's children on a frame change.
@@ -1410,17 +1439,20 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
               ReResolveStyleContext(aPresContext, outOfFlowFrame,
                                     content, aChangeList,
                                     NS_SubtractHint(aMinChange,
-                                                    nsChangeHint_ReflowFrame));
+                                                    nsChangeHint_ReflowFrame),
+                                    fireAccessibilityEvents);
 
               // reresolve placeholder's context under the same parent
               // as the out-of-flow frame
               ReResolveStyleContext(aPresContext, child, content,
-                                    aChangeList, aMinChange);
+                                    aChangeList, aMinChange,
+                                    fireAccessibilityEvents);
             }
             else {  // regular child frame
               if (child != resolvedChild) {
                 ReResolveStyleContext(aPresContext, child, content,
-                                      aChangeList, aMinChange);
+                                      aChangeList, aMinChange,
+                                      fireAccessibilityEvents);
               } else {
                 NOISY_TRACE_FRAME("child frame already resolved as descendant, skipping",aFrame);
               }
@@ -1437,25 +1469,6 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
     newContext->Release();
   }
 
-#ifdef ACCESSIBILITY
-  if (mPresShell->IsAccessibilityActive() &&
-      aFrame->GetStyleVisibility()->IsVisible() != isVisible &&
-      !aFrame->GetPrevContinuation()) { // Primary frames only
-    // XXX Visibility does not affect descendents with visibility set
-    // Work on a separate, accurate mechanism for dealing with visibility changes.
-    // A significant enough change occured that this part
-    // of the accessible tree is no longer valid.
-    nsCOMPtr<nsIAccessibilityService> accService = 
-      do_GetService("@mozilla.org/accessibilityService;1");
-    if (accService) {
-      PRUint32 event = isVisible ?
-        PRUint32(nsIAccessibleEvent::EVENT_ASYNCH_HIDE) :
-        PRUint32(nsIAccessibleEvent::EVENT_ASYNCH_SHOW);
-      accService->InvalidateSubtreeFor(mPresShell, aFrame->GetContent(), event);
-    }
-  }
-#endif
-
   return aMinChange;
 }
 
@@ -1487,7 +1500,7 @@ nsFrameManager::ComputeStyleChangeFor(nsIFrame          *aFrame,
       // Inner loop over next-in-flows of the current frame
       nsChangeHint frameChange =
         ReResolveStyleContext(GetPresContext(), frame, nsnull,
-                              aChangeList, topLevelChange);
+                              aChangeList, topLevelChange, PR_TRUE);
       NS_UpdateHint(topLevelChange, frameChange);
 
       if (topLevelChange & nsChangeHint_ReconstructFrame) {
diff --git a/layout/base/nsFrameManager.h b/layout/base/nsFrameManager.h
index 1fa82778b5e..f706bdd378d 100644
--- a/layout/base/nsFrameManager.h
+++ b/layout/base/nsFrameManager.h
@@ -240,7 +240,8 @@ private:
                           nsIFrame          *aFrame,
                           nsIContent        *aParentContent,
                           nsStyleChangeList *aChangeList, 
-                          nsChangeHint       aMinChange);
+                          nsChangeHint       aMinChange,
+                          PRBool             aFireAccessibilityEvents);
 };
 
 #endif

From ab4778b28d971a674619704de7bb597ccd8c660a Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Thu, 30 Jul 2009 02:27:24 -0700
Subject: [PATCH 091/175] Bug 507023: When inserting fragments into the DOM,
 use ContentAppended notification when possible. r/sr=jst

---
 content/base/src/nsGenericElement.cpp | 106 +++++++++++++++++---------
 1 file changed, 70 insertions(+), 36 deletions(-)

diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 148e049a66b..11ad999a9b2 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -3209,15 +3209,10 @@ nsGenericElement::doInsertChildAt(nsIContent* aKid, PRUint32 aIndex,
     return rv;
   }
 
-  // The kid may have removed its parent from the document, so recheck that
-  // that's still in the document before proceeding.  Also, the kid may have
-  // just removed itself, in which case we don't really want to fire
-  // ContentAppended or a mutation event.
-  // XXXbz What if the kid just moved us in the document?  Scripts suck.  We
-  // really need to stop running them while we're in the middle of modifying
-  // the DOM....
+  NS_ASSERTION(aKid->GetNodeParent() == container,
+               "Did we run script inappropriately?");
 
-  if (aNotify && aKid->GetNodeParent() == container) {
+  if (aNotify) {
     // Note that we always want to call ContentInserted when things are added
     // as kids to documents
     if (aParent && isAppend) {
@@ -3730,7 +3725,7 @@ nsGenericElement::doReplaceOrInsertBefore(PRBool aReplace,
 
   // We want an update batch when we expect several mutations to be performed,
   // which is when we're replacing a node, or when we're inserting a fragment.
-  mozAutoDocConditionalContentUpdateBatch(aDocument,
+  mozAutoDocConditionalContentUpdateBatch batch(aDocument,
     aReplace || nodeType == nsIDOMNode::DOCUMENT_FRAGMENT_NODE);
 
   // If we're replacing
@@ -3768,6 +3763,12 @@ nsGenericElement::doReplaceOrInsertBefore(PRBool aReplace,
   if (nodeType == nsIDOMNode::DOCUMENT_FRAGMENT_NODE) {
     PRUint32 count = newContent->GetChildCount();
 
+    if (!count) {
+      returnVal.swap(*aReturn);
+
+      return NS_OK;
+    }
+
     // Copy the children into a separate array to avoid having to deal with
     // mutations to the fragment while we're inserting.
     nsCOMArray<nsIContent> fragChildren;
@@ -3793,25 +3794,12 @@ nsGenericElement::doReplaceOrInsertBefore(PRBool aReplace,
       mutated = mutated || guard.Mutated(1);
     }
 
-    // Iterate through the fragment's children, and insert them in the new
-    // parent
-    for (i = 0; i < count; ++i) {
-      // Get the n:th child from the array.
-      nsIContent* childContent = fragChildren[i];
-
-      // If we've had any unexpeted mutations so far we need to recheck that
-      // the child can still be inserted.
-      if (mutated) {
-        // We really only need to update insPos if we *just* got an unexpected
-        // mutation as opposed to 3 insertions ago. But this is an edgecase so
-        // no need to over optimize.
-        insPos = refContent ? container->IndexOf(refContent) :
-                              container->GetChildCount();
-        if (insPos < 0) {
-          // Someone seriously messed up the childlist. We have no idea
-          // where to insert the remaining children, so just bail.
-          return NS_ERROR_DOM_NOT_FOUND_ERR;
-        }
+    // If we've had any unexpeted mutations so far we need to recheck that
+    // the child can still be inserted.
+    if (mutated) {
+      for (i = 0; i < count; ++i) {
+        // Get the n:th child from the array.
+        nsIContent* childContent = fragChildren[i];
 
         nsCOMPtr<nsIDOMNode> tmpNode = do_QueryInterface(childContent);
         PRUint16 tmpType = 0;
@@ -3824,18 +3812,64 @@ nsGenericElement::doReplaceOrInsertBefore(PRBool aReplace,
         }
       }
 
-      nsMutationGuard guard;
+      insPos = refContent ? container->IndexOf(refContent) :
+                            container->GetChildCount();
+      if (insPos < 0) {
+        // Someone seriously messed up the childlist. We have no idea
+        // where to insert the remaining children, so just bail.
+        return NS_ERROR_DOM_NOT_FOUND_ERR;
+      }
+    }
+
+    PRBool appending = aParent && (insPos == container->GetChildCount());
+    PRBool firstInsPos = insPos;
+
+    // Iterate through the fragment's children, and insert them in the new
+    // parent
+    for (i = 0; i < count; ++i, ++insPos) {
+      nsIContent* childContent = fragChildren[i];
 
       // XXXbz how come no reparenting here?  That seems odd...
       // Insert the child.
-      res = container->InsertChildAt(childContent, insPos, PR_TRUE);
-      NS_ENSURE_SUCCESS(res, res);
+      res = container->InsertChildAt(childContent, insPos, PR_FALSE);
+      if (NS_FAILED(res)) {
+        // Make sure to notify on any children that we did succeed to insert
+        if (appending && i != 0) {
+          nsNodeUtils::ContentAppended(aParent, firstInsPos);
+        }
+        return res;
+      }
 
-      // Check to see if any evil mutation events mucked around with the
-      // child list.
-      mutated = mutated || guard.Mutated(1);
-      
-      ++insPos;
+      if (!appending) {
+        nsNodeUtils::ContentInserted(container, childContent, insPos);
+      }
+    }
+
+    // Notify
+    if (appending) {
+      nsNodeUtils::ContentAppended(aParent, firstInsPos);
+    }
+
+    // Fire mutation events. Optimize for the case when there are no listeners
+    nsIDocument* doc = container->GetOwnerDoc();
+    nsPIDOMWindow* window = nsnull;
+    if (doc && (window = doc->GetInnerWindow()) &&
+        window->HasMutationListeners(NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
+
+      for (i = 0; i < count; ++i, ++insPos) {
+        nsIContent* childContent = fragChildren[i];
+
+        if (nsContentUtils::HasMutationListeners(childContent,
+              NS_EVENT_BITS_MUTATION_NODEINSERTED, container)) {
+          mozAutoRemovableBlockerRemover blockerRemover;
+
+          nsMutationEvent mutation(PR_TRUE, NS_MUTATION_NODEINSERTED);
+          mutation.mRelatedNode = do_QueryInterface(container);
+
+          mozAutoSubtreeModified subtree(container->GetOwnerDoc(), container);
+          nsEventDispatcher::Dispatch(childContent, nsnull, &mutation);
+        }
+      }
     }
   }
   else {

From 6c670f11899de9896df99379636ef75a936067af Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 22:06:02 +1200
Subject: [PATCH 092/175] Backed out changeset c353fe809be0

---
 layout/generic/nsContainerFrame.cpp    |  9 ++++---
 layout/generic/nsFrame.cpp             |  9 +++++++
 layout/generic/nsIFrame.h              |  8 ++++--
 layout/xul/base/src/nsBoxFrame.cpp     | 12 +++++++++
 layout/xul/base/src/nsDeckFrame.h      |  4 +++
 layout/xul/base/src/nsLeafBoxFrame.cpp | 12 +++++++++
 view/public/nsIViewManager.h           |  7 +----
 view/src/nsView.cpp                    | 37 +++++++-------------------
 view/src/nsView.h                      |  4 ---
 view/src/nsViewManager.cpp             | 25 ++++++++++++++---
 10 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index 58f7a791ad9..f6f1423077b 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -617,10 +617,11 @@ nsContainerFrame::SyncFrameViewProperties(nsPresContext*  aPresContext,
 
     if (!aStyleContext->GetStyleVisibility()->IsVisible() &&
         !aFrame->SupportsVisibilityHidden()) {
-      // If it's a subdocument frame or a plugin, hide the view and
-      // any associated widget.
-      // These are leaf elements so this is OK, no descendant can be
-      // visibility:visible.
+      // If it's a scrollable frame that can't hide its scrollbars,
+      // hide the view. This means that child elements can't override
+      // their parent's visibility, but it's not practical to leave it
+      // visible in all cases because the scrollbars will be showing
+      // XXXldb Does the view system really enforce this correctly?
       viewIsVisible = PR_FALSE;
     } else if (IsMenuPopup(aFrame)) {
       // if the view is for a popup, don't show the view if the popup is closed
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 6168c7ed0ad..0d69168a530 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -6717,6 +6717,15 @@ nsFrame::SetParent(const nsIFrame* aParent)
   else if (wasBoxWrapped && !IsBoxWrapped())
     DeleteProperty(nsGkAtoms::boxMetricsProperty);
 
+  if (aParent && aParent->IsBoxFrame()) {
+    if (aParent->ChildrenMustHaveWidgets()) {
+        nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
+        nsIView* view = GetView();
+        if (!view->HasWidget())
+          CreateWidgetForView(view);
+    }
+  }
+
   return NS_OK;
 }
 
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 6bea51a15af..def82baab31 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -107,9 +107,10 @@ struct nsMargin;
 typedef class nsIFrame nsIBox;
 
 // IID for the nsIFrame interface
+// 7b437d20-a34e-11dd-ad8b-0800200c9a66
 #define NS_IFRAME_IID \
-  { 0x7e9018b5, 0x5405, 0x4e2b, \
-    { 0x87, 0x67, 0xe2, 0xb4, 0xb1, 0x3e, 0xc1, 0x69 } }
+  { 0x7b437d20, 0xa34e, 0x11dd, \
+    { 0xad, 0x8b, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66 } }
 
 /**
  * Indication of how the frame can be split. This is used when doing runaround
@@ -2285,6 +2286,9 @@ NS_PTR_TO_INT32(frame->GetProperty(nsGkAtoms::embeddingLevel))
   NS_IMETHOD DumpBox(FILE* out)=0;
 #endif
 
+  // Only nsDeckFrame requires that all its children have widgets
+  virtual PRBool ChildrenMustHaveWidgets() const { return PR_FALSE; }
+
   /**
    * @return PR_TRUE if this text frame ends with a newline character.  It
    * should return PR_FALSE if this is not a text frame.
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index fe6bd386ca0..5b2e4cefb11 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -205,6 +205,18 @@ nsBoxFrame::Init(nsIContent*      aContent,
 
   MarkIntrinsicWidthsDirty();
 
+  // see if we need a widget
+  if (aParent && aParent->IsBoxFrame()) {
+    if (aParent->ChildrenMustHaveWidgets()) {
+        rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        nsIView* view = GetView();
+        if (!view->HasWidget())
+           view->CreateWidget(kWidgetCID);   
+    }
+  }
+
   CacheAttributes();
 
 #ifdef DEBUG_LAYOUT
diff --git a/layout/xul/base/src/nsDeckFrame.h b/layout/xul/base/src/nsDeckFrame.h
index 6fe832a83a0..741ba5315c1 100644
--- a/layout/xul/base/src/nsDeckFrame.h
+++ b/layout/xul/base/src/nsDeckFrame.h
@@ -75,6 +75,10 @@ public:
 
   virtual nsIAtom* GetType() const;
 
+#ifndef MOZ_GFX_OPTIMIZE_MOBILE
+  virtual PRBool ChildrenMustHaveWidgets() const { return PR_TRUE; }
+#endif
+
 #ifdef NS_DEBUG
   NS_IMETHOD GetFrameName(nsAString& aResult) const
   {
diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/base/src/nsLeafBoxFrame.cpp
index 07448fe5743..dec1019d00c 100644
--- a/layout/xul/base/src/nsLeafBoxFrame.cpp
+++ b/layout/xul/base/src/nsLeafBoxFrame.cpp
@@ -98,6 +98,18 @@ nsLeafBoxFrame::Init(
   nsresult  rv = nsLeafFrame::Init(aContent, aParent, aPrevInFlow);
   NS_ENSURE_SUCCESS(rv, rv);
 
+   // see if we need a widget
+  if (aParent && aParent->IsBoxFrame()) {
+    if (aParent->ChildrenMustHaveWidgets()) {
+        rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE); 
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        nsIView* view = GetView();
+        if (!view->HasWidget())
+           view->CreateWidget(kWidgetCID);   
+    }
+  }
+  
   mMouseThrough = unset;
 
   UpdateMouseThrough();
diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h
index ec4825e4c1b..840421b5e4f 100644
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@@ -256,12 +256,7 @@ public:
                          PRBool aRepaintExposedAreaOnly = PR_FALSE) = 0;
 
   /**
-   * Set the visibility of a view. Hidden views have the effect of hiding
-   * their descendants as well. This does not affect painting, so layout
-   * is responsible for ensuring that content in hidden views is not
-   * painted nor handling events. It does affect the visibility of widgets;
-   * if a view is hidden, descendant views with widgets have their widgets
-   * hidden.
+   * Set the visibility of a view.
    * The view manager generates the appropriate dirty regions.
    * @param aView view to change visibility state of
    * @param visible new visibility state
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 1fff95629f5..228e74597f2 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -52,6 +52,7 @@ static nsEventStatus HandleEvent(nsGUIEvent *aEvent);
 
 
 //#define SHOW_VIEW_BORDERS
+//#define HIDE_ALL_WIDGETS
 
 // {34297A07-A8FD-d811-87C6-000244212BCB}
 #define VIEW_WRAPPER_IID \
@@ -337,15 +338,6 @@ void nsView::ResetWidgetBounds(PRBool aRecurse, PRBool aMoveOnly,
   }
 }
 
-PRBool nsView::IsEffectivelyVisible()
-{
-  for (nsView* v = this; v; v = v->mParent) {
-    if (v->GetVisibility() == nsViewVisibility_kHide)
-      return PR_FALSE;
-  }
-  return PR_TRUE;
-}
-
 nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
 {
   nsCOMPtr<nsIDeviceContext> dx;
@@ -362,7 +354,7 @@ nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
     viewBounds += offset;
 
     if (parentWidget && aType == eWindowType_popup &&
-        IsEffectivelyVisible()) {
+        mVis == nsViewVisibility_kShow) {
       nsIntPoint screenPoint = parentWidget->WidgetToScreenOffset();
       viewBounds += nsPoint(NSIntPixelsToAppUnits(screenPoint.x, p2a),
                             NSIntPixelsToAppUnits(screenPoint.y, p2a));
@@ -441,38 +433,29 @@ void nsView::SetDimensions(const nsRect& aRect, PRBool aPaint, PRBool aResizeWid
   }
 }
 
-void nsView::NotifyEffectiveVisibilityChanged(PRBool aEffectivelyVisible)
+NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility)
 {
-  if (!aEffectivelyVisible)
+
+  mVis = aVisibility;
+
+  if (aVisibility == nsViewVisibility_kHide)
   {
     DropMouseGrabbing();
   }
 
   if (nsnull != mWindow)
   {
-    if (aEffectivelyVisible)
+#ifndef HIDE_ALL_WIDGETS
+    if (mVis == nsViewVisibility_kShow)
     {
       DoResetWidgetBounds(PR_FALSE, PR_TRUE);
       mWindow->Show(PR_TRUE);
     }
     else
+#endif
       mWindow->Show(PR_FALSE);
   }
 
-  for (nsView* child = mFirstChild; child; child = child->mNextSibling) {
-    if (child->mVis == nsViewVisibility_kHide) {
-      // It was effectively hidden and still is
-      continue;
-    }
-    // Our child is visible if we are
-    child->NotifyEffectiveVisibilityChanged(aEffectivelyVisible);
-  }
-}
-
-NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility)
-{
-  mVis = aVisibility;
-  NotifyEffectiveVisibilityChanged(IsEffectivelyVisible());
   return NS_OK;
 }
 
diff --git a/view/src/nsView.h b/view/src/nsView.h
index ad12aa1dade..8baf66500c5 100644
--- a/view/src/nsView.h
+++ b/view/src/nsView.h
@@ -166,8 +166,6 @@ public:
   void SetPositionIgnoringChildWidgets(nscoord aX, nscoord aY);
   nsresult LoadWidget(const nsCID &aClassIID);
 
-  void NotifyEffectiveVisibilityChanged(PRBool aEffectivelyVisible);
-
   // Update the cached RootViewManager for all view manager descendents,
   // If the hierarchy is being removed, aViewManagerParent points to the view
   // manager for the hierarchy's old parent, and will have its mouse grab
@@ -195,8 +193,6 @@ public:
 
   nsIntRect CalcWidgetBounds(nsWindowType aType);
 
-  PRBool IsEffectivelyVisible();
-
 protected:
   // Do the actual work of ResetWidgetBounds, unconditionally.  Don't
   // call this method if we have no widget.
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index eebb505cf6b..440ddfd1b3f 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -110,8 +110,14 @@ public:
 
 static PRBool IsViewVisible(nsView *aView)
 {
-  if (!aView->IsEffectivelyVisible())
-    return PR_FALSE;
+  for (nsIView *view = aView; view; view = view->GetParent()) {
+    // We don't check widget visibility here because in the future (with
+    // the better approach to this that's in attachment 160801 on bug
+    // 227361), callers of the equivalent to this function should be able
+    // to rely on being notified when the result of this function changes.
+    if (view->GetVisibility() == nsViewVisibility_kHide)
+      return PR_FALSE;
+  }
 
   // Find out if the root view is visible by asking the view observer
   // (this won't be needed anymore if we link view trees across chrome /
@@ -1225,7 +1231,8 @@ NS_IMETHODIMP nsViewManager::GrabMouseEvents(nsIView *aView, PRBool &aResult)
 
   // Along with nsView::SetVisibility, we enforce that the mouse grabber
   // can never be a hidden view.
-  if (aView && static_cast<nsView*>(aView)->IsEffectivelyVisible()) {
+  if (aView && static_cast<nsView*>(aView)->GetVisibility()
+               == nsViewVisibility_kHide) {
     aView = nsnull;
   }
 
@@ -1580,6 +1587,16 @@ NS_IMETHODIMP nsViewManager::SetViewVisibility(nsIView *aView, nsViewVisibility
         }
       }
     }
+
+    // Any child views not associated with frames might not get their visibility
+    // updated, so propagate our visibility to them. This is important because
+    // hidden views should have all hidden children.
+    for (nsView* childView = view->GetFirstChild(); childView;
+         childView = childView->GetNextSibling()) {
+      if (!childView->GetClientData()) {
+        childView->SetVisibility(aVisible);
+      }
+    }
   }
   return NS_OK;
 }
@@ -1950,7 +1967,7 @@ NS_IMETHODIMP nsViewManager::GetRectVisibility(nsIView *aView,
   }
 
   // is this view even visible?
-  if (!view->IsEffectivelyVisible()) {
+  if (view->GetVisibility() == nsViewVisibility_kHide) {
     return NS_OK; 
   }
 

From 10a8f3cf0bacef74107a4399d7446d58c86fb665 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 30 Jul 2009 11:01:01 -0400
Subject: [PATCH 093/175] Backed out changeset 03c40c5a2d4b (bug 505988) to fix
 password manager test orange.

--HG--
extra : rebase_source : c88519859e51b9d49d0f2269085dbb17edabd1c1
---
 js/src/xpconnect/src/xpcprivate.h             |  9 ++-
 js/src/xpconnect/src/xpcvariant.cpp           | 69 ++++++++++---------
 js/src/xpconnect/tests/mochitest/Makefile.in  |  1 -
 .../tests/mochitest/test_bug384632.html       | 32 ---------
 4 files changed, 41 insertions(+), 70 deletions(-)
 delete mode 100644 js/src/xpconnect/tests/mochitest/test_bug384632.html

diff --git a/js/src/xpconnect/src/xpcprivate.h b/js/src/xpconnect/src/xpcprivate.h
index 59db7a8afcc..2ce45487d1b 100644
--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/src/xpconnect/src/xpcprivate.h
@@ -4007,7 +4007,7 @@ public:
 
     jsval GetJSVal() const {return mJSVal;}
 
-    XPCVariant(XPCCallContext& ccx, jsval aJSVal);
+    XPCVariant(jsval aJSVal);
 
     /**
      * Convert a variant into a jsval.
@@ -4032,7 +4032,6 @@ protected:
 protected:
     nsDiscriminatedUnion mData;
     jsval                mJSVal;
-    JSBool               mReturnRawObject;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(XPCVariant, XPCVARIANT_IID)
@@ -4041,10 +4040,10 @@ class XPCTraceableVariant: public XPCVariant,
                            public XPCRootSetElem
 {
 public:
-    XPCTraceableVariant(XPCCallContext& ccx, jsval aJSVal)
-        : XPCVariant(ccx, aJSVal)
+    XPCTraceableVariant(XPCJSRuntime *runtime, jsval aJSVal)
+        : XPCVariant(aJSVal)
     {
-        ccx.GetRuntime()->AddVariantRoot(this);
+        runtime->AddVariantRoot(this);
     }
 
     virtual ~XPCTraceableVariant();
diff --git a/js/src/xpconnect/src/xpcvariant.cpp b/js/src/xpconnect/src/xpcvariant.cpp
index 6a5f0f6955c..9ce012e82e1 100644
--- a/js/src/xpconnect/src/xpcvariant.cpp
+++ b/js/src/xpconnect/src/xpcvariant.cpp
@@ -55,26 +55,10 @@ NS_IMPL_CI_INTERFACE_GETTER2(XPCVariant, XPCVariant, nsIVariant)
 NS_IMPL_CYCLE_COLLECTING_ADDREF(XPCVariant)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(XPCVariant)
 
-XPCVariant::XPCVariant(XPCCallContext& ccx, jsval aJSVal)
+XPCVariant::XPCVariant(jsval aJSVal)
     : mJSVal(aJSVal)
 {
     nsVariant::Initialize(&mData);
-    if(!JSVAL_IS_PRIMITIVE(mJSVal))
-    {
-        // If the incoming object is an XPCWrappedNative, then it could be a
-        // double-wrapped object, and we should return the double-wrapped
-        // object back out to script.
-
-        JSObject* proto;
-        XPCWrappedNative* wn =
-            XPCWrappedNative::GetWrappedNativeOfJSObject(ccx,
-                                                         JSVAL_TO_OBJECT(mJSVal),
-                                                         nsnull,
-                                                         &proto);
-        mReturnRawObject = !wn && !proto;
-    }
-    else
-        mReturnRawObject = JS_FALSE;
 }
 
 XPCTraceableVariant::~XPCTraceableVariant()
@@ -135,9 +119,9 @@ XPCVariant* XPCVariant::newVariant(XPCCallContext& ccx, jsval aJSVal)
     XPCVariant* variant;
 
     if(!JSVAL_IS_TRACEABLE(aJSVal))
-        variant = new XPCVariant(ccx, aJSVal);
+        variant = new XPCVariant(aJSVal);
     else
-        variant = new XPCTraceableVariant(ccx, aJSVal);
+        variant = new XPCTraceableVariant(ccx.GetRuntime(), aJSVal);
 
     if(!variant)
         return nsnull;
@@ -417,15 +401,6 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
             return JS_TRUE;
         }
 
-        if(xpcvariant->mReturnRawObject)
-        {
-            NS_ASSERTION(type == nsIDataType::VTYPE_INTERFACE ||
-                         type == nsIDataType::VTYPE_INTERFACE_IS,
-                         "Weird variant");
-            *pJSVal = realVal;
-            return JS_TRUE;
-        }
-
         // else, it's an object and we really need to double wrap it if we've 
         // already decided that its 'natural' type is as some sort of interface.
         
@@ -666,10 +641,40 @@ VARIANT_DONE:
     }
     else
     {
-        success = XPCConvert::NativeData2JS(ccx, pJSVal,
-                                            (const void*)&xpctvar.val,
-                                            xpctvar.type,
-                                            &iid, scope, pErr);
+        // Last ditch check to prevent us from double-wrapping a regular JS
+        // object. This allows us to unwrap regular JS objects (since we
+        // normally can't double wrap them). See bug 384632.
+        *pJSVal = JSVAL_VOID;
+        if(type == nsIDataType::VTYPE_INTERFACE ||
+           type == nsIDataType::VTYPE_INTERFACE_IS)
+        {
+            nsISupports *src = reinterpret_cast<nsISupports *>(xpctvar.val.p);
+            if(nsXPCWrappedJSClass::IsWrappedJS(src))
+            {
+                // First QI the wrapper to the right interface.
+                nsCOMPtr<nsISupports> wrapper;
+                nsresult rv = src->QueryInterface(iid, getter_AddRefs(wrapper));
+                NS_ENSURE_SUCCESS(rv, JS_FALSE);
+
+                // Now, get the actual JS object out of the wrapper.
+                nsCOMPtr<nsIXPConnectJSObjectHolder> holder =
+                    do_QueryInterface(wrapper);
+                NS_ENSURE_TRUE(holder, JS_FALSE);
+
+                JSObject *obj;
+                holder->GetJSObject(&obj);
+                NS_ASSERTION(obj, "No JS object but the QIs above succeeded?");
+                *pJSVal = OBJECT_TO_JSVAL(obj);
+                success = JS_TRUE;
+            }
+        }
+        if(!JSVAL_IS_OBJECT(*pJSVal))
+        {
+            success = XPCConvert::NativeData2JS(ccx, pJSVal,
+                                                (const void*)&xpctvar.val,
+                                                xpctvar.type,
+                                                &iid, scope, pErr);
+        }
     }
 
     if(xpctvar.IsValAllocated())
diff --git a/js/src/xpconnect/tests/mochitest/Makefile.in b/js/src/xpconnect/tests/mochitest/Makefile.in
index 90ed8ade38b..3ff1465c03e 100644
--- a/js/src/xpconnect/tests/mochitest/Makefile.in
+++ b/js/src/xpconnect/tests/mochitest/Makefile.in
@@ -47,7 +47,6 @@ include $(topsrcdir)/config/rules.mk
 _TEST_FILES =	bug500931_helper.html \
 		inner.html \
 		test_bug361111.xul \
-		test_bug384632.html \
 		test_bug390488.html \
 		test_bug393269.html \
 		test_bug396851.html \
diff --git a/js/src/xpconnect/tests/mochitest/test_bug384632.html b/js/src/xpconnect/tests/mochitest/test_bug384632.html
deleted file mode 100644
index 7cdc397adb4..00000000000
--- a/js/src/xpconnect/tests/mochitest/test_bug384632.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=384632
--->
-<head>
-  <title>Test for Bug 384632</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/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=384632">Mozilla Bug 384632</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 384632 **/
-var div = $('content');
-var obj = {};
-div.setUserData("foopy", obj, function() {});
-ok(div.getUserData("foopy") === obj, "getUserData works with regular objects");
-div.setUserData("foopy1", sidebar, function() {});
-ok(div.getUserData("foopy1") === sidebar, "getUserData works with bizarre objects");
-
-</script>
-</pre>
-</body>
-</html>

From 99d7533837dfbfecf8362112a5196deed4588116 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Thu, 30 Jul 2009 08:48:48 -0700
Subject: [PATCH 094/175] Disable these two randomly crashing tests until bug
 506042 is fixed and we can get stacks from the crashes.

---
 .../places/tests/unit/test_browserGlue_corrupt_nobackup.js | 7 ++++++-
 .../unit/test_browserGlue_corrupt_nobackup_default.js      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup.js b/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup.js
index 084ea5ba8f4..27a93b5085e 100644
--- a/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup.js
+++ b/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup.js
@@ -67,9 +67,14 @@ var observer = {
     }
   }
 };
-os.addObserver(observer, NS_PLACES_INIT_COMPLETE_TOPIC, false);
 
 function run_test() {
+  // XXX bug 507199
+  // This test is temporarily disabled!
+  return;
+
+  os.addObserver(observer, NS_PLACES_INIT_COMPLETE_TOPIC, false);
+
   // Create bookmarks.html in the profile.
   create_bookmarks_html("bookmarks.glue.html");
   // Remove JSON backup from profile.
diff --git a/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js b/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js
index a8f0b5efad6..c08482dc3d1 100644
--- a/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js
+++ b/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js
@@ -67,9 +67,14 @@ var observer = {
     }
   }
 };
-os.addObserver(observer, NS_PLACES_INIT_COMPLETE_TOPIC, false);
 
 function run_test() {
+  // XXX bug 507199
+  // This test is temporarily disabled!
+  return;
+
+  os.addObserver(observer, NS_PLACES_INIT_COMPLETE_TOPIC, false);
+
   // Remove bookmarks.html from profile.
   remove_bookmarks_html();
   // Remove JSON backup from profile.

From 2872bf24b68008b4fcec1c65edeab02b97960f49 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 30 Jul 2009 11:53:36 -0400
Subject: [PATCH 095/175] Bug 496500.  Don't try to interrupt on lines we're
 not actually reflowing, since during a resize on Windows HasPendingInputEvent
 returns true while the mouse is down.  r+sr=roc

---
 layout/generic/nsBlockFrame.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index c61f89eed78..3c683005189 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -1978,6 +1978,11 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
       // to be reflowed, so this computation of deltaY will not be
       // used.
       deltaY = line->mBounds.YMost() - oldYMost;
+
+      // Now do an interrupt check. We want to do this only in the case when we
+      // actually reflow the line, so that if we get back in here we'll get
+      // further on the reflow before interrupting.
+      aState.mPresContext->CheckForInterrupt(this);
     } else {
       aState.mOverflowTracker.Skip(line->mFirstChild, aState.mReflowStatus);
         // Nop except for blocks (we don't create overflow container
@@ -2044,7 +2049,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
 
     DumpLine(aState, line, deltaY, -1);
 
-    if (aState.mPresContext->CheckForInterrupt(this)) {
+    if (aState.mPresContext->HasPendingInterrupt()) {
       willReflowAgain = PR_TRUE;
       // Another option here might be to leave |line| clean if
       // !HasPendingInterrupt() before the CheckForInterrupt() call, since in

From 39072906a0a86fcfd03035b12c33396a9d119de1 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 30 Jul 2009 13:23:32 -0400
Subject: [PATCH 096/175] Bug 281387.  Make nsIFrame::Append/InsertFrames use
 nsFrameList.  r=bernd,roc, sr=dbaron

---
 layout/base/nsBidiPresUtils.cpp               |  20 +-
 layout/base/nsCSSFrameConstructor.cpp         |  63 ++---
 layout/base/nsFrameManager.cpp                |   2 +-
 layout/base/nsFrameManager.h                  |   4 +-
 layout/forms/nsFieldSetFrame.cpp              |  42 ++--
 layout/forms/nsHTMLButtonControlFrame.cpp     |   4 +-
 layout/forms/nsHTMLButtonControlFrame.h       |   4 +-
 layout/generic/nsAbsoluteContainingBlock.cpp  |   4 +-
 layout/generic/nsAbsoluteContainingBlock.h    |   4 +-
 layout/generic/nsBlockFrame.cpp               |  34 +--
 layout/generic/nsBlockFrame.h                 |   4 +-
 layout/generic/nsColumnSetFrame.cpp           |   8 +-
 layout/generic/nsContainerFrame.cpp           |   8 +-
 layout/generic/nsContainerFrame.h             |   4 +-
 layout/generic/nsFrame.cpp                    |   4 +-
 layout/generic/nsFrame.h                      |   4 +-
 layout/generic/nsFrameList.h                  |  32 ++-
 layout/generic/nsGfxScrollFrame.cpp           |   8 +-
 layout/generic/nsGfxScrollFrame.h             |   8 +-
 layout/generic/nsHTMLFrame.cpp                |  12 +-
 layout/generic/nsIFrame.h                     |  22 +-
 layout/generic/nsInlineFrame.cpp              |   4 +-
 layout/generic/nsInlineFrame.h                |   4 +-
 layout/generic/nsViewportFrame.cpp            |   4 +-
 layout/generic/nsViewportFrame.h              |   4 +-
 layout/mathml/nsMathMLContainerFrame.cpp      |  20 +-
 layout/mathml/nsMathMLContainerFrame.h        |  12 +-
 layout/mathml/nsMathMLForeignFrameWrapper.h   |   4 +-
 layout/mathml/nsMathMLmtableFrame.h           |   8 +-
 layout/svg/base/src/nsSVGContainerFrame.cpp   |  24 +-
 layout/svg/base/src/nsSVGContainerFrame.h     |   6 +-
 .../svg/base/src/nsSVGTextContainerFrame.cpp  |   2 +-
 layout/svg/base/src/nsSVGTextContainerFrame.h |   2 +-
 layout/tables/nsTableCellFrame.cpp            |   4 +-
 layout/tables/nsTableCellFrame.h              |   4 +-
 layout/tables/nsTableColGroupFrame.cpp        |  96 ++++----
 layout/tables/nsTableColGroupFrame.h          |  31 ++-
 layout/tables/nsTableFrame.cpp                | 218 +++++++-----------
 layout/tables/nsTableFrame.h                  |  31 +--
 layout/tables/nsTableOuterFrame.cpp           |  12 +-
 layout/tables/nsTableOuterFrame.h             |   4 +-
 layout/tables/nsTableRowFrame.cpp             |  20 +-
 layout/tables/nsTableRowFrame.h               |   4 +-
 layout/tables/nsTableRowGroupFrame.cpp        |  22 +-
 layout/tables/nsTableRowGroupFrame.h          |   4 +-
 layout/xul/base/src/grid/nsGridLayout2.cpp    |   5 +-
 layout/xul/base/src/grid/nsGridLayout2.h      |   5 +-
 layout/xul/base/src/grid/nsGridRowLayout.cpp  |   7 +-
 layout/xul/base/src/grid/nsGridRowLayout.h    |   7 +-
 layout/xul/base/src/nsBoxFrame.cpp            |  13 +-
 layout/xul/base/src/nsBoxFrame.h              |   4 +-
 layout/xul/base/src/nsBoxLayout.cpp           |   7 +-
 layout/xul/base/src/nsBoxLayout.h             |   7 +-
 layout/xul/base/src/nsIBoxLayout.h            |  15 +-
 layout/xul/base/src/nsListBoxBodyFrame.cpp    |  14 +-
 layout/xul/base/src/nsListBoxBodyFrame.h      |   4 +-
 layout/xul/base/src/nsMenuFrame.cpp           |  29 +--
 layout/xul/base/src/nsMenuFrame.h             |  11 +-
 layout/xul/base/src/nsPopupSetFrame.cpp       |  10 +-
 layout/xul/base/src/nsPopupSetFrame.h         |   4 +-
 layout/xul/base/src/nsRootBoxFrame.cpp        |   8 +-
 layout/xul/base/src/nsSliderFrame.cpp         |   4 +-
 layout/xul/base/src/nsSliderFrame.h           |   4 +-
 63 files changed, 479 insertions(+), 518 deletions(-)

diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index 821af7aaad4..27ca3f726a5 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -132,19 +132,23 @@ SplitInlineAncestors(nsIFrame*     aFrame)
     
     // The new parent adopts the new frame
     frame->SetNextSibling(nsnull);
-    rv = newParent->InsertFrames(nsGkAtoms::nextBidi, nsnull, newFrame);
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
+    // XXXbz this thing should be rewritten on top of nsFrameList on a
+    // much higher level...
+    nsFrameList temp(newFrame);
 
     // Reparent views as necessary
-    rv = nsHTMLContainerFrame::ReparentFrameViewList(presContext, newFrame, parent, newParent);
+    rv = nsHTMLContainerFrame::ReparentFrameViewList(presContext, temp, parent, newParent);
     if (NS_FAILED(rv)) {
       return rv;
     }
     
+    rv = newParent->InsertFrames(nsGkAtoms::nextBidi, nsnull, temp);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
     // The list name nsGkAtoms::nextBidi would indicate we don't want reflow
-    rv = grandparent->InsertFrames(nsGkAtoms::nextBidi, parent, newParent);
+    nsFrameList temp2(newParent);
+    rv = grandparent->InsertFrames(nsGkAtoms::nextBidi, parent, temp2);
     if (NS_FAILED(rv)) {
       return rv;
     }
@@ -204,7 +208,9 @@ CreateBidiContinuation(nsIFrame*       aFrame,
   }
   
   // The list name nsGkAtoms::nextBidi would indicate we don't want reflow
-  rv = parent->InsertFrames(nsGkAtoms::nextBidi, aFrame, *aNewFrame);
+  // XXXbz this needs higher-level framelist love
+  nsFrameList temp(*aNewFrame);
+  rv = parent->InsertFrames(nsGkAtoms::nextBidi, aFrame, temp);
   if (NS_FAILED(rv)) {
     return rv;
   }
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 50018c46959..3b5ff43ea22 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -1256,8 +1256,7 @@ nsFrameConstructorState::ProcessFrameInsertions(nsAbsoluteItems& aFrameItems,
     }
 
     rv = containingBlock->InsertFrames(aChildListName, insertionPoint,
-                                       firstNewFrame);
-    aFrameItems.Clear();
+                                       aFrameItems);
   }
 
   NS_POSTCONDITION(aFrameItems.IsEmpty(), "How did that happen?");
@@ -2432,6 +2431,8 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIContent*              aDocEle
                   "No viewport?  Someone forgot to call ConstructRootFrame!");
   NS_PRECONDITION(mFixedContainingBlock == mPresShell->FrameManager()->GetRootFrame(),
                   "Unexpected mFixedContainingBlock");
+  NS_PRECONDITION(!mDocElementContainingBlock,
+                  "Shouldn't have a doc element containing block here");
 
   *aNewFrame = nsnull;
 
@@ -2645,7 +2646,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIContent*              aDocEle
     contentFrame->SetInitialChildList(nsnull, childItems);
   }
 
-  mDocElementContainingBlock->AppendFrames(nsnull, *aNewFrame);
+  SetInitialSingleChild(mDocElementContainingBlock, *aNewFrame);
 
   return NS_OK;
 }
@@ -2933,10 +2934,11 @@ nsCSSFrameConstructor::SetUpDocElementContainingBlock(nsIContent* aDocElement)
     mHasRootAbsPosContainingBlock = PR_TRUE;
   }
 
+  nsFrameList newFrameList(newFrame);
   if (viewportFrame->GetStateBits() & NS_FRAME_FIRST_REFLOW) {
-    SetInitialSingleChild(viewportFrame, newFrame);
+    viewportFrame->SetInitialChildList(nsnull, newFrameList);
   } else {
-    viewportFrame->AppendFrames(nsnull, newFrame);
+    viewportFrame->AppendFrames(nsnull, newFrameList);
   }
 
   return NS_OK;
@@ -3149,7 +3151,7 @@ nsCSSFrameConstructor::ConstructButtonFrame(nsFrameConstructorState& aState,
     if (anonymousChildItems.NotEmpty()) {
       // the anonymous content is already parented to the area frame
       aState.mFrameManager->AppendFrames(blockFrame, nsnull,
-                                         anonymousChildItems.FirstChild());
+                                         anonymousChildItems);
     }
   }
 
@@ -4383,7 +4385,8 @@ void
 nsCSSFrameConstructor::FinishBuildingScrollFrame(nsIFrame* aScrollFrame,
                                                  nsIFrame* aScrolledFrame)
 {
-  aScrollFrame->AppendFrames(nsnull, aScrolledFrame);
+  nsFrameList scrolled(aScrolledFrame);
+  aScrollFrame->AppendFrames(nsnull, scrolled);
 
   // force the scrolled frame to have a view. The view will be parented to
   // the correct anonymous inner view because the scrollframes override
@@ -5755,7 +5758,7 @@ nsCSSFrameConstructor::AppendFrames(nsFrameConstructorState&       aState,
   
   // Insert the frames after out aPrevSibling
   return aState.mFrameManager->InsertFrames(aParentFrame, nsnull, aPrevSibling,
-                                            aFrameList.FirstChild());
+                                            aFrameList);
 }
 
 #define UNSET_DISPLAY 255
@@ -6417,9 +6420,8 @@ nsCSSFrameConstructor::ContentAppended(nsIContent*     aContainer,
       NS_ASSERTION(nsGkAtoms::tableFrame == frameType, "how did that happen?");
       nsIFrame* outerTable = parentFrame->GetParent();
       if (outerTable) {
-        state.mFrameManager->AppendFrames(outerTable,
-                                          nsGkAtoms::captionList,
-                                          captionItems.FirstChild());
+        state.mFrameManager->AppendFrames(outerTable, nsGkAtoms::captionList,
+                                          captionItems);
       }
     }
 
@@ -6817,15 +6819,15 @@ nsCSSFrameConstructor::ContentInserted(nsIContent*            aContainer,
       AppendFrames(state, parentFrame, frameItems, prevSibling);
     } else {
       state.mFrameManager->InsertFrames(parentFrame, nsnull, prevSibling,
-                                        frameItems.FirstChild());
+                                        frameItems);
     }
   }
   else {
     // we might have a caption treat it here
     if (NS_SUCCEEDED(rv) && captionItems.NotEmpty()) {
-      nsIFrame* newCaptionFrame = captionItems.FirstChild();
       nsIFrame* outerTableFrame;
-      if (GetCaptionAdjustedParent(parentFrame, newCaptionFrame, &outerTableFrame)) {
+      if (GetCaptionAdjustedParent(parentFrame, captionItems.FirstChild(),
+                                   &outerTableFrame)) {
         // If the parent of our current prevSibling is different from the frame
         // we'll actually use as the parent, then the calculated insertion
         // point is now invalid (bug 341382).
@@ -6841,12 +6843,12 @@ nsCSSFrameConstructor::ContentInserted(nsIContent*            aContainer,
         if (isAppend) {
           state.mFrameManager->AppendFrames(outerTableFrame,
                                             nsGkAtoms::captionList,
-                                            newCaptionFrame);
+                                            captionItems);
         }
         else {
           state.mFrameManager->InsertFrames(outerTableFrame,
                                             nsGkAtoms::captionList,
-                                            prevSibling, newCaptionFrame);
+                                            prevSibling, captionItems);
         }
       }
     }
@@ -9705,8 +9707,7 @@ nsCSSFrameConstructor::WrapFramesInFirstLineFrame(
         (aLineFrame->GetStateBits() & NS_FRAME_FIRST_REFLOW)) {
       aLineFrame->SetInitialChildList(nsnull, firstLineChildren);
     } else {
-      aState.mFrameManager->AppendFrames(aLineFrame, nsnull,
-                                         firstLineChildren.FirstChild());
+      aState.mFrameManager->AppendFrames(aLineFrame, nsnull, firstLineChildren);
     }
   }
   else {
@@ -9762,9 +9763,10 @@ nsCSSFrameConstructor::InsertFirstLineFrames(
   nsFrameItems&            aFrameItems)
 {
   nsresult rv = NS_OK;
-  // XXXbz If you make this method actually do something, check to make sure
-  // that the caller is passing what you expect.  In particular, which content
-  // is aContent?
+  // XXXbz If you make this method actually do something, check to
+  // make sure that the caller is passing what you expect.  In
+  // particular, which content is aContent?  And audit the rest of
+  // this code too; it makes bogus assumptions and may not build.
 #if 0
   nsIFrame* parentFrame = *aParentFrame;
   nsIFrame* newFrame = aFrameItems.childList;
@@ -10156,12 +10158,12 @@ nsCSSFrameConstructor::WrapFramesInFirstLetterFrame(
       aBlockFrames.InsertFrames(nsnull, prevFrame, letterFrames);
     }
     else {
-      // Take the old textFrame out of the inline parents child list
+      // Take the old textFrame out of the inline parent's child list
       ::DeletingFrameSubtree(mPresShell->FrameManager(), textFrame);
       parentFrame->RemoveFrame(nsnull, textFrame);
 
       // Insert in the letter frame(s)
-      parentFrame->InsertFrames(nsnull, prevFrame, letterFrames.FirstChild());
+      parentFrame->InsertFrames(nsnull, prevFrame, letterFrames);
     }
   }
 
@@ -10342,8 +10344,8 @@ nsCSSFrameConstructor::RemoveFloatingFirstLetterFrames(
   aFrameManager->RemoveFrame(parentFrame, nsnull, placeholderFrame);
 
   // Insert text frame in its place
-  aFrameManager->InsertFrames(parentFrame, nsnull,
-                              prevSibling, newTextFrame);
+  nsFrameList textList(newTextFrame);
+  aFrameManager->InsertFrames(parentFrame, nsnull, prevSibling, textList);
 
   return NS_OK;
 }
@@ -10388,7 +10390,8 @@ nsCSSFrameConstructor::RemoveFirstLetterFrames(nsPresContext* aPresContext,
       aFrameManager->RemoveFrame(aFrame, nsnull, kid);
 
       // Insert text frame in its place
-      aFrameManager->InsertFrames(aFrame, nsnull, prevSibling, textFrame);
+      nsFrameList textList(textFrame);
+      aFrameManager->InsertFrames(aFrame, nsnull, prevSibling, textList);
 
       *aStopLooking = PR_TRUE;
       aFrame->RemoveStateBits(NS_BLOCK_HAS_FIRST_LETTER_CHILD);
@@ -10469,7 +10472,7 @@ nsCSSFrameConstructor::RecoverLetterFrames(nsIFrame* aBlockFrame)
     parentFrame->RemoveFrame(nsnull, textFrame);
 
     // Insert in the letter frame(s)
-    parentFrame->InsertFrames(nsnull, prevFrame, letterFrames.FirstChild());
+    parentFrame->InsertFrames(nsnull, prevFrame, letterFrames);
   }
   return rv;
 }
@@ -10526,9 +10529,9 @@ nsCSSFrameConstructor::CreateListBoxContent(nsPresContext* aPresContext,
     if (NS_SUCCEEDED(rv) && (nsnull != newFrame)) {
       // Notify the parent frame
       if (aIsAppend)
-        rv = ((nsListBoxBodyFrame*)aParentFrame)->ListBoxAppendFrames(newFrame);
+        rv = ((nsListBoxBodyFrame*)aParentFrame)->ListBoxAppendFrames(frameItems);
       else
-        rv = ((nsListBoxBodyFrame*)aParentFrame)->ListBoxInsertFrames(aPrevFrame, newFrame);
+        rv = ((nsListBoxBodyFrame*)aParentFrame)->ListBoxInsertFrames(aPrevFrame, frameItems);
     }
 
     EndUpdate();
@@ -10842,7 +10845,7 @@ nsCSSFrameConstructor::MoveFramesToEndOfIBSplit(nsFrameConstructorState& aState,
       (aExistingEndFrame->GetStateBits() & NS_FRAME_FIRST_REFLOW)) {
     aExistingEndFrame->SetInitialChildList(nsnull, aFramesToMove);
   } else {
-    aExistingEndFrame->InsertFrames(nsnull, nsnull, aFramesToMove.FirstChild());
+    aExistingEndFrame->InsertFrames(nsnull, nsnull, aFramesToMove);
   }
   nsFrameConstructorState* startState = aTargetState ? &aState : nsnull;
   MoveChildrenTo(aState.mFrameManager, aExistingEndFrame, newFirstChild,
diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp
index 8572d1057eb..af51008b359 100644
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -688,7 +688,7 @@ nsresult
 nsFrameManager::InsertFrames(nsIFrame*       aParentFrame,
                              nsIAtom*        aListName,
                              nsIFrame*       aPrevFrame,
-                             nsIFrame*       aFrameList)
+                             nsFrameList&    aFrameList)
 {
   NS_PRECONDITION(!aPrevFrame || (!aPrevFrame->GetNextContinuation()
                   || IS_TRUE_OVERFLOW_CONTAINER(aPrevFrame->GetNextContinuation()))
diff --git a/layout/base/nsFrameManager.h b/layout/base/nsFrameManager.h
index f706bdd378d..1bc0d174c63 100644
--- a/layout/base/nsFrameManager.h
+++ b/layout/base/nsFrameManager.h
@@ -150,7 +150,7 @@ public:
   // Functions for manipulating the frame model
   NS_HIDDEN_(nsresult) AppendFrames(nsIFrame*       aParentFrame,
                                     nsIAtom*        aListName,
-                                    nsIFrame*       aFrameList)
+                                    nsFrameList&    aFrameList)
   {
     return aParentFrame->AppendFrames(aListName, aFrameList);
   }
@@ -158,7 +158,7 @@ public:
   NS_HIDDEN_(nsresult) InsertFrames(nsIFrame*       aParentFrame,
                                     nsIAtom*        aListName,
                                     nsIFrame*       aPrevFrame,
-                                    nsIFrame*       aFrameList);
+                                    nsFrameList&    aFrameList);
 
   NS_HIDDEN_(nsresult) RemoveFrame(nsIFrame*       aParentFrame,
                                    nsIAtom*        aListName,
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index 886f62c2075..aee6f4f67d6 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -95,10 +95,10 @@ public:
     nsPoint aPt, const nsRect& aDirtyRect);
 
   NS_IMETHOD AppendFrames(nsIAtom*       aListName,
-                          nsIFrame*      aFrameList);
+                          nsFrameList&   aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*       aListName,
                           nsIFrame*      aPrevFrame,
-                          nsIFrame*      aFrameList);
+                          nsFrameList&   aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*       aListName,
                          nsIFrame*      aOldFrame);
 
@@ -118,7 +118,7 @@ public:
 protected:
 
   virtual PRIntn GetSkipSides() const;
-  void ReParentFrameList(nsIFrame* aFrameList);
+  void ReParentFrameList(const nsFrameList& aFrameList);
 
   nsIFrame* mLegendFrame;
   nsIFrame* mContentFrame;
@@ -613,34 +613,28 @@ nsFieldSetFrame::GetSkipSides() const
 
 NS_IMETHODIMP
 nsFieldSetFrame::AppendFrames(nsIAtom*       aListName,
-                              nsIFrame*      aFrameList)
+                              nsFrameList&   aFrameList)
 {
-  if (aFrameList) {
-    // aFrameList is not allowed to contain "the legend" for this fieldset
-    ReParentFrameList(aFrameList);
-    return mContentFrame->AppendFrames(aListName, aFrameList);
-  }
-  return NS_OK;
+  // aFrameList is not allowed to contain "the legend" for this fieldset
+  ReParentFrameList(aFrameList);
+  return mContentFrame->AppendFrames(aListName, aFrameList);
 }
 
 NS_IMETHODIMP
 nsFieldSetFrame::InsertFrames(nsIAtom*       aListName,
                               nsIFrame*      aPrevFrame,
-                              nsIFrame*      aFrameList)
+                              nsFrameList&   aFrameList)
 {
   NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this ||
                aPrevFrame->GetParent() == mContentFrame,
                "inserting after sibling frame with different parent");
 
-  if (aFrameList) {
-    // aFrameList is not allowed to contain "the legend" for this fieldset
-    ReParentFrameList(aFrameList);
-    if (NS_UNLIKELY(aPrevFrame == mLegendFrame)) {
-      aPrevFrame = nsnull;
-    }
-    return mContentFrame->InsertFrames(aListName, aPrevFrame, aFrameList);
+  // aFrameList is not allowed to contain "the legend" for this fieldset
+  ReParentFrameList(aFrameList);
+  if (NS_UNLIKELY(aPrevFrame == mLegendFrame)) {
+    aPrevFrame = nsnull;
   }
-  return NS_OK;
+  return mContentFrame->InsertFrames(aListName, aPrevFrame, aFrameList);
 }
 
 NS_IMETHODIMP
@@ -666,14 +660,14 @@ NS_IMETHODIMP nsFieldSetFrame::GetAccessible(nsIAccessible** aAccessible)
 #endif
 
 void
-nsFieldSetFrame::ReParentFrameList(nsIFrame* aFrameList)
+nsFieldSetFrame::ReParentFrameList(const nsFrameList& aFrameList)
 {
   nsFrameManager* frameManager = PresContext()->FrameManager();
-  for (nsIFrame* frame = aFrameList; frame; frame = frame->GetNextSibling()) {
-    NS_ASSERTION(mLegendFrame || frame->GetType() != nsGkAtoms::legendFrame,
+  for (nsFrameList::Enumerator e(aFrameList); !e.AtEnd(); e.Next()) {
+    NS_ASSERTION(mLegendFrame || e.get()->GetType() != nsGkAtoms::legendFrame,
                  "The fieldset's legend is not allowed in this list");
-    frame->SetParent(mContentFrame);
-    frameManager->ReParentStyleContext(frame);
+    e.get()->SetParent(mContentFrame);
+    frameManager->ReParentStyleContext(e.get());
   }
   mContentFrame->AddStateBits(GetStateBits() & NS_FRAME_HAS_CHILD_WITH_VIEW);
 }
diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp
index 27c24b3b126..886137906d0 100644
--- a/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/layout/forms/nsHTMLButtonControlFrame.cpp
@@ -406,7 +406,7 @@ nsHTMLButtonControlFrame::SetAdditionalStyleContext(PRInt32 aIndex,
 
 NS_IMETHODIMP 
 nsHTMLButtonControlFrame::AppendFrames(nsIAtom*        aListName,
-                                       nsIFrame*       aFrameList)
+                                       nsFrameList&    aFrameList)
 {
   NS_NOTREACHED("unsupported operation");
   return NS_ERROR_UNEXPECTED;
@@ -415,7 +415,7 @@ nsHTMLButtonControlFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsHTMLButtonControlFrame::InsertFrames(nsIAtom*        aListName,
                                        nsIFrame*       aPrevFrame,
-                                       nsIFrame*       aFrameList)
+                                       nsFrameList&    aFrameList)
 {
   NS_NOTREACHED("unsupported operation");
   return NS_ERROR_UNEXPECTED;
diff --git a/layout/forms/nsHTMLButtonControlFrame.h b/layout/forms/nsHTMLButtonControlFrame.h
index b2b733d390e..0537a356bc2 100644
--- a/layout/forms/nsHTMLButtonControlFrame.h
+++ b/layout/forms/nsHTMLButtonControlFrame.h
@@ -95,11 +95,11 @@ public:
                                          nsStyleContext* aStyleContext);
  
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
 
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
 
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
diff --git a/layout/generic/nsAbsoluteContainingBlock.cpp b/layout/generic/nsAbsoluteContainingBlock.cpp
index 90b41f268ab..aa2c41caedf 100644
--- a/layout/generic/nsAbsoluteContainingBlock.cpp
+++ b/layout/generic/nsAbsoluteContainingBlock.cpp
@@ -68,7 +68,7 @@ nsAbsoluteContainingBlock::SetInitialChildList(nsIFrame*       aDelegatingFrame,
 nsresult
 nsAbsoluteContainingBlock::AppendFrames(nsIFrame*      aDelegatingFrame,
                                         nsIAtom*       aListName,
-                                        nsIFrame*      aFrameList)
+                                        nsFrameList&   aFrameList)
 {
   NS_ASSERTION(GetChildListName() == aListName, "unexpected child list");
 
@@ -89,7 +89,7 @@ nsresult
 nsAbsoluteContainingBlock::InsertFrames(nsIFrame*      aDelegatingFrame,
                                         nsIAtom*       aListName,
                                         nsIFrame*      aPrevFrame,
-                                        nsIFrame*      aFrameList)
+                                        nsFrameList&   aFrameList)
 {
   NS_ASSERTION(GetChildListName() == aListName, "unexpected child list");
   NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == aDelegatingFrame,
diff --git a/layout/generic/nsAbsoluteContainingBlock.h b/layout/generic/nsAbsoluteContainingBlock.h
index dfe612b18e4..5ce6a23f728 100644
--- a/layout/generic/nsAbsoluteContainingBlock.h
+++ b/layout/generic/nsAbsoluteContainingBlock.h
@@ -91,11 +91,11 @@ public:
                                nsFrameList&    aChildList);
   nsresult AppendFrames(nsIFrame*      aDelegatingFrame,
                         nsIAtom*       aListName,
-                        nsIFrame*      aFrameList);
+                        nsFrameList&   aFrameList);
   nsresult InsertFrames(nsIFrame*      aDelegatingFrame,
                         nsIAtom*       aListName,
                         nsIFrame*      aPrevFrame,
-                        nsIFrame*      aFrameList);
+                        nsFrameList&   aFrameList);
   nsresult RemoveFrame(nsIFrame*      aDelegatingFrame,
                        nsIAtom*       aListName,
                        nsIFrame*      aOldFrame);
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 3c683005189..8ad1e61ab2a 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -4416,6 +4416,8 @@ nsBlockFrame::HandleOverflowPlaceholdersForPulledFrame(
     }
     ReparentFrame(outOfFlow, parent, this);
 
+    // XXXbz should this be InsertFrame?  Or can |frame| really have
+    // following siblings here?
     aState.mOverflowPlaceholders.InsertFrames(nsnull, lastOverflowPlace, frame);
     // outOfFlow isn't inserted anywhere yet. Eventually the overflow
     // placeholders get put into the overflow lines, and at the same time we
@@ -4499,8 +4501,7 @@ nsBlockFrame::DrainOverflowLines(nsBlockReflowState& aState)
         for (nsIFrame* f = oofs.mList.FirstChild(); f; f = f->GetNextSibling()) {
           ReparentFrame(f, prevBlock, this);
         }
-        mFloats.InsertFrames(nsnull, nsnull, oofs.mList.FirstChild());
-        oofs.mList.Clear();
+        mFloats.InsertFrames(nsnull, nsnull, oofs.mList);
       }
     }
     
@@ -4662,7 +4663,7 @@ nsBlockFrame::DrainOverflowLines(nsBlockReflowState& aState)
 
     // Put the placeholders' out of flows into the float list
     keepOutOfFlows.SortByContentOrder();
-    mFloats.InsertFrames(nsnull, nsnull, keepOutOfFlows.FirstChild());
+    mFloats.InsertFrames(nsnull, nsnull, keepOutOfFlows);
   }
 
   return PR_TRUE;
@@ -4789,9 +4790,9 @@ nsBlockFrame::LastChild()
 
 NS_IMETHODIMP
 nsBlockFrame::AppendFrames(nsIAtom*  aListName,
-                           nsIFrame* aFrameList)
+                           nsFrameList& aFrameList)
 {
-  if (nsnull == aFrameList) {
+  if (aFrameList.IsEmpty()) {
     return NS_OK;
   }
   if (aListName) {
@@ -4827,18 +4828,21 @@ nsBlockFrame::AppendFrames(nsIAtom*  aListName,
   printf("\n");
 #endif
   nsresult rv = AddFrames(aFrameList, lastKid);
-  if (NS_SUCCEEDED(rv)) {
-    PresContext()->PresShell()->
-      FrameNeedsReflow(this, nsIPresShell::eTreeChange,
-                       NS_FRAME_HAS_DIRTY_CHILDREN); // XXX sufficient?
+  if (NS_FAILED(rv)) {
+    return rv;
   }
-  return rv;
+  aFrameList.Clear();
+
+  PresContext()->PresShell()->
+    FrameNeedsReflow(this, nsIPresShell::eTreeChange,
+                     NS_FRAME_HAS_DIRTY_CHILDREN); // XXX sufficient?
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsBlockFrame::InsertFrames(nsIAtom*  aListName,
                            nsIFrame* aPrevFrame,
-                           nsIFrame* aFrameList)
+                           nsFrameList& aFrameList)
 {
   NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this,
                "inserting after sibling frame with different parent");
@@ -4872,15 +4876,17 @@ nsBlockFrame::InsertFrames(nsIAtom*  aListName,
   printf("\n");
 #endif
   nsresult rv = AddFrames(aFrameList, aPrevFrame);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  aFrameList.Clear();
 #ifdef IBMBIDI
   if (aListName != nsGkAtoms::nextBidi)
 #endif // IBMBIDI
-  if (NS_SUCCEEDED(rv)) {
     PresContext()->PresShell()->
       FrameNeedsReflow(this, nsIPresShell::eTreeChange,
                        NS_FRAME_HAS_DIRTY_CHILDREN); // XXX sufficient?
-  }
-  return rv;
+  return NS_OK;
 }
 
 static PRBool
diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h
index dedf6db4490..b282fdab74a 100644
--- a/layout/generic/nsBlockFrame.h
+++ b/layout/generic/nsBlockFrame.h
@@ -170,10 +170,10 @@ public:
   NS_IMETHOD SetInitialChildList(nsIAtom*        aListName,
                                  nsFrameList&    aChildList);
   NS_IMETHOD  AppendFrames(nsIAtom*        aListName,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
   NS_IMETHOD  InsertFrames(nsIAtom*        aListName,
                            nsIFrame*       aPrevFrame,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
   NS_IMETHOD  RemoveFrame(nsIAtom*        aListName,
                           nsIFrame*       aOldFrame);
   virtual nsFrameList GetChildList(nsIAtom* aListName) const;
diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp
index 035e9ea04d0..499f8be685b 100644
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -65,10 +65,10 @@ public:
                     nsReflowStatus& aStatus);
                                
   NS_IMETHOD  AppendFrames(nsIAtom*        aListName,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
   NS_IMETHOD  InsertFrames(nsIAtom*        aListName,
                            nsIFrame*       aPrevFrame,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
   NS_IMETHOD  RemoveFrame(nsIAtom*        aListName,
                           nsIFrame*       aOldFrame);
 
@@ -1106,7 +1106,7 @@ nsColumnSetFrame::GetSkipSides() const
 
 NS_IMETHODIMP
 nsColumnSetFrame::AppendFrames(nsIAtom*        aListName,
-                               nsIFrame*       aFrameList)
+                               nsFrameList&    aFrameList)
 {
   NS_NOTREACHED("AppendFrames not supported");
   return NS_ERROR_NOT_IMPLEMENTED;
@@ -1115,7 +1115,7 @@ nsColumnSetFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsColumnSetFrame::InsertFrames(nsIAtom*        aListName,
                                nsIFrame*       aPrevFrame,
-                               nsIFrame*       aFrameList)
+                               nsFrameList&    aFrameList)
 {
   NS_NOTREACHED("InsertFrames not supported");
   return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index f6f1423077b..d61279abc90 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -126,7 +126,7 @@ nsContainerFrame::SetInitialChildList(nsIAtom*     aListName,
 
 NS_IMETHODIMP
 nsContainerFrame::AppendFrames(nsIAtom*  aListName,
-                               nsIFrame* aFrameList)
+                               nsFrameList& aFrameList)
 {
   if (nsnull != aListName) {
 #ifdef IBMBIDI
@@ -137,7 +137,7 @@ nsContainerFrame::AppendFrames(nsIAtom*  aListName,
       return NS_ERROR_INVALID_ARG;
     }
   }
-  if (aFrameList) {
+  if (aFrameList.NotEmpty()) {
     mFrames.AppendFrames(this, aFrameList);
 
     // Ask the parent frame to reflow me.
@@ -156,7 +156,7 @@ nsContainerFrame::AppendFrames(nsIAtom*  aListName,
 NS_IMETHODIMP
 nsContainerFrame::InsertFrames(nsIAtom*  aListName,
                                nsIFrame* aPrevFrame,
-                               nsIFrame* aFrameList)
+                               nsFrameList& aFrameList)
 {
   NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this,
                "inserting after sibling frame with different parent");
@@ -170,7 +170,7 @@ nsContainerFrame::InsertFrames(nsIAtom*  aListName,
       return NS_ERROR_INVALID_ARG;
     }
   }
-  if (aFrameList) {
+  if (aFrameList.NotEmpty()) {
     // Insert frames after aPrevFrame
     mFrames.InsertFrames(this, aPrevFrame, aFrameList);
 
diff --git a/layout/generic/nsContainerFrame.h b/layout/generic/nsContainerFrame.h
index a09135ee64b..5ade699c0da 100644
--- a/layout/generic/nsContainerFrame.h
+++ b/layout/generic/nsContainerFrame.h
@@ -80,10 +80,10 @@ public:
   NS_IMETHOD SetInitialChildList(nsIAtom*     aListName,
                                  nsFrameList& aChildList);
   NS_IMETHOD AppendFrames(nsIAtom*  aListName,
-                          nsIFrame* aFrameList);
+                          nsFrameList& aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*  aListName,
                           nsIFrame* aPrevFrame,
-                          nsIFrame* aFrameList);
+                          nsFrameList& aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*  aListName,
                          nsIFrame* aOldFrame);
 
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 0d69168a530..7a6f377008f 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -415,7 +415,7 @@ NS_IMETHODIMP nsFrame::SetInitialChildList(nsIAtom*        aListName,
 
 NS_IMETHODIMP
 nsFrame::AppendFrames(nsIAtom*        aListName,
-                      nsIFrame*       aFrameList)
+                      nsFrameList&    aFrameList)
 {
   NS_PRECONDITION(PR_FALSE, "not a container");
   return NS_ERROR_UNEXPECTED;
@@ -424,7 +424,7 @@ nsFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsFrame::InsertFrames(nsIAtom*        aListName,
                       nsIFrame*       aPrevFrame,
-                      nsIFrame*       aFrameList)
+                      nsFrameList&    aFrameList)
 {
   NS_PRECONDITION(PR_FALSE, "not a container");
   return NS_ERROR_UNEXPECTED;
diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h
index c4ec0df25a8..6103c6a2c2e 100644
--- a/layout/generic/nsFrame.h
+++ b/layout/generic/nsFrame.h
@@ -166,10 +166,10 @@ public:
   NS_IMETHOD  SetInitialChildList(nsIAtom*           aListName,
                                   nsFrameList&       aChildList);
   NS_IMETHOD  AppendFrames(nsIAtom*        aListName,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
   NS_IMETHOD  InsertFrames(nsIAtom*        aListName,
                            nsIFrame*       aPrevFrame,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
   NS_IMETHOD  RemoveFrame(nsIAtom*        aListName,
                           nsIFrame*       aOldFrame);
   virtual void Destroy();
diff --git a/layout/generic/nsFrameList.h b/layout/generic/nsFrameList.h
index dab68c8f491..114db790a22 100644
--- a/layout/generic/nsFrameList.h
+++ b/layout/generic/nsFrameList.h
@@ -325,20 +325,48 @@ public:
       mEnd(aOther.mEnd)
     {}
 
-    PRBool AtEnd() const { return mFrame == mEnd; }
+    PRBool AtEnd() const {
+      // Can't just check mEnd, because some table code goes and destroys the
+      // tail of the frame list (including mEnd!) while iterating over the
+      // frame list.
+      return !mFrame || mFrame == mEnd;
+    }
 
     /* Next() needs to know about nsIFrame, and nsIFrame will need to
        know about nsFrameList methods, so in order to inline this put
        the implementation in nsIFrame.h */
     inline void Next();
 
-    nsIFrame* get() const { return mFrame; }
+    /**
+     * Get the current frame we're pointing to.  Do not call this on an
+     * iterator that is at end!
+     */
+    nsIFrame* get() const {
+      NS_PRECONDITION(!AtEnd(), "Enumerator is at end");
+      return mFrame;
+    }
+
+    /**
+     * Get an enumerator that is just like this one, but not limited in terms of
+     * the part of the list it will traverse.
+     */
+    Enumerator GetUnlimitedEnumerator() const {
+      return Enumerator(*this, nsnull);
+    }
 
 #ifdef DEBUG
     const nsFrameList& List() const { return mSlice.mList; }
 #endif
 
   protected:
+    Enumerator(const Enumerator& aOther, const nsIFrame* const aNewEnd):
+#ifdef DEBUG
+      mSlice(aOther.mSlice),
+#endif
+      mFrame(aOther.mFrame),
+      mEnd(aNewEnd)
+    {}
+
 #ifdef DEBUG
     /* Has to be an object, not a reference, since the slice could
        well be a temporary constructed from an nsFrameList */
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index dc53b9275e6..61fbdbe5108 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -174,7 +174,7 @@ nsHTMLScrollFrame::SetInitialChildList(nsIAtom*     aListName,
 
 NS_IMETHODIMP
 nsHTMLScrollFrame::AppendFrames(nsIAtom*  aListName,
-                                nsIFrame* aFrameList)
+                                nsFrameList& aFrameList)
 {
   NS_ASSERTION(!aListName, "Only main list supported");
   mFrames.AppendFrames(nsnull, aFrameList);
@@ -185,7 +185,7 @@ nsHTMLScrollFrame::AppendFrames(nsIAtom*  aListName,
 NS_IMETHODIMP
 nsHTMLScrollFrame::InsertFrames(nsIAtom*  aListName,
                                 nsIFrame* aPrevFrame,
-                                nsIFrame* aFrameList)
+                                nsFrameList& aFrameList)
 {
   NS_ASSERTION(!aListName, "Only main list supported");
   NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this,
@@ -1061,7 +1061,7 @@ nsXULScrollFrame::SetInitialChildList(nsIAtom*        aListName,
 
 NS_IMETHODIMP
 nsXULScrollFrame::AppendFrames(nsIAtom*        aListName,
-                               nsIFrame*       aFrameList)
+                               nsFrameList&    aFrameList)
 {
   nsresult rv = nsBoxFrame::AppendFrames(aListName, aFrameList);
   mInner.ReloadChildFrames();
@@ -1071,7 +1071,7 @@ nsXULScrollFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsXULScrollFrame::InsertFrames(nsIAtom*        aListName,
                                nsIFrame*       aPrevFrame,
-                               nsIFrame*       aFrameList)
+                               nsFrameList&    aFrameList)
 {
   nsresult rv = nsBoxFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
   mInner.ReloadChildFrames();
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index 6a912db4cec..aef4933319d 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -291,10 +291,10 @@ public:
   // Because there can be only one child frame, these two function return
   // NS_ERROR_FAILURE
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
 
   virtual void Destroy();
 
@@ -458,10 +458,10 @@ public:
   // Because there can be only one child frame, these two function return
   // NS_ERROR_FAILURE
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
 
   virtual void Destroy();
 
diff --git a/layout/generic/nsHTMLFrame.cpp b/layout/generic/nsHTMLFrame.cpp
index 34e3ced1563..2bcce3f81b1 100644
--- a/layout/generic/nsHTMLFrame.cpp
+++ b/layout/generic/nsHTMLFrame.cpp
@@ -99,10 +99,10 @@ public:
   NS_IMETHOD SetInitialChildList(nsIAtom*        aListName,
                                  nsFrameList&    aChildList);
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
 
@@ -286,7 +286,7 @@ CanvasFrame::SetInitialChildList(nsIAtom*        aListName,
 
 NS_IMETHODIMP
 CanvasFrame::AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList)
+                          nsFrameList&    aFrameList)
 {
   nsresult  rv;
 
@@ -305,10 +305,12 @@ CanvasFrame::AppendFrames(nsIAtom*        aListName,
 
   } else {
     // Insert the new frames
+    NS_ASSERTION(aFrameList.FirstChild() == aFrameList.LastChild(),
+                 "Only one principal child frame allowed");
 #ifdef NS_DEBUG
     nsFrame::VerifyDirtyBitSet(aFrameList);
 #endif
-    mFrames.AppendFrame(nsnull, aFrameList);
+    mFrames.AppendFrames(nsnull, aFrameList);
 
     rv = PresContext()->PresShell()->
            FrameNeedsReflow(this, nsIPresShell::eTreeChange,
@@ -321,7 +323,7 @@ CanvasFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 CanvasFrame::InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList)
+                          nsFrameList&    aFrameList)
 {
   nsresult  rv;
 
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index def82baab31..8bdd21a701e 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -107,10 +107,10 @@ struct nsMargin;
 typedef class nsIFrame nsIBox;
 
 // IID for the nsIFrame interface
-// 7b437d20-a34e-11dd-ad8b-0800200c9a66
+// 2871104e-2738-4ad7-b86a-ede63c71f1c2
 #define NS_IFRAME_IID \
-  { 0x7b437d20, 0xa34e, 0x11dd, \
-    { 0xad, 0x8b, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66 } }
+  { 0x2871104e, 0x2738, 0x4ad7,                       \
+    { 0xb8, 0x6a, 0xed, 0xe6, 0x3c, 0x71, 0xf1, 0xc2 } }
 
 /**
  * Indication of how the frame can be split. This is used when doing runaround
@@ -538,7 +538,7 @@ public:
    * @param   aListName the name of the child list. A NULL pointer for the atom
    *            name means the unnamed principal child list
    * @param   aChildList list of child frames. Each of the frames has its
-   *            NS_FRAME_IS_DIRTY bit set
+   *            NS_FRAME_IS_DIRTY bit set.  Must not be empty.
    * @return  NS_ERROR_INVALID_ARG if there is no child list with the specified
    *            name,
    *          NS_ERROR_UNEXPECTED if the frame is an atomic frame or if the
@@ -559,14 +559,16 @@ public:
    * @param   aListName the name of the child list. A NULL pointer for the atom
    *            name means the unnamed principal child list
    * @param   aFrameList list of child frames to append. Each of the frames has
-   *            its NS_FRAME_IS_DIRTY bit set
+   *            its NS_FRAME_IS_DIRTY bit set.  Must not be empty.
    * @return  NS_ERROR_INVALID_ARG if there is no child list with the specified
    *            name,
    *          NS_ERROR_UNEXPECTED if the frame is an atomic frame,
-   *          NS_OK otherwise
+   *          NS_OK otherwise.  In this case, AppendFrames empties out
+   *            aChildList in the process of moving the frames over to its own
+   *            child list.
    */
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList) = 0;
+                          nsFrameList&    aFrameList) = 0;
 
   /**
    * This method is responsible for inserting frames into the frame
@@ -581,11 +583,13 @@ public:
    * @return  NS_ERROR_INVALID_ARG if there is no child list with the specified
    *            name,
    *          NS_ERROR_UNEXPECTED if the frame is an atomic frame,
-   *          NS_OK otherwise
+   *          NS_OK otherwise.  In this case, InsertFrames empties out
+   *            aChildList in the process of moving the frames over to its own
+   *            child list.
    */
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList) = 0;
+                          nsFrameList&    aFrameList) = 0;
 
   /**
    * This method is responsible for removing a frame in the frame
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 04ccf37de95..c167a278c0f 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -1098,7 +1098,7 @@ nsPositionedInlineFrame::SetInitialChildList(nsIAtom*        aListName,
 
 NS_IMETHODIMP
 nsPositionedInlineFrame::AppendFrames(nsIAtom*        aListName,
-                                      nsIFrame*       aFrameList)
+                                      nsFrameList&    aFrameList)
 {
   nsresult  rv;
   
@@ -1114,7 +1114,7 @@ nsPositionedInlineFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsPositionedInlineFrame::InsertFrames(nsIAtom*        aListName,
                                       nsIFrame*       aPrevFrame,
-                                      nsIFrame*       aFrameList)
+                                      nsFrameList&    aFrameList)
 {
   nsresult  rv;
 
diff --git a/layout/generic/nsInlineFrame.h b/layout/generic/nsInlineFrame.h
index 54b2d41b373..da5875bf0f5 100644
--- a/layout/generic/nsInlineFrame.h
+++ b/layout/generic/nsInlineFrame.h
@@ -259,10 +259,10 @@ public:
   NS_IMETHOD SetInitialChildList(nsIAtom*        aListName,
                                  nsFrameList&    aChildList);
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
 
diff --git a/layout/generic/nsViewportFrame.cpp b/layout/generic/nsViewportFrame.cpp
index e29c95bbbf8..c6919dfaaf6 100644
--- a/layout/generic/nsViewportFrame.cpp
+++ b/layout/generic/nsViewportFrame.cpp
@@ -112,7 +112,7 @@ ViewportFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 
 NS_IMETHODIMP
 ViewportFrame::AppendFrames(nsIAtom*        aListName,
-                            nsIFrame*       aFrameList)
+                            nsFrameList&    aFrameList)
 {
   nsresult rv = NS_OK;
 
@@ -131,7 +131,7 @@ ViewportFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 ViewportFrame::InsertFrames(nsIAtom*        aListName,
                             nsIFrame*       aPrevFrame,
-                            nsIFrame*       aFrameList)
+                            nsFrameList&    aFrameList)
 {
   nsresult rv = NS_OK;
 
diff --git a/layout/generic/nsViewportFrame.h b/layout/generic/nsViewportFrame.h
index 43a3334285f..5ba08a36541 100644
--- a/layout/generic/nsViewportFrame.h
+++ b/layout/generic/nsViewportFrame.h
@@ -75,11 +75,11 @@ public:
                                  nsFrameList&    aChildList);
 
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
 
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
 
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index 44926ef3029..28f023255b7 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -795,32 +795,26 @@ nsMathMLContainerFrame::ChildListChanged(PRInt32 aModType)
 
 NS_IMETHODIMP
 nsMathMLContainerFrame::AppendFrames(nsIAtom*        aListName,
-                                     nsIFrame*       aFrameList)
+                                     nsFrameList&    aFrameList)
 {
   if (aListName) {
     return NS_ERROR_INVALID_ARG;
   }
-  if (aFrameList) {
-    mFrames.AppendFrames(this, aFrameList);
-    return ChildListChanged(nsIDOMMutationEvent::ADDITION);
-  }
-  return NS_OK;
+  mFrames.AppendFrames(this, aFrameList);
+  return ChildListChanged(nsIDOMMutationEvent::ADDITION);
 }
 
 NS_IMETHODIMP
 nsMathMLContainerFrame::InsertFrames(nsIAtom*        aListName,
                                      nsIFrame*       aPrevFrame,
-                                     nsIFrame*       aFrameList)
+                                     nsFrameList&    aFrameList)
 {
   if (aListName) {
     return NS_ERROR_INVALID_ARG;
   }
-  if (aFrameList) {
-    // Insert frames after aPrevFrame
-    mFrames.InsertFrames(this, aPrevFrame, aFrameList);
-    return ChildListChanged(nsIDOMMutationEvent::ADDITION);
-  }
-  return NS_OK;
+  // Insert frames after aPrevFrame
+  mFrames.InsertFrames(this, aPrevFrame, aFrameList);
+  return ChildListChanged(nsIDOMMutationEvent::ADDITION);
 }
 
 NS_IMETHODIMP
diff --git a/layout/mathml/nsMathMLContainerFrame.h b/layout/mathml/nsMathMLContainerFrame.h
index 710191d4886..2257798a2e7 100644
--- a/layout/mathml/nsMathMLContainerFrame.h
+++ b/layout/mathml/nsMathMLContainerFrame.h
@@ -119,12 +119,12 @@ public:
 
   NS_IMETHOD
   AppendFrames(nsIAtom*        aListName,
-               nsIFrame*       aFrameList);
+               nsFrameList&    aFrameList);
 
   NS_IMETHOD
   InsertFrames(nsIAtom*        aListName,
                nsIFrame*       aPrevFrame,
-               nsIFrame*       aFrameList);
+               nsFrameList&    aFrameList);
 
   NS_IMETHOD
   RemoveFrame(nsIAtom*        aListName,
@@ -409,7 +409,7 @@ public:
 
   NS_IMETHOD
   AppendFrames(nsIAtom*        aListName,
-               nsIFrame*       aFrameList)
+               nsFrameList&    aFrameList)
   {
     NS_ASSERTION(!aListName || nsGkAtoms::nextBidi == aListName,
                  "unexpected frame list");
@@ -422,7 +422,7 @@ public:
   NS_IMETHOD
   InsertFrames(nsIAtom*        aListName,
                nsIFrame*       aPrevFrame,
-               nsIFrame*       aFrameList)
+               nsFrameList&    aFrameList)
   {
     NS_ASSERTION(!aListName || nsGkAtoms::nextBidi == aListName,
                  "unexpected frame list");
@@ -477,7 +477,7 @@ public:
 
   NS_IMETHOD
   AppendFrames(nsIAtom*        aListName,
-               nsIFrame*       aFrameList)
+               nsFrameList&    aFrameList)
   {
     NS_ASSERTION(!aListName || nsGkAtoms::nextBidi == aListName,
                  "unexpected frame list");
@@ -490,7 +490,7 @@ public:
   NS_IMETHOD
   InsertFrames(nsIAtom*        aListName,
                nsIFrame*       aPrevFrame,
-               nsIFrame*       aFrameList)
+               nsFrameList&    aFrameList)
   {
     NS_ASSERTION(!aListName || nsGkAtoms::nextBidi == aListName,
                  "unexpected frame list");
diff --git a/layout/mathml/nsMathMLForeignFrameWrapper.h b/layout/mathml/nsMathMLForeignFrameWrapper.h
index 107aade3ce2..0d623f1f081 100644
--- a/layout/mathml/nsMathMLForeignFrameWrapper.h
+++ b/layout/mathml/nsMathMLForeignFrameWrapper.h
@@ -89,7 +89,7 @@ public:
   // we are just a wrapper and these methods shouldn't be called
   NS_IMETHOD
   AppendFrames(nsIAtom*        aListName,
-               nsIFrame*       aFrameList)
+               nsFrameList&    aFrameList)
   {
     NS_NOTREACHED("unsupported operation");
     return NS_ERROR_NOT_IMPLEMENTED;
@@ -98,7 +98,7 @@ public:
   NS_IMETHOD
   InsertFrames(nsIAtom*        aListName,
                nsIFrame*       aPrevFrame,
-               nsIFrame*       aFrameList)
+               nsFrameList&    aFrameList)
   {
     NS_NOTREACHED("unsupported operation");
     return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/layout/mathml/nsMathMLmtableFrame.h b/layout/mathml/nsMathMLmtableFrame.h
index b1b405b2a6e..abc9fef0290 100644
--- a/layout/mathml/nsMathMLmtableFrame.h
+++ b/layout/mathml/nsMathMLmtableFrame.h
@@ -114,7 +114,7 @@ public:
 
   NS_IMETHOD
   AppendFrames(nsIAtom*  aListName,
-               nsIFrame* aFrameList)
+               nsFrameList& aFrameList)
   {
     nsresult rv = nsTableFrame::AppendFrames(aListName, aFrameList);
     RestyleTable();
@@ -124,7 +124,7 @@ public:
   NS_IMETHOD
   InsertFrames(nsIAtom*  aListName,
                nsIFrame* aPrevFrame,
-               nsIFrame* aFrameList)
+               nsFrameList& aFrameList)
   {
     nsresult rv = nsTableFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
     RestyleTable();
@@ -171,7 +171,7 @@ public:
 
   NS_IMETHOD
   AppendFrames(nsIAtom*  aListName,
-               nsIFrame* aFrameList)
+               nsFrameList& aFrameList)
   {
     nsresult rv = nsTableRowFrame::AppendFrames(aListName, aFrameList);
     RestyleTable();
@@ -181,7 +181,7 @@ public:
   NS_IMETHOD
   InsertFrames(nsIAtom*  aListName,
                nsIFrame* aPrevFrame,
-               nsIFrame* aFrameList)
+               nsFrameList& aFrameList)
   {
     nsresult rv = nsTableRowFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
     RestyleTable();
diff --git a/layout/svg/base/src/nsSVGContainerFrame.cpp b/layout/svg/base/src/nsSVGContainerFrame.cpp
index cbcf6bcf3e4..2cecdafa38f 100644
--- a/layout/svg/base/src/nsSVGContainerFrame.cpp
+++ b/layout/svg/base/src/nsSVGContainerFrame.cpp
@@ -56,7 +56,7 @@ NS_NewSVGContainerFrame(nsIPresShell* aPresShell,
 
 NS_IMETHODIMP
 nsSVGContainerFrame::AppendFrames(nsIAtom* aListName,
-                                  nsIFrame* aFrameList)
+                                  nsFrameList& aFrameList)
 {
   return InsertFrames(aListName, mFrames.LastChild(), aFrameList);  
 }
@@ -64,7 +64,7 @@ nsSVGContainerFrame::AppendFrames(nsIAtom* aListName,
 NS_IMETHODIMP
 nsSVGContainerFrame::InsertFrames(nsIAtom* aListName,
                                   nsIFrame* aPrevFrame,
-                                  nsIFrame* aFrameList)
+                                  nsFrameList& aFrameList)
 {
   NS_ASSERTION(!aListName, "unexpected child list");
   NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this,
@@ -110,14 +110,14 @@ nsSVGDisplayContainerFrame::Init(nsIContent* aContent,
 NS_IMETHODIMP
 nsSVGDisplayContainerFrame::InsertFrames(nsIAtom* aListName,
                                          nsIFrame* aPrevFrame,
-                                         nsIFrame* aFrameList)
+                                         nsFrameList& aFrameList)
 {
-  // memorize last new frame
-  nsIFrame* lastNewFrame = nsnull;
-  {
-    nsFrameList tmpList(aFrameList);
-    lastNewFrame = tmpList.LastChild();
-  }
+  // memorize first old frame after insertion point
+  // XXXbz once again, this would work a lot better if the nsIFrame
+  // methods returned framelist iterators....
+  nsIFrame* firstOldFrame = aPrevFrame ?
+    aPrevFrame->GetNextSibling() : GetChildList(aListName).FirstChild();
+  nsIFrame* firstNewFrame = aFrameList.FirstChild();
   
   // Insert the new frames
   nsSVGContainerFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
@@ -125,11 +125,7 @@ nsSVGDisplayContainerFrame::InsertFrames(nsIAtom* aListName,
   // Call InitialUpdate on the new frames ONLY if our nsSVGOuterSVGFrame has had
   // its initial reflow (our NS_FRAME_FIRST_REFLOW bit is clear) - bug 399863.
   if (!(GetStateBits() & NS_FRAME_FIRST_REFLOW)) {
-    nsIFrame* end = nsnull;
-    if (lastNewFrame)
-      end = lastNewFrame->GetNextSibling();
-
-    for (nsIFrame* kid = aFrameList; kid != end;
+    for (nsIFrame* kid = firstNewFrame; kid != firstOldFrame;
          kid = kid->GetNextSibling()) {
       nsISVGChildFrame* SVGFrame = do_QueryFrame(kid);
       if (SVGFrame) {
diff --git a/layout/svg/base/src/nsSVGContainerFrame.h b/layout/svg/base/src/nsSVGContainerFrame.h
index 11a798c3459..d98c217b45b 100644
--- a/layout/svg/base/src/nsSVGContainerFrame.h
+++ b/layout/svg/base/src/nsSVGContainerFrame.h
@@ -63,10 +63,10 @@ public:
 
   // nsIFrame:
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
   NS_IMETHOD Init(nsIContent*      aContent,
@@ -95,7 +95,7 @@ public:
   // nsIFrame:
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
   NS_IMETHOD Init(nsIContent*      aContent,
diff --git a/layout/svg/base/src/nsSVGTextContainerFrame.cpp b/layout/svg/base/src/nsSVGTextContainerFrame.cpp
index a0e52cfa8fb..ce5fb392e98 100644
--- a/layout/svg/base/src/nsSVGTextContainerFrame.cpp
+++ b/layout/svg/base/src/nsSVGTextContainerFrame.cpp
@@ -134,7 +134,7 @@ nsSVGTextContainerFrame::GetDy()
 NS_IMETHODIMP
 nsSVGTextContainerFrame::InsertFrames(nsIAtom* aListName,
                                       nsIFrame* aPrevFrame,
-                                      nsIFrame* aFrameList)
+                                      nsFrameList& aFrameList)
 {
   nsresult rv = nsSVGDisplayContainerFrame::InsertFrames(aListName,
                                                          aPrevFrame,
diff --git a/layout/svg/base/src/nsSVGTextContainerFrame.h b/layout/svg/base/src/nsSVGTextContainerFrame.h
index 1fbd6211062..6ba4f238a25 100644
--- a/layout/svg/base/src/nsSVGTextContainerFrame.h
+++ b/layout/svg/base/src/nsSVGTextContainerFrame.h
@@ -64,7 +64,7 @@ public:
   // nsIFrame
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom *aListName, nsIFrame *aOldFrame);
 
   NS_IMETHOD GetStartPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint **_retval);
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index 4d49334f8d0..9c6a076d7f9 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -259,7 +259,7 @@ nsTableCellFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
      
 NS_IMETHODIMP
 nsTableCellFrame::AppendFrames(nsIAtom*        aListName,
-                               nsIFrame*       aFrameList)
+                               nsFrameList&    aFrameList)
 {
   NS_PRECONDITION(PR_FALSE, "unsupported operation");
   return NS_ERROR_NOT_IMPLEMENTED;
@@ -268,7 +268,7 @@ nsTableCellFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsTableCellFrame::InsertFrames(nsIAtom*        aListName,
                                nsIFrame*       aPrevFrame,
-                               nsIFrame*       aFrameList)
+                               nsFrameList&    aFrameList)
 {
   NS_PRECONDITION(PR_FALSE, "unsupported operation");
   return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/layout/tables/nsTableCellFrame.h b/layout/tables/nsTableCellFrame.h
index b436d9d3451..2732485bbb2 100644
--- a/layout/tables/nsTableCellFrame.h
+++ b/layout/tables/nsTableCellFrame.h
@@ -100,10 +100,10 @@ public:
   // so these functions should never be called. They assert and return
   // NS_ERROR_NOT_IMPLEMENTED
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
 
diff --git a/layout/tables/nsTableColGroupFrame.cpp b/layout/tables/nsTableColGroupFrame.cpp
index 8c4cb91c935..5055f88719b 100644
--- a/layout/tables/nsTableColGroupFrame.cpp
+++ b/layout/tables/nsTableColGroupFrame.cpp
@@ -97,34 +97,32 @@ void nsTableColGroupFrame::ResetColIndices(nsIFrame*       aFirstColGroup,
 
 
 nsresult
-nsTableColGroupFrame::AddColsToTable(PRInt32          aFirstColIndex,
-                                     PRBool           aResetSubsequentColIndices,
-                                     nsIFrame*        aFirstFrame,
-                                     nsIFrame*        aLastFrame)
+nsTableColGroupFrame::AddColsToTable(PRInt32                   aFirstColIndex,
+                                     PRBool                    aResetSubsequentColIndices,
+                                     const nsFrameList::Slice& aCols)
 {
   nsresult rv = NS_OK;
   nsTableFrame* tableFrame = nsTableFrame::GetTableFrame(this);
-  if (!tableFrame || !aFirstFrame)
+  if (!tableFrame)
     return NS_ERROR_NULL_POINTER;
 
   // set the col indices of the col frames and and add col info to the table
   PRInt32 colIndex = aFirstColIndex;
-  nsIFrame* kidFrame = aFirstFrame;
-  PRBool foundLastFrame = PR_FALSE;
-  while (kidFrame) {
-    if (nsGkAtoms::tableColFrame == kidFrame->GetType()) {
-      ((nsTableColFrame*)kidFrame)->SetColIndex(colIndex);
-      if (!foundLastFrame) {
-        mColCount++;
-        tableFrame->InsertCol((nsTableColFrame &)*kidFrame, colIndex);
-      }
-      colIndex++;
-    }
-    if (kidFrame == aLastFrame) {
-      foundLastFrame = PR_TRUE;
-    }
-    kidFrame = kidFrame->GetNextSibling(); 
+  nsFrameList::Enumerator e(aCols);
+  for (; !e.AtEnd(); e.Next()) {
+    ((nsTableColFrame*)e.get())->SetColIndex(colIndex);
+    mColCount++;
+    tableFrame->InsertCol((nsTableColFrame &)*e.get(), colIndex);
+    colIndex++;
   }
+
+  for (nsFrameList::Enumerator eTail = e.GetUnlimitedEnumerator();
+       !eTail.AtEnd();
+       eTail.Next()) {
+    ((nsTableColFrame*)eTail.get())->SetColIndex(colIndex);
+    colIndex++;
+  }
+
   // We have already set the colindex for all the colframes in this
   // colgroup that come after the first inserted colframe, but there could
   // be other colgroups following this one and their colframes need
@@ -137,38 +135,28 @@ nsTableColGroupFrame::AddColsToTable(PRInt32          aFirstColIndex,
 }
 
 
-PRBool
-nsTableColGroupFrame::GetLastRealColGroup(nsTableFrame* aTableFrame, 
-                                          nsIFrame**    aLastColGroup)
+nsTableColGroupFrame*
+nsTableColGroupFrame::GetLastRealColGroup(nsTableFrame* aTableFrame)
 {
-  *aLastColGroup = nsnull;
   nsFrameList colGroups = aTableFrame->GetColGroups();
 
   nsIFrame* nextToLastColGroup = nsnull;
-  nsIFrame* lastColGroup       = colGroups.FirstChild();
-  while(lastColGroup) {
-    nsIFrame* next = lastColGroup->GetNextSibling();
-    if (next) {
-      nextToLastColGroup = lastColGroup;
-      lastColGroup = next;
-    }
-    else {
-      break;
-    }
+  nsFrameList::FrameLinkEnumerator link(colGroups);
+  for ( ; !link.AtEnd(); link.Next()) {
+    nextToLastColGroup = link.PrevFrame();
   }
 
-  if (!lastColGroup) return PR_TRUE; // there are no col group frames
+  if (!link.PrevFrame()) {
+    return nsnull; // there are no col group frames
+  }
  
   nsTableColGroupType lastColGroupType =
-    ((nsTableColGroupFrame *)lastColGroup)->GetColType();
+    static_cast<nsTableColGroupFrame*>(link.PrevFrame())->GetColType();
   if (eColGroupAnonymousCell == lastColGroupType) {
-    *aLastColGroup = nextToLastColGroup;
-    return PR_FALSE;
-  }
-  else {
-    *aLastColGroup = lastColGroup;
-    return PR_TRUE;
+    return static_cast<nsTableColGroupFrame*>(nextToLastColGroup);
   }
+ 
+  return static_cast<nsTableColGroupFrame*>(link.PrevFrame());
 }
 
 // don't set mColCount here, it is done in AddColsToTable
@@ -223,7 +211,7 @@ nsTableColGroupFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
 
 NS_IMETHODIMP
 nsTableColGroupFrame::AppendFrames(nsIAtom*        aListName,
-                                   nsIFrame*       aFrameList)
+                                   nsFrameList&    aFrameList)
 {
   NS_ASSERTION(!aListName, "unexpected child list");
 
@@ -239,23 +227,21 @@ nsTableColGroupFrame::AppendFrames(nsIAtom*        aListName,
     col = nextCol;
   }
 
-  mFrames.AppendFrames(this, aFrameList);
-  InsertColsReflow(GetStartColumnIndex() + mColCount, aFrameList);
+  const nsFrameList::Slice& newFrames =
+    mFrames.AppendFrames(this, aFrameList);
+  InsertColsReflow(GetStartColumnIndex() + mColCount, newFrames);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsTableColGroupFrame::InsertFrames(nsIAtom*        aListName,
                                    nsIFrame*       aPrevFrame,
-                                   nsIFrame*       aFrameList)
+                                   nsFrameList&    aFrameList)
 {
   NS_ASSERTION(!aListName, "unexpected child list");
   NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this,
                "inserting after sibling frame with different parent");
 
-  nsFrameList frames(aFrameList); // convience for getting last frame
-  nsIFrame* lastFrame = frames.LastChild();
-
   nsTableColFrame* col = GetFirstColumn();
   nsTableColFrame* nextCol;
   while (col && col->GetColType() == eColAnonymousColGroup) {
@@ -281,22 +267,22 @@ nsTableColGroupFrame::InsertFrames(nsIAtom*        aListName,
                GetNextColumn(aPrevFrame)->GetColType() != eColAnonymousCol,
                "Shouldn't be inserting before a spanned colframe");
 
-  mFrames.InsertFrames(this, aPrevFrame, aFrameList);
+  const nsFrameList::Slice& newFrames =
+    mFrames.InsertFrames(this, aPrevFrame, aFrameList);
   nsIFrame* prevFrame = nsTableFrame::GetFrameAtOrBefore(this, aPrevFrame,
                                                          nsGkAtoms::tableColFrame);
 
   PRInt32 colIndex = (prevFrame) ? ((nsTableColFrame*)prevFrame)->GetColIndex() + 1 : GetStartColumnIndex();
-  InsertColsReflow(colIndex, aFrameList, lastFrame);
+  InsertColsReflow(colIndex, newFrames);
 
   return NS_OK;
 }
 
 void
-nsTableColGroupFrame::InsertColsReflow(PRInt32         aColIndex,
-                                       nsIFrame*       aFirstFrame,
-                                       nsIFrame*       aLastFrame)
+nsTableColGroupFrame::InsertColsReflow(PRInt32                   aColIndex,
+                                       const nsFrameList::Slice& aCols)
 {
-  AddColsToTable(aColIndex, PR_TRUE, aFirstFrame, aLastFrame);
+  AddColsToTable(aColIndex, PR_TRUE, aCols);
 
   PresContext()->PresShell()->FrameNeedsReflow(this,
                                                nsIPresShell::eTreeChange,
diff --git a/layout/tables/nsTableColGroupFrame.h b/layout/tables/nsTableColGroupFrame.h
index 7873c9da342..3e487c5e9a2 100644
--- a/layout/tables/nsTableColGroupFrame.h
+++ b/layout/tables/nsTableColGroupFrame.h
@@ -103,11 +103,9 @@ public:
     * that are the result of wrapping cells in an anonymous
     * column and colgroup are not considered real here.
     * @param aTableFrame - the table parent of the colgroups
-    * @param aLastColgroup - the last real colgroup
-    * @return  is false if there is a non real colgroup at the end
+    * @return the last real colgroup
     */
-  static PRBool GetLastRealColGroup(nsTableFrame* aTableFrame, 
-                                    nsIFrame**    aLastColGroup);
+  static nsTableColGroupFrame* GetLastRealColGroup(nsTableFrame* aTableFrame);
 
   /** @see nsIFrame::DidSetStyleContext */
   virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
@@ -115,10 +113,10 @@ public:
   /** @see nsIFrame::AppendFrames, InsertFrames, RemoveFrame
     */
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
 
@@ -161,18 +159,16 @@ public:
     * @param aResetSubsequentColIndices - the indices of the col frames
     *                                     after the insertion might need
     *                                     an update
-    * @param aFirstFrame - first frame that needs to be added to the table,
-    *                      the frame should have a correctly set sibling
-    * @param aLastFrame  - last frame that needs to be added. It can be either
-    *                      null or should be in the sibling chain of
-    *                      aFirstFrame
+    * @param aCols - an iterator that can be used to iterate over the col
+    *                frames to be added.  Once this is done, the frames on the
+    *                sbling chain of its .get() at that point will still need
+    *                their col indices updated.
     * @result            - if there is no table frame or the table frame is not
     *                      the first in flow it will return an error
     */
-  nsresult AddColsToTable(PRInt32          aFirstColIndex,
-                          PRBool           aResetSubsequentColIndices,
-                          nsIFrame*        aFirstFrame,
-                          nsIFrame*        aLastFrame = nsnull);
+  nsresult AddColsToTable(PRInt32                   aFirstColIndex,
+                          PRBool                    aResetSubsequentColIndices,
+                          const nsFrameList::Slice& aCols);
 
 #ifdef DEBUG
   NS_IMETHOD GetFrameName(nsAString& aResult) const;
@@ -237,9 +233,8 @@ public:
 protected:
   nsTableColGroupFrame(nsStyleContext* aContext);
 
-  void InsertColsReflow(PRInt32         aColIndex,
-                        nsIFrame*       aFirstFrame,
-                        nsIFrame*       aLastFrame = nsnull);
+  void InsertColsReflow(PRInt32                   aColIndex,
+                        const nsFrameList::Slice& aCols);
 
   /** implement abstract method on nsHTMLContainerFrame */
   virtual PRIntn GetSkipSides() const;
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index cf5b04b1596..c134005d355 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -354,8 +354,8 @@ nsTableFrame::SetInitialChildList(nsIAtom*        aListName,
   if (!GetPrevInFlow()) {
     // process col groups first so that real cols get constructed before
     // anonymous ones due to cells in rows.
-    InsertColGroups(0, mColGroups.FirstChild());
-    AppendRowGroups(mFrames.FirstChild());
+    InsertColGroups(0, mColGroups);
+    InsertRowGroups(mFrames);
     // calc collapsing borders 
     if (IsBorderCollapse()) {
       nsRect damageArea(0, 0, GetColCount(), GetRowCount());
@@ -527,78 +527,72 @@ void nsTableFrame::AdjustRowIndices(PRInt32         aRowIndex,
 }
 
 
-void nsTableFrame::ResetRowIndices(nsIFrame* aFirstRowGroupFrame,
-                                   nsIFrame* aLastRowGroupFrame)
+void nsTableFrame::ResetRowIndices(const nsFrameList::Slice& aRowGroupsToExclude)
 {
   // Iterate over the row groups and adjust the row indices of all rows
   // omit the rowgroups that will be inserted later
+  // XXXbz this code seems to assume that the row groups handed out by
+  // aRowGroupsToExclude are already in OrderRowGroups() order.
+  // There's no reason that would be true!
   RowGroupArray rowGroups;
   OrderRowGroups(rowGroups);
 
   PRInt32 rowIndex = 0;
   nsTableRowGroupFrame* newRgFrame = nsnull;
-  nsIFrame* omitRgFrame = aFirstRowGroupFrame;
-  if (omitRgFrame) {
-    newRgFrame = GetRowGroupFrame(omitRgFrame);
-    if (omitRgFrame == aLastRowGroupFrame)
-      omitRgFrame = nsnull;
+  nsFrameList::Enumerator excludeRowGroupsEnumerator(aRowGroupsToExclude);
+  if (!excludeRowGroupsEnumerator.AtEnd()) {
+    newRgFrame = GetRowGroupFrame(excludeRowGroupsEnumerator.get());
+    excludeRowGroupsEnumerator.Next();
   }
 
   for (PRUint32 rgX = 0; rgX < rowGroups.Length(); rgX++) {
     nsTableRowGroupFrame* rgFrame = rowGroups[rgX];
     if (rgFrame == newRgFrame) {
-      // omit the new rowgroup
-      if (omitRgFrame) {
-        omitRgFrame = omitRgFrame->GetNextSibling();
-        if (omitRgFrame) {
-          newRgFrame  = GetRowGroupFrame(omitRgFrame);
-          if (omitRgFrame == aLastRowGroupFrame)
-            omitRgFrame = nsnull;
-        }
+      // omit the new rowgroup and move our iterator along
+      if (!excludeRowGroupsEnumerator.AtEnd()) {
+        newRgFrame = GetRowGroupFrame(excludeRowGroupsEnumerator.get());
+        excludeRowGroupsEnumerator.Next();
       }
     }
     else {
-      nsIFrame* rowFrame = rgFrame->GetFirstChild(nsnull);
-      for ( ; rowFrame; rowFrame = rowFrame->GetNextSibling()) {
-        if (NS_STYLE_DISPLAY_TABLE_ROW==rowFrame->GetStyleDisplay()->mDisplay) {
-          ((nsTableRowFrame *)rowFrame)->SetRowIndex(rowIndex);
+      const nsFrameList& rowFrames = rgFrame->GetChildList(nsnull);
+      for (nsFrameList::Enumerator rows(rowFrames); !rows.AtEnd(); rows.Next()) {
+        if (NS_STYLE_DISPLAY_TABLE_ROW==rows.get()->GetStyleDisplay()->mDisplay) {
+          ((nsTableRowFrame *)rows.get())->SetRowIndex(rowIndex);
           rowIndex++;
         }
       }
     }
   }
 }
-void nsTableFrame::InsertColGroups(PRInt32         aStartColIndex,
-                                   nsIFrame*       aFirstFrame,
-                                   nsIFrame*       aLastFrame)
+void nsTableFrame::InsertColGroups(PRInt32                   aStartColIndex,
+                                   const nsFrameList::Slice& aColGroups)
 {
   PRInt32 colIndex = aStartColIndex;
-  nsTableColGroupFrame* firstColGroupToReset = nsnull;
-  nsIFrame* kidFrame = aFirstFrame;
-  PRBool didLastFrame = PR_FALSE;
-  while (kidFrame) {
-    if (nsGkAtoms::tableColGroupFrame == kidFrame->GetType()) {
-      if (didLastFrame) {
-        firstColGroupToReset = (nsTableColGroupFrame*)kidFrame;
-        break;
-      }
-      else {
-        nsTableColGroupFrame* cgFrame = (nsTableColGroupFrame*)kidFrame;
-        cgFrame->SetStartColumnIndex(colIndex);
-        nsIFrame* firstCol = kidFrame->GetFirstChild(nsnull);
-        cgFrame->AddColsToTable(colIndex, PR_FALSE, firstCol);
-        PRInt32 numCols = cgFrame->GetColCount();
-        colIndex += numCols;
-      }
-    }
-    if (kidFrame == aLastFrame) {
-      didLastFrame = PR_TRUE;
-    }
-    kidFrame = kidFrame->GetNextSibling();
+  nsFrameList::Enumerator colGroups(aColGroups);
+  for (; !colGroups.AtEnd(); colGroups.Next()) {
+    nsTableColGroupFrame* cgFrame =
+      static_cast<nsTableColGroupFrame*>(colGroups.get());
+    cgFrame->SetStartColumnIndex(colIndex);
+    // XXXbz this sucks.  AddColsToTable will actually remove colgroups from
+    // the list we're traversing!  Need to fix things here.  :( I guess this is
+    // why the old code used pointer-to-last-frame as opposed to
+    // pointer-to-frame-after-last....
+
+    // How about dealing with this by storing a const reference to the
+    // mNextSibling of the framelist's last frame, instead of storing a pointer
+    // to the first-after-next frame?  Will involve making nsFrameList friend
+    // of nsIFrame, but it's time for that anyway.
+    cgFrame->AddColsToTable(colIndex, PR_FALSE,
+                              colGroups.get()->GetChildList(nsnull));
+    PRInt32 numCols = cgFrame->GetColCount();
+    colIndex += numCols;
   }
 
-  if (firstColGroupToReset) {
-    nsTableColGroupFrame::ResetColIndices(firstColGroupToReset, colIndex);
+  nsFrameList::Enumerator remainingColgroups = colGroups.GetUnlimitedEnumerator();
+  if (!remainingColgroups.AtEnd()) {
+    nsTableColGroupFrame::ResetColIndices(
+      static_cast<nsTableColGroupFrame*>(remainingColgroups.get()), colIndex);
   }
 }
 
@@ -764,9 +758,8 @@ nsTableFrame::AppendAnonymousColFrames(nsTableColGroupFrame* aColGroupFrame,
   }
   nsFrameList& cols = aColGroupFrame->GetWritableChildList();
   nsIFrame* oldLastCol = cols.LastChild();
-  nsIFrame* firstNewCol = newColFrames.FirstChild();
-  nsIFrame* lastNewCol = newColFrames.lastChild;
-  cols.InsertFrames(nsnull, oldLastCol, newColFrames);
+  const nsFrameList::Slice& newCols =
+    cols.InsertFrames(nsnull, oldLastCol, newColFrames);
   if (aAddToTable) {
     // get the starting col index in the cache
     PRInt32 startColIndex;
@@ -777,8 +770,7 @@ nsTableFrame::AppendAnonymousColFrames(nsTableColGroupFrame* aColGroupFrame,
       startColIndex = aColGroupFrame->GetStartColumnIndex();
     }
 
-    aColGroupFrame->AddColsToTable(startColIndex, PR_TRUE, 
-                                   firstNewCol, lastNewCol);
+    aColGroupFrame->AddColsToTable(startColIndex, PR_TRUE, newCols);
   }
 }
 
@@ -1023,17 +1015,6 @@ void nsTableFrame::RemoveRows(nsTableRowFrame& aFirstRowFrame,
 #endif
 }
 
-void nsTableFrame::AppendRowGroups(nsIFrame* aFirstRowGroupFrame)
-{
-  if (aFirstRowGroupFrame) {
-    nsTableCellMap* cellMap = GetCellMap();
-    if (cellMap) {
-      nsFrameList newList(aFirstRowGroupFrame);
-      InsertRowGroups(aFirstRowGroupFrame, newList.LastChild());
-    }
-  }
-}
-
 nsTableRowGroupFrame*
 nsTableFrame::GetRowGroupFrame(nsIFrame* aFrame,
                                nsIAtom*  aFrameTypeIn)
@@ -1086,8 +1067,7 @@ nsTableFrame::CollectRows(nsIFrame*                   aFrame,
 }
 
 void
-nsTableFrame::InsertRowGroups(nsIFrame* aFirstRowGroupFrame,
-                              nsIFrame* aLastRowGroupFrame)
+nsTableFrame::InsertRowGroups(const nsFrameList::Slice& aRowGroups)
 {
 #ifdef DEBUG_TABLE_CELLMAP
   printf("=== insertRowGroupsBefore\n");
@@ -1101,11 +1081,13 @@ nsTableFrame::InsertRowGroups(nsIFrame* aFirstRowGroupFrame,
     nsAutoTArray<nsTableRowFrame*, 8> rows;
     // Loop over the rowgroups and check if some of them are new, if they are
     // insert cellmaps in the order that is predefined by OrderRowGroups,
+    // XXXbz this code is O(N*M) where N is number of new rowgroups
+    // and M is number of rowgroups we have!
     PRUint32 rgIndex;
     for (rgIndex = 0; rgIndex < orderedRowGroups.Length(); rgIndex++) {
-      nsIFrame* kidFrame = aFirstRowGroupFrame;
-      while (kidFrame) {
-        nsTableRowGroupFrame* rgFrame = GetRowGroupFrame(kidFrame);
+      for (nsFrameList::Enumerator rowgroups(aRowGroups); !rowgroups.AtEnd();
+           rowgroups.Next()) {
+        nsTableRowGroupFrame* rgFrame = GetRowGroupFrame(rowgroups.get());
 
         if (orderedRowGroups[rgIndex] == rgFrame) {
           nsTableRowGroupFrame* priorRG =
@@ -1115,28 +1097,22 @@ nsTableFrame::InsertRowGroups(nsIFrame* aFirstRowGroupFrame,
         
           break;
         }
-        else {
-          if (kidFrame == aLastRowGroupFrame) {
-            break;
-          }
-          kidFrame = kidFrame->GetNextSibling();
-        }
       }
     }
     cellMap->Synchronize(this);
-    ResetRowIndices(aFirstRowGroupFrame, aLastRowGroupFrame);
+    ResetRowIndices(aRowGroups);
 
     //now that the cellmaps are reordered too insert the rows
     for (rgIndex = 0; rgIndex < orderedRowGroups.Length(); rgIndex++) {
-      nsIFrame* kidFrame = aFirstRowGroupFrame;
-      while (kidFrame) {
-        nsTableRowGroupFrame* rgFrame = GetRowGroupFrame(kidFrame);
+      for (nsFrameList::Enumerator rowgroups(aRowGroups); !rowgroups.AtEnd();
+           rowgroups.Next()) {
+        nsTableRowGroupFrame* rgFrame = GetRowGroupFrame(rowgroups.get());
 
         if (orderedRowGroups[rgIndex] == rgFrame) {
           nsTableRowGroupFrame* priorRG =
             (0 == rgIndex) ? nsnull : orderedRowGroups[rgIndex - 1]; 
           // collect the new row frames in an array and add them to the table
-          PRInt32 numRows = CollectRows(kidFrame, rows);
+          PRInt32 numRows = CollectRows(rowgroups.get(), rows);
           if (numRows > 0) {
             PRInt32 rowIndex = 0;
             if (priorRG) {
@@ -1148,12 +1124,6 @@ nsTableFrame::InsertRowGroups(nsIFrame* aFirstRowGroupFrame,
           }
           break;
         }
-        else {
-          if (kidFrame == aLastRowGroupFrame) {
-            break;
-          }
-          kidFrame = kidFrame->GetNextSibling();
-        }
       }
     }    
     
@@ -2020,10 +1990,9 @@ nsTableFrame::PushChildren(const FrameArray& aFrames,
     }
     // When pushing and pulling frames we need to check for whether any
     // views need to be reparented.
-    for (nsIFrame* f = frames.FirstChild(); f; f = f->GetNextSibling()) {
-      nsHTMLContainerFrame::ReparentFrameView(PresContext(), f, this, nextInFlow);
-    }
-    nextInFlow->mFrames.InsertFrames(GetNextInFlow(), prevSibling, frames.FirstChild());
+    ReparentFrameViewList(PresContext(), frames, this, nextInFlow);
+    nextInFlow->mFrames.InsertFrames(nextInFlow, prevSibling,
+                                     frames);
   }
   else if (frames.NotEmpty()) {
     // Add the frames to our overflow list
@@ -2138,7 +2107,7 @@ nsTableFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
 
 NS_IMETHODIMP
 nsTableFrame::AppendFrames(nsIAtom*        aListName,
-                           nsIFrame*       aFrameList)
+                           nsFrameList&    aFrameList)
 {
   NS_ASSERTION(!aListName || aListName == nsGkAtoms::colGroupList,
                "unexpected child list");
@@ -2147,43 +2116,33 @@ nsTableFrame::AppendFrames(nsIAtom*        aListName,
   // for everything else, we need to look at each frame individually
   // XXX The frame construction code should be separating out child frames
   // based on the type, bug 343048.
-  nsIFrame* f = aFrameList;
-  while (f) {
-    // Get the next frame and disconnect this frame from its sibling
-    nsIFrame* next = f->GetNextSibling();
-    f->SetNextSibling(nsnull);
+  while (!aFrameList.IsEmpty()) {
+    nsIFrame* f = aFrameList.FirstChild();
+    aFrameList.RemoveFrame(f);
 
     // See what kind of frame we have
     const nsStyleDisplay* display = f->GetStyleDisplay();
 
     if (NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP == display->mDisplay) {
-      nsTableColGroupFrame* lastColGroup;
-      PRBool doAppend = nsTableColGroupFrame::GetLastRealColGroup(this, (nsIFrame**) &lastColGroup);
+      nsTableColGroupFrame* lastColGroup =
+        nsTableColGroupFrame::GetLastRealColGroup(this);
       PRInt32 startColIndex = (lastColGroup) 
         ? lastColGroup->GetStartColumnIndex() + lastColGroup->GetColCount() : 0;
-      if (doAppend) {
-        // Append the new col group frame
-        mColGroups.AppendFrame(nsnull, f);
-      }
-      else {
-        // there is a colgroup after the last real one
-          mColGroups.InsertFrame(nsnull, lastColGroup, f);
-      }
+      mColGroups.InsertFrame(nsnull, lastColGroup, f);
       // Insert the colgroup and its cols into the table
-      InsertColGroups(startColIndex, f, f);
+      InsertColGroups(startColIndex,
+                      nsFrameList::Slice(mColGroups, f, f->GetNextSibling()));
     } else if (IsRowGroup(display->mDisplay)) {
       // Append the new row group frame to the sibling chain
       mFrames.AppendFrame(nsnull, f);
 
       // insert the row group and its rows into the table
-      InsertRowGroups(f, f);
+      InsertRowGroups(nsFrameList::Slice(mFrames, f, nsnull));
     } else {
       // Nothing special to do, just add the frame to our child list
+      NS_NOTREACHED("How did we get here?  Frame construction screwed up");
       mFrames.AppendFrame(nsnull, f);
     }
-
-    // Move to the next frame
-    f = next;
   }
 
 #ifdef DEBUG_TABLE_CELLMAP
@@ -2200,7 +2159,7 @@ nsTableFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsTableFrame::InsertFrames(nsIAtom*        aListName,
                            nsIFrame*       aPrevFrame,
-                           nsIFrame*       aFrameList)
+                           nsFrameList&    aFrameList)
 {
   // Asssume there's only one frame being inserted. The problem is that
   // row group frames and col group frames go in separate child lists and
@@ -2212,22 +2171,20 @@ nsTableFrame::InsertFrames(nsIAtom*        aListName,
                "inserting after sibling frame with different parent");
 
   if ((aPrevFrame && !aPrevFrame->GetNextSibling()) ||
-      (!aPrevFrame && !GetFirstChild(aListName))) {
+      (!aPrevFrame && GetChildList(aListName).IsEmpty())) {
     // Treat this like an append; still a workaround for bug 343048.
     return AppendFrames(aListName, aFrameList);
   }
 
   // See what kind of frame we have
-  const nsStyleDisplay* display = aFrameList->GetStyleDisplay();
+  const nsStyleDisplay* display = aFrameList.FirstChild()->GetStyleDisplay();
 #ifdef DEBUG
   // verify that all sibling have the same type, if they do not, expect cellmap issues
-  nsIFrame* nextFrame = aFrameList->GetNextSibling();
-  while (nextFrame) {
-    const nsStyleDisplay* nextDisplay = nextFrame->GetStyleDisplay();
+  for (nsFrameList::Enumerator e(aFrameList); !e.AtEnd(); e.Next()) {
+    const nsStyleDisplay* nextDisplay = e.get()->GetStyleDisplay();
     NS_ASSERTION((display->mDisplay == NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP) ==
         (nextDisplay->mDisplay == NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP),
       "heterogenous childlist");  
-    nextFrame = nextFrame->GetNextSibling();    
   }
 #endif  
   if (aPrevFrame) {
@@ -2238,7 +2195,7 @@ nsTableFrame::InsertFrames(nsIAtom*        aListName,
       // the previous frame is not valid, see comment at ::AppendFrames
       // XXXbz Using content indices here means XBL will get screwed
       // over...  Oh, well.
-      nsIFrame* pseudoFrame = aFrameList;
+      nsIFrame* pseudoFrame = aFrameList.FirstChild();
       nsIContent* parentContent = GetContent();
       nsIContent* content;
       aPrevFrame = nsnull;
@@ -2255,8 +2212,7 @@ nsTableFrame::InsertFrames(nsIAtom*        aListName,
         nsTableColGroupFrame* lastColGroup;
         if (isColGroup) {
           kidFrame = mColGroups.FirstChild();
-          nsTableColGroupFrame::GetLastRealColGroup(this,
-                                                   (nsIFrame**) &lastColGroup);
+          lastColGroup = nsTableColGroupFrame::GetLastRealColGroup(this);
         }
         else {
           kidFrame = mFrames.FirstChild();
@@ -2288,10 +2244,9 @@ nsTableFrame::InsertFrames(nsIAtom*        aListName,
   if (NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP == display->mDisplay) {
     NS_ASSERTION(!aListName || aListName == nsGkAtoms::colGroupList,
                  "unexpected child list");
-    // Insert the column group frame
-    nsFrameList frames(aFrameList); // convience for getting last frame
-    nsIFrame* lastFrame = frames.LastChild();
-    mColGroups.InsertFrames(nsnull, aPrevFrame, aFrameList);
+    // Insert the column group frames
+    const nsFrameList::Slice& newColgroups =
+      mColGroups.InsertFrames(nsnull, aPrevFrame, aFrameList);
     // find the starting col index for the first new col group
     PRInt32 startColIndex = 0;
     if (aPrevFrame) {
@@ -2302,17 +2257,17 @@ nsTableFrame::InsertFrames(nsIAtom*        aListName,
         startColIndex = prevColGroup->GetStartColumnIndex() + prevColGroup->GetColCount();
       }
     }
-    InsertColGroups(startColIndex, aFrameList, lastFrame);
+    InsertColGroups(startColIndex, newColgroups);
   } else if (IsRowGroup(display->mDisplay)) {
     NS_ASSERTION(!aListName, "unexpected child list");
-    nsFrameList newList(aFrameList);
-    nsIFrame* lastSibling = newList.LastChild();
     // Insert the frames in the sibling chain
-    mFrames.InsertFrames(nsnull, aPrevFrame, aFrameList);
+    const nsFrameList::Slice& newRowGroups =
+      mFrames.InsertFrames(nsnull, aPrevFrame, aFrameList);
 
-    InsertRowGroups(aFrameList, lastSibling);
+    InsertRowGroups(newRowGroups);
   } else {
     NS_ASSERTION(!aListName, "unexpected child list");
+    NS_NOTREACHED("How did we even get here?");
     // Just insert the frame and don't worry about reflowing it
     mFrames.InsertFrames(nsnull, aPrevFrame, aFrameList);
     return NS_OK;
@@ -2377,7 +2332,8 @@ nsTableFrame::RemoveFrame(nsIAtom*        aListName,
       // XXXldb [reflow branch merging 20060830] do we still need this?
       if (cellMap) {
         cellMap->Synchronize(this);
-        ResetRowIndices();
+        // Create an empty slice
+        ResetRowIndices(nsFrameList::Slice(mFrames, nsnull, nsnull));
         nsRect damageArea;
         cellMap->RebuildConsideringCells(nsnull, nsnull, 0, 0, PR_FALSE, damageArea);
       }
diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h
index 19d39b4937f..2fc7589abf5 100644
--- a/layout/tables/nsTableFrame.h
+++ b/layout/tables/nsTableFrame.h
@@ -200,10 +200,10 @@ public:
   virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
 
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
 
@@ -499,22 +499,12 @@ public:
                           PRBool           aConsiderSpans);
 
   /** Insert multiple rowgroups into the table cellmap handling
-    * @param aFirstRowGroupFrame - first row group to be inserted all siblings
-    *                              will be appended too.
+    * @param aRowGroups - iterator that iterates over the rowgroups to insert
     */
-  void AppendRowGroups(nsIFrame* aFirstRowGroupFrame);
+  void InsertRowGroups(const nsFrameList::Slice& aRowGroups);
 
-  /** Insert multiple rowgroups into the table cellmap handling
-    * @param aFirstRowGroupFrame - first row group to be inserted
-    * @param aLastRowGroupFrame  - when inserting the siblings of 
-    *                              aFirstRowGroupFrame stop at this row group
-    */
-  void InsertRowGroups(nsIFrame*       aFirstRowGroupFrame,
-                       nsIFrame*       aLastRowGroupFrame);
-
-  void InsertColGroups(PRInt32         aColIndex,
-                       nsIFrame*       aFirstFrame,
-                       nsIFrame*       aLastFrame = nsnull);
+  void InsertColGroups(PRInt32                   aStartColIndex,
+                       const nsFrameList::Slice& aColgroups);
 
   virtual void RemoveCol(nsTableColGroupFrame* aColGroupFrame,
                          PRInt32               aColIndex,
@@ -745,13 +735,10 @@ public:
   /** Reset the rowindices of all rows as they might have changed due to 
     * rowgroup reordering, exclude new row group frames that show in the
     * reordering but are not yet inserted into the cellmap
-    * @param aFirstRowGroupFrame - first row group to be excluded
-    * @param aLastRowGroupFrame  - last sibling of aFirstRowGroupFrame that
-    *                              should be excluded when reseting the row
-    *                              indices.
+    * @param aRowGroupsToExclude - an iterator that will produce the row groups
+    *                              to exclude.
     */
-  void ResetRowIndices(nsIFrame* aFirstRowGroupFrame = nsnull,
-                       nsIFrame* aLastRowGroupFrame = nsnull);
+  void ResetRowIndices(const nsFrameList::Slice& aRowGroupsToExclude);
 
   nsTArray<nsTableColFrame*>& GetColCache();
 
diff --git a/layout/tables/nsTableOuterFrame.cpp b/layout/tables/nsTableOuterFrame.cpp
index 5706b60bc26..68c5b1f6453 100644
--- a/layout/tables/nsTableOuterFrame.cpp
+++ b/layout/tables/nsTableOuterFrame.cpp
@@ -266,15 +266,15 @@ nsTableOuterFrame::SetInitialChildList(nsIAtom*        aListName,
 
 NS_IMETHODIMP
 nsTableOuterFrame::AppendFrames(nsIAtom*        aListName,
-                                nsIFrame*       aFrameList)
+                                nsFrameList&    aFrameList)
 {
   nsresult rv;
 
   // We only have two child frames: the inner table and a caption frame.
   // The inner frame is provided when we're initialized, and it cannot change
   if (nsGkAtoms::captionList == aListName) {
-    NS_ASSERTION(!aFrameList ||
-                 aFrameList->GetType() == nsGkAtoms::tableCaptionFrame,
+    NS_ASSERTION(aFrameList.IsEmpty() ||
+                 aFrameList.FirstChild()->GetType() == nsGkAtoms::tableCaptionFrame,
                  "appending non-caption frame to captionList");
     mCaptionFrames.AppendFrames(this, aFrameList);
     mCaptionFrame = mCaptionFrames.FirstChild();
@@ -297,13 +297,13 @@ nsTableOuterFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsTableOuterFrame::InsertFrames(nsIAtom*        aListName,
                                 nsIFrame*       aPrevFrame,
-                                nsIFrame*       aFrameList)
+                                nsFrameList&    aFrameList)
 {
   if (nsGkAtoms::captionList == aListName) {
     NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this,
                  "inserting after sibling frame with different parent");
-    NS_ASSERTION(!aFrameList ||
-                 aFrameList->GetType() == nsGkAtoms::tableCaptionFrame,
+    NS_ASSERTION(aFrameList.IsEmpty() ||
+                 aFrameList.FirstChild()->GetType() == nsGkAtoms::tableCaptionFrame,
                  "inserting non-caption frame into captionList");
     mCaptionFrames.InsertFrames(nsnull, aPrevFrame, aFrameList);
     mCaptionFrame = mCaptionFrames.FirstChild();
diff --git a/layout/tables/nsTableOuterFrame.h b/layout/tables/nsTableOuterFrame.h
index b45736e647c..0d2a9e65aa0 100644
--- a/layout/tables/nsTableOuterFrame.h
+++ b/layout/tables/nsTableOuterFrame.h
@@ -110,11 +110,11 @@ public:
   virtual nsIAtom* GetAdditionalChildListName(PRInt32 aIndex) const;
 
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
 
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
 
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp
index 286161f640d..8160c250304 100644
--- a/layout/tables/nsTableRowFrame.cpp
+++ b/layout/tables/nsTableRowFrame.cpp
@@ -199,18 +199,19 @@ nsTableRowFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
 
 NS_IMETHODIMP
 nsTableRowFrame::AppendFrames(nsIAtom*        aListName,
-                              nsIFrame*       aFrameList)
+                              nsFrameList&    aFrameList)
 {
   NS_ASSERTION(!aListName, "unexpected child list");
 
   // Append the frames
-  mFrames.AppendFrames(nsnull, aFrameList);
+  // XXXbz why do we append here first, then append to table, while
+  // for InsertFrames we do it in the other order?  Bug 507419 covers this.
+  const nsFrameList::Slice& newCells = mFrames.AppendFrames(nsnull, aFrameList);
 
   // Add the new cell frames to the table
   nsTableFrame *tableFrame =  nsTableFrame::GetTableFrame(this);
-  for (nsIFrame* childFrame = aFrameList; childFrame;
-       childFrame = childFrame->GetNextSibling()) {
-    nsTableCellFrame *cellFrame = do_QueryFrame(childFrame);
+  for (nsFrameList::Enumerator e(newCells) ; !e.AtEnd(); e.Next()) {
+    nsTableCellFrame *cellFrame = do_QueryFrame(e.get());
     NS_ASSERTION(cellFrame, "Unexpected frame");
     if (cellFrame) {
       // Add the cell to the cell map
@@ -229,7 +230,7 @@ nsTableRowFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsTableRowFrame::InsertFrames(nsIAtom*        aListName,
                               nsIFrame*       aPrevFrame,
-                              nsIFrame*       aFrameList)
+                              nsFrameList&    aFrameList)
 {
   NS_ASSERTION(!aListName, "unexpected child list");
   NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this,
@@ -239,12 +240,13 @@ nsTableRowFrame::InsertFrames(nsIAtom*        aListName,
   nsTableFrame* tableFrame = nsTableFrame::GetTableFrame(this);
   
   // gather the new frames (only those which are cells) into an array
+  // XXXbz there shouldn't be any other ones here... can we just put
+  // them all in the array and not do all this QI nonsense?
   nsIAtom* cellFrameType = (tableFrame->IsBorderCollapse()) ? nsGkAtoms::bcTableCellFrame : nsGkAtoms::tableCellFrame;
   nsTableCellFrame* prevCellFrame = (nsTableCellFrame *)nsTableFrame::GetFrameAtOrBefore(this, aPrevFrame, cellFrameType);
   nsTArray<nsTableCellFrame*> cellChildren;
-  for (nsIFrame* childFrame = aFrameList; childFrame;
-       childFrame = childFrame->GetNextSibling()) {
-    nsTableCellFrame *cellFrame = do_QueryFrame(childFrame);
+  for (nsFrameList::Enumerator e(aFrameList); !e.AtEnd(); e.Next()) {
+    nsTableCellFrame *cellFrame = do_QueryFrame(e.get());
     NS_ASSERTION(cellFrame, "Unexpected frame");
     if (cellFrame) {
       cellChildren.AppendElement(cellFrame);
diff --git a/layout/tables/nsTableRowFrame.h b/layout/tables/nsTableRowFrame.h
index ac03819b543..6e3375bea85 100644
--- a/layout/tables/nsTableRowFrame.h
+++ b/layout/tables/nsTableRowFrame.h
@@ -80,10 +80,10 @@ public:
   virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
   
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
 
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index 8d894535ca8..65e1e8f7d3b 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -1390,20 +1390,21 @@ nsTableRowGroupFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
 
 NS_IMETHODIMP
 nsTableRowGroupFrame::AppendFrames(nsIAtom*        aListName,
-                                   nsIFrame*       aFrameList)
+                                   nsFrameList&    aFrameList)
 {
   NS_ASSERTION(!aListName, "unexpected child list");
 
   ClearRowCursor();
 
   // collect the new row frames in an array
+  // XXXbz why are we doing the QI stuff?  There shouldn't be any non-rows here.
   nsAutoTArray<nsTableRowFrame*, 8> rows;
-  for (nsIFrame* childFrame = aFrameList; childFrame;
-       childFrame = childFrame->GetNextSibling()) {
-    nsTableRowFrame *rowFrame = do_QueryFrame(childFrame);
+  for (nsFrameList::Enumerator e(aFrameList); !e.AtEnd(); e.Next()) {
+    nsTableRowFrame *rowFrame = do_QueryFrame(e.get());
+    NS_ASSERTION(rowFrame, "Unexpected frame; frame constructor screwed up");
     if (rowFrame) {
       NS_ASSERTION(NS_STYLE_DISPLAY_TABLE_ROW ==
-                     childFrame->GetStyleDisplay()->mDisplay,
+                     e.get()->GetStyleDisplay()->mDisplay,
                    "wrong display type on rowframe");      
       rows.AppendElement(rowFrame);
     }
@@ -1430,7 +1431,7 @@ nsTableRowGroupFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsTableRowGroupFrame::InsertFrames(nsIAtom*        aListName,
                                    nsIFrame*       aPrevFrame,
-                                   nsIFrame*       aFrameList)
+                                   nsFrameList&    aFrameList)
 {
   NS_ASSERTION(!aListName, "unexpected child list");
   NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this,
@@ -1443,14 +1444,15 @@ nsTableRowGroupFrame::InsertFrames(nsIAtom*        aListName,
     return NS_ERROR_NULL_POINTER;
 
   // collect the new row frames in an array
+  // XXXbz why are we doing the QI stuff?  There shouldn't be any non-rows here.
   nsTArray<nsTableRowFrame*> rows;
   PRBool gotFirstRow = PR_FALSE;
-  for (nsIFrame* childFrame = aFrameList; childFrame;
-       childFrame = childFrame->GetNextSibling()) {
-    nsTableRowFrame *rowFrame = do_QueryFrame(childFrame);
+  for (nsFrameList::Enumerator e(aFrameList); !e.AtEnd(); e.Next()) {
+    nsTableRowFrame *rowFrame = do_QueryFrame(e.get());
+    NS_ASSERTION(rowFrame, "Unexpected frame; frame constructor screwed up");
     if (rowFrame) {
       NS_ASSERTION(NS_STYLE_DISPLAY_TABLE_ROW ==
-                     childFrame->GetStyleDisplay()->mDisplay,
+                     e.get()->GetStyleDisplay()->mDisplay,
                    "wrong display type on rowframe");      
       rows.AppendElement(rowFrame);
       if (!gotFirstRow) {
diff --git a/layout/tables/nsTableRowGroupFrame.h b/layout/tables/nsTableRowGroupFrame.h
index adc74d14aa4..96eb0b32a7e 100644
--- a/layout/tables/nsTableRowGroupFrame.h
+++ b/layout/tables/nsTableRowGroupFrame.h
@@ -111,11 +111,11 @@ public:
   virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
   
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
 
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
diff --git a/layout/xul/base/src/grid/nsGridLayout2.cpp b/layout/xul/base/src/grid/nsGridLayout2.cpp
index 199f9947e2c..ec69dfa2556 100644
--- a/layout/xul/base/src/grid/nsGridLayout2.cpp
+++ b/layout/xul/base/src/grid/nsGridLayout2.cpp
@@ -260,14 +260,15 @@ nsGridLayout2::GetTotalMargin(nsIBox* aBox, PRBool aIsHorizontal)
 
 void
 nsGridLayout2::ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
-                                nsIBox* aPrevBox, nsIBox* aChildList)
+                                nsIBox* aPrevBox,
+                                const nsFrameList::Slice& aNewChildren)
 {
   mGrid.NeedsRebuild(aState);
 }
 
 void
 nsGridLayout2::ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
-                                nsIBox* aChildList)
+                                const nsFrameList::Slice& aNewChildren)
 {
   mGrid.NeedsRebuild(aState);
 }
diff --git a/layout/xul/base/src/grid/nsGridLayout2.h b/layout/xul/base/src/grid/nsGridLayout2.h
index 5eb934a87bb..3b71a98fe00 100644
--- a/layout/xul/base/src/grid/nsGridLayout2.h
+++ b/layout/xul/base/src/grid/nsGridLayout2.h
@@ -80,9 +80,10 @@ public:
   virtual nsMargin GetTotalMargin(nsIBox* aBox, PRBool aIsHorizontal);
   virtual Type GetType() { return eGrid; }
   virtual void ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
-                              nsIBox* aPrevBox, nsIBox* aChildList);
+                                nsIBox* aPrevBox,
+                                const nsFrameList::Slice& aNewChildren);
   virtual void ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
-                              nsIBox* aChildList);
+                                const nsFrameList::Slice& aNewChildren);
   virtual void ChildrenRemoved(nsIBox* aBox, nsBoxLayoutState& aState,
                              nsIBox* aChildList);
   virtual void ChildrenSet(nsIBox* aBox, nsBoxLayoutState& aState,
diff --git a/layout/xul/base/src/grid/nsGridRowLayout.cpp b/layout/xul/base/src/grid/nsGridRowLayout.cpp
index d01b460abfc..2c61b945696 100644
--- a/layout/xul/base/src/grid/nsGridRowLayout.cpp
+++ b/layout/xul/base/src/grid/nsGridRowLayout.cpp
@@ -54,13 +54,16 @@ nsGridRowLayout::nsGridRowLayout():nsSprocketLayout()
 }
 
 void
-nsGridRowLayout::ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aPrevBox, nsIBox* aChildList)
+nsGridRowLayout::ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
+                                  nsIBox* aPrevBox,
+                                  const nsFrameList::Slice& aNewChildren)
 {
   ChildAddedOrRemoved(aBox, aState);
 }
 
 void
-nsGridRowLayout::ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList)
+nsGridRowLayout::ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
+                                  const nsFrameList::Slice& aNewChildren)
 {
   ChildAddedOrRemoved(aBox, aState);
 }
diff --git a/layout/xul/base/src/grid/nsGridRowLayout.h b/layout/xul/base/src/grid/nsGridRowLayout.h
index 3ece9f094e9..135da0b4261 100644
--- a/layout/xul/base/src/grid/nsGridRowLayout.h
+++ b/layout/xul/base/src/grid/nsGridRowLayout.h
@@ -70,8 +70,11 @@ public:
   virtual nsGridLayout2* CastToGridLayout() { return nsnull; }
   virtual nsGrid* GetGrid(nsIBox* aBox, PRInt32* aIndex, nsGridRowLayout* aRequestor=nsnull);
   virtual void GetParentGridPart(nsIBox* aBox, nsIBox** aParentBox, nsIGridPart** aParentGridRow);
-  virtual void ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aPrevBox, nsIBox* aChildList);
-  virtual void ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList);
+  virtual void ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
+                                nsIBox* aPrevBox,
+                                const nsFrameList::Slice& aNewChildren);
+  virtual void ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
+                                const nsFrameList::Slice& aNewChildren);
   virtual void ChildrenRemoved(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList);
   virtual void ChildrenSet(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList);
   virtual nsMargin GetTotalMargin(nsIBox* aBox, PRBool aIsHorizontal);
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index 5b2e4cefb11..103e95666d6 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -1036,7 +1036,7 @@ nsBoxFrame::RemoveFrame(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsBoxFrame::InsertFrames(nsIAtom*        aListName,
                          nsIFrame*       aPrevFrame,
-                         nsIFrame*       aFrameList)
+                         nsFrameList&    aFrameList)
 {
    NS_ASSERTION(!aPrevFrame || aPrevFrame->GetParent() == this,
                 "inserting after sibling frame with different parent");
@@ -1046,11 +1046,12 @@ nsBoxFrame::InsertFrames(nsIAtom*        aListName,
    nsBoxLayoutState state(PresContext());
 
    // insert the child frames
-   mFrames.InsertFrames(this, aPrevFrame, aFrameList);
+   const nsFrameList::Slice& newFrames =
+     mFrames.InsertFrames(this, aPrevFrame, aFrameList);
 
    // notify the layout manager
    if (mLayoutManager)
-     mLayoutManager->ChildrenInserted(this, state, aPrevFrame, aFrameList);
+     mLayoutManager->ChildrenInserted(this, state, aPrevFrame, newFrames);
 
 #ifdef DEBUG_LAYOUT
    // if we are in debug make sure our children are in debug as well.
@@ -1067,17 +1068,17 @@ nsBoxFrame::InsertFrames(nsIAtom*        aListName,
 
 NS_IMETHODIMP
 nsBoxFrame::AppendFrames(nsIAtom*        aListName,
-                         nsIFrame*       aFrameList)
+                         nsFrameList&    aFrameList)
 {
    NS_PRECONDITION(!aListName, "We don't support out-of-flow kids");
    nsBoxLayoutState state(PresContext());
 
    // append the new frames
-   mFrames.AppendFrames(this, aFrameList);
+   const nsFrameList::Slice& newFrames = mFrames.AppendFrames(this, aFrameList);
 
    // notify the layout manager
    if (mLayoutManager)
-     mLayoutManager->ChildrenAppended(this, state, aFrameList);
+     mLayoutManager->ChildrenAppended(this, state, newFrames);
 
 #ifdef DEBUG_LAYOUT
    // if we are in debug make sure our children are in debug as well.
diff --git a/layout/xul/base/src/nsBoxFrame.h b/layout/xul/base/src/nsBoxFrame.h
index 40524eb8a2e..f6f943a88c3 100644
--- a/layout/xul/base/src/nsBoxFrame.h
+++ b/layout/xul/base/src/nsBoxFrame.h
@@ -129,11 +129,11 @@ public:
                     nsReflowStatus&          aStatus);
 
   NS_IMETHOD  AppendFrames(nsIAtom*        aListName,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
 
   NS_IMETHOD  InsertFrames(nsIAtom*        aListName,
                            nsIFrame*       aPrevFrame,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
 
   NS_IMETHOD  RemoveFrame(nsIAtom*        aListName,
                           nsIFrame*       aOldFrame);
diff --git a/layout/xul/base/src/nsBoxLayout.cpp b/layout/xul/base/src/nsBoxLayout.cpp
index f242b0d171b..a93e04103f7 100644
--- a/layout/xul/base/src/nsBoxLayout.cpp
+++ b/layout/xul/base/src/nsBoxLayout.cpp
@@ -146,12 +146,15 @@ nsBoxLayout::AddSmallestSize(nsSize& aSize, const nsSize& aSize2)
 }
 
 void
-nsBoxLayout::ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aPrevBox, nsIBox* aChildList)
+nsBoxLayout::ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
+                              nsIBox* aPrevBox,
+                              const nsFrameList::Slice& aNewChildren)
 {
 }
 
 void
-nsBoxLayout::ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList)
+nsBoxLayout::ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
+                              const nsFrameList::Slice& aNewChildren)
 {
 }
 
diff --git a/layout/xul/base/src/nsBoxLayout.h b/layout/xul/base/src/nsBoxLayout.h
index 9e88f3f34c4..3f1d7f79d01 100644
--- a/layout/xul/base/src/nsBoxLayout.h
+++ b/layout/xul/base/src/nsBoxLayout.h
@@ -55,8 +55,11 @@ public:
   virtual nsSize GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
   virtual nsSize GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
   virtual nscoord GetAscent(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState);
-  virtual void ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aPrevBox, nsIBox* aChildList);
-  virtual void ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList);
+  virtual void ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
+                                nsIBox* aPrevBox,
+                                const nsFrameList::Slice& aNewChildren);
+  virtual void ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
+                                const nsFrameList::Slice& aNewChildren);
   virtual void ChildrenRemoved(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList);
   virtual void ChildrenSet(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList);
   virtual void IntrinsicWidthsDirty(nsIBox* aBox, nsBoxLayoutState& aState);
diff --git a/layout/xul/base/src/nsIBoxLayout.h b/layout/xul/base/src/nsIBoxLayout.h
index 1cadf66ceff..1ca5113d3ae 100644
--- a/layout/xul/base/src/nsIBoxLayout.h
+++ b/layout/xul/base/src/nsIBoxLayout.h
@@ -47,10 +47,10 @@ class nsBoxLayoutState;
 class nsIRenderingContext;
 struct nsRect;
 
-// c9bf9fe7-a2f4-4f38-bbed-11a05633d676
+// 6a529924-c73d-4fae-af7a-0e8084e701d5
 #define NS_IBOX_LAYOUT_IID \
-{ 0xc9bf9fe7, 0xa2f4, 0x4f38, \
-  { 0xbb, 0xed, 0x11, 0xa0, 0x56, 0x33, 0xd6, 0x76 } }
+{ 0x6a529924, 0xc73d, 0x4fae, \
+ { 0xaf, 0x7a, 0x0e, 0x80, 0x84, 0xe7, 0x01, 0xd5 } }
 
 class nsIBoxLayout : public nsISupports {
 
@@ -65,8 +65,13 @@ public:
   virtual nsSize GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)=0;
   virtual nscoord GetAscent(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState)=0;
 
-  virtual void ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aPrevBox, nsIBox* aChildList)=0;
-  virtual void ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList)=0;
+  // FIXME: Bug 507416.  The Children* notifications don't actually
+  // use all those arguments.  Can we just simplify the signatures?
+  virtual void ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
+                                nsIBox* aPrevBox,
+                                const nsFrameList::Slice& aNewChildren)=0;
+  virtual void ChildrenAppended(nsIBox* aBox, nsBoxLayoutState& aState,
+                                const nsFrameList::Slice& aNewChildren)=0;
   virtual void ChildrenRemoved(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList)=0;
   virtual void ChildrenSet(nsIBox* aBox, nsBoxLayoutState& aState, nsIBox* aChildList)=0;
   virtual void IntrinsicWidthsDirty(nsIBox* aBox, nsBoxLayoutState& aState)=0;
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp
index b2f36a393a2..d523aa7b1f9 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -1310,13 +1310,13 @@ nsListBoxBodyFrame::ContinueReflow(nscoord height)
 }
 
 NS_IMETHODIMP
-nsListBoxBodyFrame::ListBoxAppendFrames(nsIFrame* aFrameList)
+nsListBoxBodyFrame::ListBoxAppendFrames(nsFrameList& aFrameList)
 {
   // append them after
   nsBoxLayoutState state(PresContext());
-  mFrames.AppendFrames(nsnull, aFrameList);
+  const nsFrameList::Slice& newFrames = mFrames.AppendFrames(nsnull, aFrameList);
   if (mLayoutManager)
-    mLayoutManager->ChildrenAppended(this, state, aFrameList);
+    mLayoutManager->ChildrenAppended(this, state, newFrames);
   PresContext()->PresShell()->
     FrameNeedsReflow(this, nsIPresShell::eTreeChange,
                      NS_FRAME_HAS_DIRTY_CHILDREN);
@@ -1325,13 +1325,15 @@ nsListBoxBodyFrame::ListBoxAppendFrames(nsIFrame* aFrameList)
 }
 
 NS_IMETHODIMP
-nsListBoxBodyFrame::ListBoxInsertFrames(nsIFrame* aPrevFrame, nsIFrame* aFrameList)
+nsListBoxBodyFrame::ListBoxInsertFrames(nsIFrame* aPrevFrame,
+                                        nsFrameList& aFrameList)
 {
   // insert the frames to our info list
   nsBoxLayoutState state(PresContext());
-  mFrames.InsertFrames(nsnull, aPrevFrame, aFrameList);
+  const nsFrameList::Slice& newFrames =
+    mFrames.InsertFrames(nsnull, aPrevFrame, aFrameList);
   if (mLayoutManager)
-    mLayoutManager->ChildrenInserted(this, state, aPrevFrame, aFrameList);
+    mLayoutManager->ChildrenInserted(this, state, aPrevFrame, newFrames);
   PresContext()->PresShell()->
     FrameNeedsReflow(this, nsIPresShell::eTreeChange,
                      NS_FRAME_HAS_DIRTY_CHILDREN);
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.h b/layout/xul/base/src/nsListBoxBodyFrame.h
index c011d5d9a3e..76156fdede5 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.h
+++ b/layout/xul/base/src/nsListBoxBodyFrame.h
@@ -136,8 +136,8 @@ public:
   nsIBox* GetFirstItemBox(PRInt32 aOffset, PRBool* aCreated);
   nsIBox* GetNextItemBox(nsIBox* aBox, PRInt32 aOffset, PRBool* aCreated);
   PRBool ContinueReflow(nscoord height);
-  NS_IMETHOD ListBoxAppendFrames(nsIFrame* aFrameList);
-  NS_IMETHOD ListBoxInsertFrames(nsIFrame* aPrevFrame, nsIFrame* aFrameList);
+  NS_IMETHOD ListBoxAppendFrames(nsFrameList& aFrameList);
+  NS_IMETHOD ListBoxInsertFrames(nsIFrame* aPrevFrame, nsFrameList& aFrameList);
   void OnContentInserted(nsPresContext* aPresContext, nsIContent* aContent);
   void OnContentRemoved(nsPresContext* aPresContext,  nsIFrame* aChildFrame, PRInt32 aIndex);
 
diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp
index 8853780c3be..645b45176d6 100644
--- a/layout/xul/base/src/nsMenuFrame.cpp
+++ b/layout/xul/base/src/nsMenuFrame.cpp
@@ -334,15 +334,6 @@ nsMenuFrame::GetChildList(nsIAtom* aListName) const
   return nsBoxFrame::GetChildList(aListName);
 }
 
-nsIFrame*
-nsMenuFrame::SetPopupFrame(nsIFrame* aChildList)
-{
-  // Check for a menupopup and move it to mPopupFrame
-  nsFrameList frames(aChildList);
-  SetPopupFrame(frames);
-  return frames.FirstChild();
-}
-
 void
 nsMenuFrame::SetPopupFrame(nsFrameList& aFrameList)
 {
@@ -1214,12 +1205,11 @@ nsMenuFrame::RemoveFrame(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsMenuFrame::InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList)
+                          nsFrameList&    aFrameList)
 {
   if (!mPopupFrame && (!aListName || aListName == nsGkAtoms::popupList)) {
-    aFrameList = SetPopupFrame(aFrameList);
+    SetPopupFrame(aFrameList);
     if (mPopupFrame) {
-
 #ifdef DEBUG_LAYOUT
       nsBoxLayoutState state(PresContext());
       SetDebug(state, aFrameList, mState & NS_STATE_CURRENTLY_IN_DEBUG);
@@ -1228,12 +1218,10 @@ nsMenuFrame::InsertFrames(nsIAtom*        aListName,
       PresContext()->PresShell()->
         FrameNeedsReflow(this, nsIPresShell::eTreeChange,
                          NS_FRAME_HAS_DIRTY_CHILDREN);
-
-      return NS_OK;
     }
   }
 
-  if (!aFrameList)
+  if (aFrameList.IsEmpty())
     return NS_OK;
 
   if (NS_UNLIKELY(aPrevFrame == mPopupFrame)) {
@@ -1245,13 +1233,10 @@ nsMenuFrame::InsertFrames(nsIAtom*        aListName,
 
 NS_IMETHODIMP
 nsMenuFrame::AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList)
+                          nsFrameList&    aFrameList)
 {
-  if (!aFrameList)
-    return NS_OK;
-
   if (!mPopupFrame && (!aListName || aListName == nsGkAtoms::popupList)) {
-    aFrameList = SetPopupFrame(aFrameList);
+    SetPopupFrame(aFrameList);
     if (mPopupFrame) {
 
 #ifdef DEBUG_LAYOUT
@@ -1261,12 +1246,10 @@ nsMenuFrame::AppendFrames(nsIAtom*        aListName,
       PresContext()->PresShell()->
         FrameNeedsReflow(this, nsIPresShell::eTreeChange,
                          NS_FRAME_HAS_DIRTY_CHILDREN);
-
-      return NS_OK;
     }
   }
 
-  if (!aFrameList)
+  if (aFrameList.IsEmpty())
     return NS_OK;
 
   return nsBoxFrame::AppendFrames(aListName, aFrameList); 
diff --git a/layout/xul/base/src/nsMenuFrame.h b/layout/xul/base/src/nsMenuFrame.h
index b29d24446f7..1729ffb0f68 100644
--- a/layout/xul/base/src/nsMenuFrame.h
+++ b/layout/xul/base/src/nsMenuFrame.h
@@ -147,11 +147,11 @@ public:
                          nsEventStatus*  aEventStatus);
 
   NS_IMETHOD  AppendFrames(nsIAtom*        aListName,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
 
   NS_IMETHOD  InsertFrames(nsIAtom*        aListName,
                            nsIFrame*       aPrevFrame,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
 
   NS_IMETHOD  RemoveFrame(nsIAtom*        aListName,
                           nsIFrame*       aOldFrame);
@@ -229,11 +229,8 @@ protected:
   friend class nsMenuTimerMediator;
   friend class nsASyncMenuInitialization;
 
-  // initialize mPopupFrame to the first popup frame within aChildList. Returns
-  // aChildList with the popup frame removed.
-  nsIFrame* SetPopupFrame(nsIFrame* aChildList);
-
-  // As above, but using an nsFrameList; modifies the passed-in list.
+  // initialize mPopupFrame to the first popup frame within
+  // aChildList. Removes the popup, if any, from aChildList.
   void SetPopupFrame(nsFrameList& aChildList);
 
   // set mMenuParent to the nearest enclosing menu bar or menupopup frame of
diff --git a/layout/xul/base/src/nsPopupSetFrame.cpp b/layout/xul/base/src/nsPopupSetFrame.cpp
index 3819b885318..1984019cee1 100644
--- a/layout/xul/base/src/nsPopupSetFrame.cpp
+++ b/layout/xul/base/src/nsPopupSetFrame.cpp
@@ -92,11 +92,10 @@ nsPopupSetFrame::GetType() const
 
 NS_IMETHODIMP
 nsPopupSetFrame::AppendFrames(nsIAtom*        aListName,
-                              nsIFrame*       aFrameList)
+                              nsFrameList&    aFrameList)
 {
   if (aListName == nsGkAtoms::popupList) {
-    nsFrameList temp(aFrameList);
-    return AddPopupFrameList(temp);
+    return AddPopupFrameList(aFrameList);
   }
   return nsBoxFrame::AppendFrames(aListName, aFrameList);
 }
@@ -114,11 +113,10 @@ nsPopupSetFrame::RemoveFrame(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsPopupSetFrame::InsertFrames(nsIAtom*        aListName,
                               nsIFrame*       aPrevFrame,
-                              nsIFrame*       aFrameList)
+                              nsFrameList&    aFrameList)
 {
   if (aListName == nsGkAtoms::popupList) {
-    nsFrameList temp(aFrameList);
-    return AddPopupFrameList(temp);
+    return AddPopupFrameList(aFrameList);
   }
   return nsBoxFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
 }
diff --git a/layout/xul/base/src/nsPopupSetFrame.h b/layout/xul/base/src/nsPopupSetFrame.h
index 7c607c4dd56..63f0956eb83 100644
--- a/layout/xul/base/src/nsPopupSetFrame.h
+++ b/layout/xul/base/src/nsPopupSetFrame.h
@@ -73,12 +73,12 @@ public:
                   nsIFrame*        aParent,
                   nsIFrame*        aPrevInFlow);
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD  SetInitialChildList(nsIAtom*        aListName,
                                   nsFrameList&    aChildList);
 
diff --git a/layout/xul/base/src/nsRootBoxFrame.cpp b/layout/xul/base/src/nsRootBoxFrame.cpp
index ace9dfe35a6..8a2ad1ded6e 100644
--- a/layout/xul/base/src/nsRootBoxFrame.cpp
+++ b/layout/xul/base/src/nsRootBoxFrame.cpp
@@ -90,10 +90,10 @@ public:
   virtual nsresult RemoveTooltipSupport(nsIContent* aNode);
 
   NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD InsertFrames(nsIAtom*        aListName,
                           nsIFrame*       aPrevFrame,
-                          nsIFrame*       aFrameList);
+                          nsFrameList&    aFrameList);
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
 
@@ -154,7 +154,7 @@ nsRootBoxFrame::nsRootBoxFrame(nsIPresShell* aShell, nsStyleContext* aContext):
 
 NS_IMETHODIMP
 nsRootBoxFrame::AppendFrames(nsIAtom*        aListName,
-                             nsIFrame*       aFrameList)
+                             nsFrameList&    aFrameList)
 {
   nsresult  rv;
 
@@ -178,7 +178,7 @@ nsRootBoxFrame::AppendFrames(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsRootBoxFrame::InsertFrames(nsIAtom*        aListName,
                              nsIFrame*       aPrevFrame,
-                             nsIFrame*       aFrameList)
+                             nsFrameList&    aFrameList)
 {
   nsresult  rv;
 
diff --git a/layout/xul/base/src/nsSliderFrame.cpp b/layout/xul/base/src/nsSliderFrame.cpp
index 996eb0507d5..992a8d3946a 100644
--- a/layout/xul/base/src/nsSliderFrame.cpp
+++ b/layout/xul/base/src/nsSliderFrame.cpp
@@ -140,7 +140,7 @@ nsSliderFrame::RemoveFrame(nsIAtom*        aListName,
 NS_IMETHODIMP
 nsSliderFrame::InsertFrames(nsIAtom*        aListName,
                             nsIFrame*       aPrevFrame,
-                            nsIFrame*       aFrameList)
+                            nsFrameList&    aFrameList)
 {
   PRBool wasEmpty = mFrames.IsEmpty();
   nsresult rv = nsBoxFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
@@ -152,7 +152,7 @@ nsSliderFrame::InsertFrames(nsIAtom*        aListName,
 
 NS_IMETHODIMP
 nsSliderFrame::AppendFrames(nsIAtom*        aListName,
-                            nsIFrame*       aFrameList)
+                            nsFrameList&    aFrameList)
 {
   // if we have no children and on was added then make sure we add the
   // listener
diff --git a/layout/xul/base/src/nsSliderFrame.h b/layout/xul/base/src/nsSliderFrame.h
index d630da86331..18fd295f406 100644
--- a/layout/xul/base/src/nsSliderFrame.h
+++ b/layout/xul/base/src/nsSliderFrame.h
@@ -134,11 +134,11 @@ public:
 
   // nsIFrame overrides
   NS_IMETHOD  AppendFrames(nsIAtom*        aListName,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
 
   NS_IMETHOD  InsertFrames(nsIAtom*        aListName,
                            nsIFrame*       aPrevFrame,
-                           nsIFrame*       aFrameList);
+                           nsFrameList&    aFrameList);
 
   NS_IMETHOD  RemoveFrame(nsIAtom*        aListName,
                           nsIFrame*       aOldFrame);

From 173ce6f501c787f69973f17726a16c5194e0c893 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Thu, 30 Jul 2009 13:28:42 -0400
Subject: [PATCH 097/175] Bug 499655. Selectors should have dual atoms: HTML
 and other. r=dbaron

---
 layout/style/nsCSSParser.cpp                  | 43 ++++-----------
 layout/style/nsCSSRuleProcessor.cpp           | 32 ++++++++---
 layout/style/nsCSSStyleRule.cpp               | 55 ++++++++++---------
 layout/style/nsICSSStyleRule.h                | 17 +++++-
 layout/style/test/Makefile.in                 |  2 +
 layout/style/test/test_bug499655.html         | 46 ++++++++++++++++
 layout/style/test/test_bug499655.xhtml        | 49 +++++++++++++++++
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp | 33 +++++------
 8 files changed, 190 insertions(+), 87 deletions(-)
 create mode 100644 layout/style/test/test_bug499655.html
 create mode 100644 layout/style/test/test_bug499655.xhtml

diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 6ac64e3691d..ea13346b31f 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -2452,7 +2452,7 @@ CSSParserImpl::ParseSelectorList(nsCSSSelectorList*& aListHead,
 static PRBool IsSinglePseudoClass(const nsCSSSelector& aSelector)
 {
   return PRBool((aSelector.mNameSpace == kNameSpaceID_Unknown) &&
-                (aSelector.mTag == nsnull) &&
+                (aSelector.mLowercaseTag == nsnull) &&
                 (aSelector.mIDList == nsnull) &&
                 (aSelector.mClassList == nsnull) &&
                 (aSelector.mAttrList == nsnull) &&
@@ -2527,7 +2527,7 @@ CSSParserImpl::ParseSelectorGroup(nsCSSSelectorList*& aList)
             list->AddSelector(empty); // leave a blank (universal) selector in the middle
             listSel = list->mSelectors; // use the new one for the pseudo
           }
-          listSel->mTag = pseudoElement;
+          listSel->mLowercaseTag = pseudoElement;
         }
         else {  // append new pseudo element selector
           nsAutoPtr<nsCSSSelector> pseudoTagSelector(new nsCSSSelector());
@@ -2535,9 +2535,9 @@ CSSParserImpl::ParseSelectorGroup(nsCSSSelectorList*& aList)
             mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
             return PR_FALSE;
           }
-          pseudoTagSelector->mTag = pseudoClassList->mAtom; // steal ref count
+          pseudoTagSelector->mLowercaseTag = pseudoClassList->mAtom; // steal ref count
 #ifdef MOZ_XUL
-          if (IsTreePseudoElement(pseudoTagSelector->mTag)) {
+          if (IsTreePseudoElement(pseudoTagSelector->mLowercaseTag)) {
             // Take the remaining "pseudoclasses" that we parsed
             // inside the tree pseudoelement's ()-list, and
             // make our new selector have these pseudoclasses
@@ -2684,13 +2684,8 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
       }
       if (eCSSToken_Ident == mToken.mType) {  // element name
         aDataMask |= SEL_MASK_ELEM;
-        if (mCaseSensitive) {
-          aSelector.SetTag(mToken.mIdent);
-        }
-        else {
-          ToLowerCase(mToken.mIdent, buffer);
-          aSelector.SetTag(buffer);
-        }
+
+        aSelector.SetTag(mToken.mIdent, mCaseSensitive);
       }
       else if (mToken.IsSymbol('*')) {  // universal selector
         aDataMask |= SEL_MASK_ELEM;
@@ -2728,13 +2723,8 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
       }
       if (eCSSToken_Ident == mToken.mType) {  // element name
         aDataMask |= SEL_MASK_ELEM;
-        if (mCaseSensitive) {
-          aSelector.SetTag(mToken.mIdent);
-        }
-        else {
-          ToLowerCase(mToken.mIdent, buffer);
-          aSelector.SetTag(buffer);
-        }
+       
+        aSelector.SetTag(mToken.mIdent, mCaseSensitive);
       }
       else if (mToken.IsSymbol('*')) {  // universal selector
         aDataMask |= SEL_MASK_ELEM;
@@ -2748,13 +2738,8 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
     }
     else {  // was element name
       SetDefaultNamespaceOnSelector(aSelector);
-      if (mCaseSensitive) {
-        aSelector.SetTag(buffer);
-      }
-      else {
-        ToLowerCase(buffer);
-        aSelector.SetTag(buffer);
-      }
+      aSelector.SetTag(buffer, mCaseSensitive);
+
       aDataMask |= SEL_MASK_ELEM;
     }
     if (! GetToken(PR_FALSE)) {   // premature eof is ok (here!)
@@ -2772,13 +2757,7 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
     }
     if (eCSSToken_Ident == mToken.mType) {  // element name
       aDataMask |= SEL_MASK_ELEM;
-      if (mCaseSensitive) {
-        aSelector.SetTag(mToken.mIdent);
-      }
-      else {
-        ToLowerCase(mToken.mIdent, buffer);
-        aSelector.SetTag(buffer);
-      }
+      aSelector.SetTag(mToken.mIdent, mCaseSensitive);
     }
     else if (mToken.IsSymbol('*')) {  // universal selector
       aDataMask |= SEL_MASK_ELEM;
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index a25fcafc9e7..cb560f70753 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -210,7 +210,7 @@ RuleHash_TagTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr)
 {
   const RuleHashTableEntry *entry =
     static_cast<const RuleHashTableEntry*>(hdr);
-  return entry->mRules->mSelector->mTag;
+  return entry->mRules->mSelector->mLowercaseTag;
 }
 
 static nsIAtom*
@@ -513,8 +513,8 @@ void RuleHash::PrependRule(RuleValue *aRuleInfo)
     PrependRuleToTable(&mClassTable, selector->mClassList->mAtom, aRuleInfo);
     RULE_HASH_STAT_INCREMENT(mClassSelectors);
   }
-  else if (nsnull != selector->mTag) {
-    PrependRuleToTable(&mTagTable, selector->mTag, aRuleInfo);
+  else if (nsnull != selector->mLowercaseTag) {
+    PrependRuleToTable(&mTagTable, selector->mLowercaseTag, aRuleInfo);
     RULE_HASH_STAT_INCREMENT(mTagSelectors);
   }
   else if (kNameSpaceID_Unknown != selector->mNameSpace) {
@@ -1191,11 +1191,23 @@ static PRBool SelectorMatches(RuleProcessorData &data,
 
 {
   // namespace/tag match
+  // optimization : bail out early if we can
   if ((kNameSpaceID_Unknown != aSelector->mNameSpace &&
-       data.mNameSpaceID != aSelector->mNameSpace) ||
-      (aSelector->mTag && aSelector->mTag != data.mContentTag)) {
-    // optimization : bail out early if we can
+       data.mNameSpaceID != aSelector->mNameSpace))
     return PR_FALSE;
+
+  if (aSelector->mLowercaseTag) {
+    //If we tested that this is an HTML node in a text/html document and
+    //had some tweaks in RuleHash, we could remove case-sensitivity from
+    //style sheets.
+    if (data.mIsHTMLContent) {
+      if (data.mContentTag != aSelector->mLowercaseTag)
+        return PR_FALSE;
+    }
+    else {
+      if (data.mContentTag != aSelector->mCasedTag)
+        return PR_FALSE;
+    }
   }
 
   PRBool result = PR_TRUE;
@@ -1593,7 +1605,8 @@ static PRBool SelectorMatches(RuleProcessorData &data,
       if ((stateToCheck & (NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE)) &&
           data.mCompatMode == eCompatibility_NavQuirks &&
           // global selector (but don't check .class):
-          !aSelector->mTag && !aSelector->mIDList && !aSelector->mAttrList &&
+          !aSelector->HasTagSelector() && !aSelector->mIDList && 
+          !aSelector->mAttrList &&
           // This (or the other way around) both make :not() asymmetric
           // in quirks mode (and it's hard to work around since we're
           // testing the current mNegations, not the first
@@ -1929,7 +1942,10 @@ static void PseudoEnumFunc(nsICSSStyleRule* aRule, nsCSSSelector* aSelector,
 {
   PseudoRuleProcessorData* data = (PseudoRuleProcessorData*)aData;
 
-  NS_ASSERTION(aSelector->mTag == data->mPseudoTag, "RuleHash failure");
+  if (!aSelector->IsPseudoElement())
+    return;
+
+  NS_ASSERTION(aSelector->mLowercaseTag == data->mPseudoTag, "RuleHash failure");
   PRBool matches = PR_TRUE;
   if (data->mComparator)
     data->mComparator->PseudoMatches(data->mPseudoTag, aSelector, &matches);
diff --git a/layout/style/nsCSSStyleRule.cpp b/layout/style/nsCSSStyleRule.cpp
index 9f73064c36c..fc3bab8ece7 100644
--- a/layout/style/nsCSSStyleRule.cpp
+++ b/layout/style/nsCSSStyleRule.cpp
@@ -258,7 +258,8 @@ nsAttrSelector::~nsAttrSelector(void)
 // -- nsCSSSelector -------------------------------
 
 nsCSSSelector::nsCSSSelector(void)
-  : mTag(nsnull),
+  : mLowercaseTag(nsnull),
+    mCasedTag(nsnull),
     mIDList(nsnull),
     mClassList(nsnull),
     mPseudoClassList(nsnull),
@@ -279,7 +280,8 @@ nsCSSSelector::Clone(PRBool aDeepNext, PRBool aDeepNegations) const
     return nsnull;
 
   result->mNameSpace = mNameSpace;
-  result->mTag = mTag;
+  result->mLowercaseTag = mLowercaseTag;
+  result->mCasedTag = mCasedTag;
   result->mOperator = mOperator;
   
   NS_IF_CLONE(mIDList);
@@ -316,7 +318,8 @@ nsCSSSelector::~nsCSSSelector(void)
 void nsCSSSelector::Reset(void)
 {
   mNameSpace = kNameSpaceID_Unknown;
-  mTag = nsnull;
+  mLowercaseTag = nsnull;
+  mCasedTag = nsnull;
   NS_IF_DELETE(mIDList);
   NS_IF_DELETE(mClassList);
   NS_IF_DELETE(mPseudoClassList);
@@ -334,12 +337,23 @@ void nsCSSSelector::SetNameSpace(PRInt32 aNameSpace)
   mNameSpace = aNameSpace;
 }
 
-void nsCSSSelector::SetTag(const nsString& aTag)
+void nsCSSSelector::SetTag(const nsString& aTag, PRBool aCaseMatters)
 {
-  if (aTag.IsEmpty())
-    mTag = nsnull;
-  else
-    mTag = do_GetAtom(aTag);
+  if (aTag.IsEmpty()) {
+    mLowercaseTag = mCasedTag =  nsnull;
+    return;
+  }
+
+  mCasedTag = do_GetAtom(aTag);
+ 
+  if (aCaseMatters) {
+    mLowercaseTag = mCasedTag;
+  } 
+  else {
+    nsAutoString lowercase(aTag);
+    ToLowerCase(lowercase);
+    mLowercaseTag = do_GetAtom(lowercase);
+  }
 }
 
 void nsCSSSelector::AddID(const nsString& aID)
@@ -422,7 +436,7 @@ PRInt32 nsCSSSelector::CalcWeightWithoutNegations() const
 {
   PRInt32 weight = 0;
 
-  if (nsnull != mTag) {
+  if (nsnull != mLowercaseTag) {
     weight += 0x000001;
   }
   nsAtomList* list = mIDList;
@@ -458,19 +472,6 @@ PRInt32 nsCSSSelector::CalcWeight() const
   return weight;
 }
 
-// pseudo-elements are stored in the selectors' chain using fictional elements;
-// these fictional elements have mTag starting with a colon
-static PRBool IsPseudoElement(nsIAtom* aAtom)
-{
-  if (aAtom) {
-    const char* str;
-    aAtom->GetUTF8String(&str);
-    return str && (*str == ':');
-  }
-
-  return PR_FALSE;
-}
-
 //
 // Builds the textual representation of a selector. Called by DOM 2 CSS 
 // StyleRule:selectorText
@@ -499,7 +500,7 @@ nsCSSSelector::ToString(nsAString& aString, nsICSSStyleSheet* aSheet,
     // Append the combinator, if needed.
     if (!stack.IsEmpty()) {
       const nsCSSSelector *next = stack.ElementAt(index - 1);
-      if (!IsPseudoElement(next->mTag)) {
+      if (!next->IsPseudoElement()) {
         aString.Append(PRUnichar(' '));
         PRUnichar oper = s->mOperator;
         if (oper != PRUnichar(0)) {
@@ -532,7 +533,7 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
                    PRBool aIsNegated) const
 {
   nsAutoString temp;
-  PRBool isPseudoElement = IsPseudoElement(mTag);
+  PRBool isPseudoElement = IsPseudoElement();
 
   // For non-pseudo-element selectors or for lone pseudo-elements, deal with
   // namespace prefixes.
@@ -588,7 +589,7 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
     }
   }
       
-  if (!mTag) {
+  if (!mLowercaseTag) {
     // Universal selector:  avoid writing the universal selector when we
     // can avoid it, especially since we're required to avoid it for the
     // inside of :not()
@@ -605,12 +606,12 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
         // XXXldb Why?
         aString.Append(PRUnichar('*'));
       }
-      if (!nsCSSPseudoElements::IsCSS2PseudoElement(mTag)) {
+      if (!nsCSSPseudoElements::IsCSS2PseudoElement(mLowercaseTag)) {
         aString.Append(PRUnichar(':'));
       }
     }
     nsAutoString prefix;
-    mTag->ToString(prefix);
+    mLowercaseTag->ToString(prefix);
     aString.Append(prefix);
   }
 
diff --git a/layout/style/nsICSSStyleRule.h b/layout/style/nsICSSStyleRule.h
index 067ff505060..d6a94d48d5f 100644
--- a/layout/style/nsICSSStyleRule.h
+++ b/layout/style/nsICSSStyleRule.h
@@ -152,7 +152,7 @@ public:
 
   void Reset(void);
   void SetNameSpace(PRInt32 aNameSpace);
-  void SetTag(const nsString& aTag);
+  void SetTag(const nsString& aTag, PRBool aCaseSensitive);
   void AddID(const nsString& aID);
   void AddClass(const nsString& aClass);
   void AddPseudoClass(nsIAtom* aPseudoClass);
@@ -163,6 +163,14 @@ public:
                     const nsString& aValue, PRBool aCaseSensitive);
   void SetOperator(PRUnichar aOperator);
 
+  inline PRBool HasTagSelector() const {
+    return !!mCasedTag;
+  }
+
+  inline PRBool IsPseudoElement() const {
+    return mLowercaseTag && !mCasedTag;
+  }
+
   // Calculate the specificity of this selector (not including its mNext!).
   PRInt32 CalcWeight() const;
 
@@ -188,7 +196,12 @@ private:
   PRInt32 CalcWeightWithoutNegations() const;
 
 public:
-  nsCOMPtr<nsIAtom> mTag;
+  // For case-sensitive documents, mLowercaseTag is the same as mCasedTag,
+  // but in case-insensitive documents (HTML) mLowercaseTag is lowercase.
+  // Also, for pseudo-elements mCasedTag will be null but mLowercaseTag
+  // contains their name.
+  nsCOMPtr<nsIAtom> mLowercaseTag;
+  nsCOMPtr<nsIAtom> mCasedTag;
   nsAtomList*     mIDList;
   nsAtomList*     mClassList;
   nsPseudoClassList* mPseudoClassList; // atom for the pseudo, string for
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index ac5c876d5f2..a4f88fa7fae 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -101,6 +101,8 @@ _TEST_FILES =	test_acid3_test46.html \
 		test_bug450191.html \
 		test_bug453896_deck.html \
 		test_bug470769.html \
+		test_bug499655.html \
+		test_bug499655.xhtml \
 		test_cascade.html \
 		test_compute_data_with_start_struct.html \
 		test_css_eof_handling.html \
diff --git a/layout/style/test/test_bug499655.html b/layout/style/test/test_bug499655.html
new file mode 100644
index 00000000000..05ee443152a
--- /dev/null
+++ b/layout/style/test/test_bug499655.html
@@ -0,0 +1,46 @@
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=499655
+-->
+<head>
+  <title>Test for Bug 499655</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=499655">Mozilla Bug 499655</a>
+<p id="display"></p>
+<div id="content">
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Bug 499655 **/
+
+test1 = document.createElementNS("http://www.w3.org/1999/xhtml","test");
+test2 = document.createElementNS("http://www.w3.org/1999/xhtml","TEst");
+test3 = document.createElementNS("test","test");
+test4 = document.createElementNS("test","TEst");
+
+content = document.getElementById("content");
+
+content.appendChild(test1);
+content.appendChild(test2);
+content.appendChild(test3);
+content.appendChild(test4);
+
+list = document.querySelectorAll('test');
+is(list.length, 2, "Number of elements found");
+is(list[0], test1, "First element didn't match");
+is(list[1], test3, "Third element didn't match");
+
+list = document.querySelectorAll('TEst');
+is(list.length, 2, "Wrong number of elements found");
+is(list[0], test1, "First element didn't match");
+is(list[1], test4, "Fourth element didn't match");
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/layout/style/test/test_bug499655.xhtml b/layout/style/test/test_bug499655.xhtml
new file mode 100644
index 00000000000..45d756c9139
--- /dev/null
+++ b/layout/style/test/test_bug499655.xhtml
@@ -0,0 +1,49 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=499655
+-->
+<head>
+  <title>Test for Bug 499655</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/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=499655">Mozilla Bug 499655</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+<![CDATA[
+
+test1 = document.createElementNS("http://www.w3.org/1999/xhtml","test");
+test2 = document.createElementNS("http://www.w3.org/1999/xhtml","TEst");
+test3 = document.createElementNS("test","test");
+test4 = document.createElementNS("test","TEst");
+
+content = document.getElementById("content");
+
+content.appendChild(test1);
+content.appendChild(test2);
+content.appendChild(test3);
+content.appendChild(test4);
+
+
+list = document.querySelectorAll('test');
+is(list.length, 2, "Number of elements found");
+is(list[0], test1, "First element didn't match");
+is(list[1] , test3, "Third element didn't match");
+
+list = document.querySelectorAll('TEst');
+is(list.length, 2, "Number of elements found");
+is(list[0], test2, "Second element didn't match");
+is(list[1], test4, "Fourth element didn't match");
+
+
+]]>
+</script>
+</pre>
+</body>
+</html>
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index b9847fb3c2f..102e8a9c6c6 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -4267,26 +4267,23 @@ nsTreeBodyFrame::GetPseudoStyleContext(nsIAtom* aPseudoElement)
 NS_IMETHODIMP
 nsTreeBodyFrame::PseudoMatches(nsIAtom* aTag, nsCSSSelector* aSelector, PRBool* aResult)
 {
-  if (aSelector->mTag == aTag) {
-    // Iterate the pseudoclass list.  For each item in the list, see if
-    // it is contained in our scratch array.  If we have a miss, then
-    // we aren't a match.  If all items in the pseudoclass list are
-    // present in the scratch array, then we have a match.
-    nsPseudoClassList* curr = aSelector->mPseudoClassList;
-    while (curr) {
-      PRInt32 index;
-      mScratchArray->GetIndexOf(curr->mAtom, &index);
-      if (index == -1) {
-        *aResult = PR_FALSE;
-        return NS_OK;
-      }
-      curr = curr->mNext;
+  NS_ABORT_IF_FALSE(aSelector->mLowercaseTag == aTag,
+                   "should not have been called");
+  // Iterate the pseudoclass list.  For each item in the list, see if
+  // it is contained in our scratch array.  If we have a miss, then
+  // we aren't a match.  If all items in the pseudoclass list are
+  // present in the scratch array, then we have a match.
+  nsPseudoClassList* curr = aSelector->mPseudoClassList;
+  while (curr) {
+    PRInt32 index;
+    mScratchArray->GetIndexOf(curr->mAtom, &index);
+    if (index == -1) {
+      *aResult = PR_FALSE;
+      return NS_OK;
     }
-    *aResult = PR_TRUE;
+    curr = curr->mNext;
   }
-  else 
-    *aResult = PR_FALSE;
-
+  *aResult = PR_TRUE;
   return NS_OK;
 }
 

From 91997043c9fe1f51b3d3ba612f52d1cab1fa7782 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Thu, 30 Jul 2009 11:19:34 -0700
Subject: [PATCH 098/175] b=507037; hang on WinCE in
 gfxFontFamily::FindFontForStyle; r=jdaggett

---
 gfx/thebes/src/gfxFT2Fonts.cpp | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/gfx/thebes/src/gfxFT2Fonts.cpp b/gfx/thebes/src/gfxFT2Fonts.cpp
index 8a7ef15ddbb..b8e038b9d2d 100644
--- a/gfx/thebes/src/gfxFT2Fonts.cpp
+++ b/gfx/thebes/src/gfxFT2Fonts.cpp
@@ -126,12 +126,28 @@ FontEntry::CreateFontEntryFromFace(FT_Face aFace) {
     cairo_font_face_set_user_data(fe->mFontFace, &key,
                                   aFace, FTFontDestroyFunc);
     TT_OS2 *os2 = static_cast<TT_OS2*>(FT_Get_Sfnt_Table(aFace, ft_sfnt_os2));
-    if (os2 && os2->version != 0xffff)
-        fe->mWeight  = os2->usWeightClass;
+
+    PRUint16 os2weight = 0;
+    if (os2 && os2->version != 0xffff) {
+        // Technically, only 100 to 900 are valid, but some fonts
+        // have this set wrong -- e.g. "Microsoft Logo Bold Italic" has
+        // it set to 6 instead of 600.  We try to be nice and handle that
+        // as well.
+        if (os2->usWeightClass >= 100 && os2->usWeightClass <= 900)
+            os2weight = os2->usWeightClass;
+        else if (os2->usWeightClass >= 1 && os2->usWeightClass <= 9)
+            os2weight = os2->usWeightClass * 100;
+    }
+
+    if (os2weight != 0)
+        fe->mWeight = os2weight;
     else if (aFace->style_flags & FT_STYLE_FLAG_BOLD)
         fe->mWeight = 700;
     else
         fe->mWeight = 400;
+
+    NS_ASSERTION(fe->mWeight >= 100 && fe->mWeight <= 900, "Invalid final weight in font!");
+
     return fe;
 }
 
@@ -817,8 +833,9 @@ cairo_font_face_t *
 gfxFT2Font::CairoFontFace()
 {
     // XXX we need to handle fake bold here (or by having a sepaerate font entry)
-    if (mStyle.weight >= 600 && mFontEntry->mWeight < 600)
-        printf("** We want fake weight\n");
+    if (mStyle.weight >= 600 && mFontEntry->mWeight < 600) {
+        //printf("** We want fake weight\n");
+    }
     return GetFontEntry()->CairoFontFace();
 }
 

From c8d0b23aa5c8db637150aab37d918fd99951bfff Mon Sep 17 00:00:00 2001
From: Rich Walsh <dragtext@e-vertise.com>
Date: Thu, 30 Jul 2009 21:20:44 +0300
Subject: [PATCH 099/175] [OS/2] Bug 500654: sync OS/2 plugin code with Windows
 version, to hopefully fix some Flash-related crashes, r=pweilbacher

---
 .../base/src/nsPluginNativeWindowOS2.cpp      | 249 +++++++++++++++---
 1 file changed, 209 insertions(+), 40 deletions(-)

diff --git a/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp b/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp
index 7547d6c17ae..28c8bc00593 100644
--- a/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp
+++ b/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp
@@ -37,11 +37,14 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/*****************************************************************************/
+
 #define INCL_WIN
 #include "os2.h"
 
 #include "nsDebug.h"
-
+#include "nsGUIEvent.h"
 #include "nsPluginSafety.h"
 #include "nsPluginNativeWindow.h"
 #include "nsThreadUtils.h"
@@ -49,6 +52,11 @@
 #include "nsTWeakRef.h"
 
 #define NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION "MozillaPluginWindowPropertyAssociation"
+#define NS_PLUGIN_CUSTOM_MSG_ID "MozFlashUserRelay"
+#define WM_USER_FLASH WM_USER+1
+#ifndef WM_FOCUSCHANGED
+#define WM_FOCUSCHANGED 0x000E
+#endif
 
 typedef nsTWeakRef<class nsPluginNativeWindowOS2> PluginWindowWeakRef;
 
@@ -61,10 +69,17 @@ BOOL  APIENTRY WinSetProperty(HWND hwnd, PCSZ  pszNameOrAtom,
                               PVOID pvData, ULONG ulFlags);
 }
 
+/*****************************************************************************/
+
+static ULONG sWM_FLASHBOUNCEMSG = 0;
+
+/*****************************************************************************/
 /**
  *  PLEvent handling code
  */
-class PluginWindowEvent : public nsRunnable {
+
+class PluginWindowEvent : public nsRunnable
+{
 public:
   PluginWindowEvent();
   void Init(const PluginWindowWeakRef &ref, HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2);
@@ -93,6 +108,9 @@ PluginWindowEvent::PluginWindowEvent()
 void PluginWindowEvent::Clear()
 {
   mWnd    = NULL;
+  mMsg    = 0;
+  mWParam = 0;
+  mLParam = 0;
 }
 
 void PluginWindowEvent::Init(const PluginWindowWeakRef &ref, HWND aWnd,
@@ -107,8 +125,30 @@ void PluginWindowEvent::Init(const PluginWindowWeakRef &ref, HWND aWnd,
   mLParam = mp2;
 }
 
+/*****************************************************************************/
+
+class nsDelayedPopupsEnabledEvent : public nsRunnable
+{
+public:
+  nsDelayedPopupsEnabledEvent(nsIPluginInstance *inst)
+    : mInst(inst)
+  {}
+
+  NS_DECL_NSIRUNNABLE
+
+private:
+  nsCOMPtr<nsIPluginInstance> mInst;
+};
+
+NS_IMETHODIMP nsDelayedPopupsEnabledEvent::Run()
+{
+  mInst->PushPopupsEnabledState(PR_FALSE);
+  return NS_OK;	
+}
+
+/*****************************************************************************/
 /**
- *  nsPluginNativeWindow Windows specific class declaration
+ *  nsPluginNativeWindow OS/2-specific class declaration
  */
 
 typedef enum {
@@ -118,7 +158,8 @@ typedef enum {
   nsPluginType_Other
 } nsPluginType;
 
-class nsPluginNativeWindowOS2 : public nsPluginNativeWindow {
+class nsPluginNativeWindowOS2 : public nsPluginNativeWindow
+{
 public: 
   nsPluginNativeWindowOS2();
   virtual ~nsPluginNativeWindowOS2();
@@ -131,6 +172,7 @@ private:
 
 public:
   // locals
+  PFNWP GetPrevWindowProc();
   PFNWP GetWindowProc();
   PluginWindowEvent* GetPluginWindowEvent(HWND aWnd,
                                           ULONG aMsg,
@@ -138,6 +180,7 @@ public:
                                           MPARAM mp2);
 
 private:
+  PFNWP mPrevWinProc;
   PFNWP mPluginWinProc;
   PluginWindowWeakRef mWeakRef;
   nsRefPtr<PluginWindowEvent> mCachedPluginWindowEvent;
@@ -146,12 +189,24 @@ public:
   nsPluginType mPluginType;
 };
 
-static PRBool ProcessFlashMessageDelayed(nsPluginNativeWindowOS2 * aWin, 
-                                         HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+/*****************************************************************************/
+
+static PRBool ProcessFlashMessageDelayed(nsPluginNativeWindowOS2 * aWin,
+                                         nsIPluginInstance * aInst,
+                                         HWND hWnd, ULONG msg,
+                                         MPARAM mp1, MPARAM mp2)
 {
   NS_ENSURE_TRUE(aWin, NS_ERROR_NULL_POINTER);
+  NS_ENSURE_TRUE(aInst, NS_ERROR_NULL_POINTER);
 
-  if (msg != WM_USER+1)
+  if (msg == sWM_FLASHBOUNCEMSG) {
+    // See PluginWindowEvent::Run() below.
+    NS_TRY_SAFE_CALL_VOID((aWin->GetWindowProc())(hWnd, WM_USER_FLASH, mp1, mp2),
+                           nsnull, inst);
+    return TRUE;
+  }
+
+  if (msg != WM_USER_FLASH)
     return PR_FALSE; // no need to delay
 
   // do stuff
@@ -163,20 +218,27 @@ static PRBool ProcessFlashMessageDelayed(nsPluginNativeWindowOS2 * aWin,
   return PR_FALSE;
 }
 
+/*****************************************************************************/
 /**
  *   New plugin window procedure
  */
-MRESULT EXPENTRY PluginWndProc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+
+static MRESULT EXPENTRY PluginWndProc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-  nsPluginNativeWindowOS2 * win = (nsPluginNativeWindowOS2 *)::WinQueryProperty(hWnd, NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION);
+  nsPluginNativeWindowOS2 * win = (nsPluginNativeWindowOS2 *)
+            ::WinQueryProperty(hWnd, NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION);
   if (!win)
     return (MRESULT)TRUE;
 
-  // check plugin mime type and cache whether it is Flash or java-vm or not
+  // The DispatchEvent(NS_PLUGIN_ACTIVATE) below can trigger a reentrant focus
+  // event which might destroy us.  Hold a strong ref on the plugin instance
+  // to prevent that, bug 374229.
+  nsCOMPtr<nsIPluginInstance> inst;
+  win->GetPluginInstance(inst);
+
+  // check plugin mime type and cache whether it is Flash or java-vm or not;
   // flash and java-vm will need special treatment later
   if (win->mPluginType == nsPluginType_Unknown) {
-    nsCOMPtr<nsIPluginInstance> inst;
-    win->GetPluginInstance(inst);
     if (inst) {
       const char* mimetype = nsnull;
       inst->GetMIMEType(&mimetype);
@@ -191,31 +253,106 @@ MRESULT EXPENTRY PluginWndProc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
     }
   }
 
+  PRBool enablePopups = PR_FALSE;
+
+  // Activate/deactivate mouse capture on the plugin widget
+  // here, before we pass the Windows event to the plugin
+  // because its possible our widget won't get paired events
+  // (see bug 131007) and we'll look frozen. Note that this
+  // is also done in ChildWindow::DispatchMouseEvent.
+  switch (msg) {
+    case WM_BUTTON1DOWN:
+    case WM_BUTTON2DOWN:
+    case WM_BUTTON3DOWN: {
+      nsCOMPtr<nsIWidget> widget;
+      win->GetPluginWidget(getter_AddRefs(widget));
+      if (widget)
+        widget->CaptureMouse(PR_TRUE);
+      break;
+    }
+
+    case WM_BUTTON1UP:
+    case WM_BUTTON2UP:
+    case WM_BUTTON3UP: {
+      if (msg == WM_BUTTON1UP)
+        enablePopups = PR_TRUE;
+
+      nsCOMPtr<nsIWidget> widget;
+      win->GetPluginWidget(getter_AddRefs(widget));
+      if (widget)
+        widget->CaptureMouse(PR_FALSE);
+      break;
+    }
+
+    case WM_CHAR:
+      // Ignore repeating keydown messages...
+      if (SHORT1FROMMP(mp1) & KC_PREVDOWN)
+        break;
+      enablePopups = PR_TRUE;
+      break;
+
+    case WM_SETFOCUS:
+    case WM_FOCUSCHANGE:
+    case WM_FOCUSCHANGED:
+    case WM_ACTIVATE: {
+      // Make sure setfocus and focuschange get through
+      // even if they are eaten by the plugin
+      PFNWP prevWndProc = win->GetPrevWindowProc();
+      if (prevWndProc)
+        prevWndProc(hWnd, msg, mp1, mp2);
+      break;
+    }
+  }
+
   // Macromedia Flash plugin may flood the message queue with some special messages
   // (WM_USER+1) causing 100% CPU consumption and GUI freeze, see mozilla bug 132759;
   // we can prevent this from happening by delaying the processing such messages;
   if (win->mPluginType == nsPluginType_Flash) {
-    if (ProcessFlashMessageDelayed(win, hWnd, msg, mp1, mp2))
+    if (ProcessFlashMessageDelayed(win, inst, hWnd, msg, mp1, mp2))
       return (MRESULT)TRUE;
   }
 
+  if (enablePopups && inst) {
+    PRUint16 apiVersion;
+    if (NS_SUCCEEDED(inst->GetPluginAPIVersion(&apiVersion)) &&
+        !nsVersionOK(apiVersion, NP_POPUP_API_VERSION))
+      inst->PushPopupsEnabledState(PR_TRUE);
+  }
+
   MRESULT res = (MRESULT)TRUE;
-
-  nsCOMPtr<nsIPluginInstance> inst;
-  win->GetPluginInstance(inst);
-
-  if (win->mPluginType == nsPluginType_Java_vm) {
-    NS_TRY_SAFE_CALL_RETURN(res, WinDefWindowProc(hWnd, msg, mp1, mp2), nsnull, inst);
-  } else {
+  if (win->mPluginType == nsPluginType_Java_vm)
+    NS_TRY_SAFE_CALL_RETURN(res, ::WinDefWindowProc(hWnd, msg, mp1, mp2), nsnull, inst);
+  else
     NS_TRY_SAFE_CALL_RETURN(res, (win->GetWindowProc())(hWnd, msg, mp1, mp2), nsnull, inst);
+
+  if (inst) {
+    // Popups are enabled (were enabled before the call to
+    // CallWindowProc()). Some plugins (at least the flash player)
+    // post messages from their key handlers etc that delay the actual
+    // processing, so we need to delay the disabling of popups so that
+    // popups remain enabled when the flash player ends up processing
+    // the actual key handlers. We do this by posting an event that
+    // does the disabling, this way our disabling will happen after
+    // the handlers in the plugin are done.
+
+    // Note that it's not fatal if any of this fails (which won't
+    // happen unless we're out of memory anyways) since the plugin
+    // code will pop any popup state pushed by this plugin on
+    // destruction.
+
+    nsCOMPtr<nsIRunnable> event = new nsDelayedPopupsEnabledEvent(inst);
+    if (event)
+      NS_DispatchToCurrentThread(event);
   }
 
   return res;
 }
 
+/*****************************************************************************/
 /**
  *   nsPluginNativeWindowOS2 implementation
  */
+
 nsPluginNativeWindowOS2::nsPluginNativeWindowOS2() : nsPluginNativeWindow()
 {
   // initialize the struct fields
@@ -225,8 +362,18 @@ nsPluginNativeWindowOS2::nsPluginNativeWindowOS2() : nsPluginNativeWindow()
   width = 0; 
   height = 0; 
 
+  mPrevWinProc = NULL;
   mPluginWinProc = NULL;
   mPluginType = nsPluginType_Unknown;
+
+  // once the atom has been added, it won't be deleted
+  if (!sWM_FLASHBOUNCEMSG) {
+    sWM_FLASHBOUNCEMSG = ::WinFindAtom(WinQuerySystemAtomTable(),
+                                       NS_PLUGIN_CUSTOM_MSG_ID);
+    if (!sWM_FLASHBOUNCEMSG)
+      sWM_FLASHBOUNCEMSG = ::WinAddAtom(WinQuerySystemAtomTable(),
+                                        NS_PLUGIN_CUSTOM_MSG_ID);
+  }
 }
 
 nsPluginNativeWindowOS2::~nsPluginNativeWindowOS2()
@@ -236,6 +383,11 @@ nsPluginNativeWindowOS2::~nsPluginNativeWindowOS2()
   mWeakRef.forget();
 }
 
+PFNWP nsPluginNativeWindowOS2::GetPrevWindowProc()
+{
+  return mPrevWinProc;
+}
+
 PFNWP nsPluginNativeWindowOS2::GetWindowProc()
 {
   return mPluginWinProc;
@@ -253,12 +405,18 @@ NS_IMETHODIMP PluginWindowEvent::Run()
 
   nsCOMPtr<nsIPluginInstance> inst;
   win->GetPluginInstance(inst);
-  NS_TRY_SAFE_CALL_VOID((win->GetWindowProc()) 
-                       (hWnd, 
-                        GetMsg(), 
-                        GetWParam(), 
-                        GetLParam()),
-                        nsnull, inst);
+
+  if (GetMsg() == WM_USER_FLASH)
+    // XXX Unwind issues related to runnable event callback depth for this
+    // event and destruction of the plugin. (Bug 493601)
+    ::WinPostMsg(hWnd, sWM_FLASHBOUNCEMSG, GetWParam(), GetLParam());
+  else
+    // Currently not used, but added so that processing events here
+    // is more generic.
+    NS_TRY_SAFE_CALL_VOID((win->GetWindowProc()) 
+                          (hWnd, GetMsg(), GetWParam(), GetLParam()),
+                          nsnull, inst);
+
   Clear();
   return NS_OK;
 }
@@ -277,21 +435,20 @@ nsPluginNativeWindowOS2::GetPluginWindowEvent(HWND aWnd, ULONG aMsg, MPARAM aMp1
   // We have the ability to alloc if needed in case in the future some plugin
   // should post multiple PostMessages. However, this could lead to many
   // alloc's per second which could become a performance issue. See bug 169247.
-  if (!mCachedPluginWindowEvent) 
-  {
+  if (!mCachedPluginWindowEvent) {
     event = new PluginWindowEvent();
-    if (!event) return nsnull;
+    if (!event)
+      return nsnull;
     mCachedPluginWindowEvent = event;
   }
-  else if (mCachedPluginWindowEvent->InUse())
-  {
+  else
+  if (mCachedPluginWindowEvent->InUse()) {
     event = new PluginWindowEvent();
-    if (!event) return nsnull;
+    if (!event)
+      return nsnull;
   }
   else
-  {
     event = mCachedPluginWindowEvent;
-  }
 
   event->Init(mWeakRef, aWnd, aMsg, aMp1, aMp2);
   return event;
@@ -301,8 +458,17 @@ nsresult nsPluginNativeWindowOS2::CallSetWindow(nsCOMPtr<nsIPluginInstance> &aPl
 {
   // check the incoming instance, null indicates that window is going away and we are
   // not interested in subclassing business any more, undo and don't subclass
-  if (!aPluginInstance)
+  if (!aPluginInstance) {
     UndoSubclassAndAssociateWindow();
+    mPrevWinProc = NULL;
+  }
+
+  // We need WndProc before plug-ins do subclass in nsPluginNativeWindow::CallSetWindow.
+  if (aPluginInstance) {
+    PFNWP currentWndProc = (PFNWP)::WinQueryWindowPtr((HWND)window, QWP_PFNWP);
+    if (currentWndProc != PluginWndProc)
+      mPrevWinProc = currentWndProc;
+  }
 
   nsPluginNativeWindow::CallSetWindow(aPluginInstance);
 
@@ -326,13 +492,16 @@ nsresult nsPluginNativeWindowOS2::SubclassAndAssociateWindow()
   if (PluginWndProc == currentWndProc)
     return NS_OK;
 
-  mPluginWinProc = WinSubclassWindow(hWnd, PluginWndProc);
+  mPluginWinProc = ::WinSubclassWindow(hWnd, PluginWndProc);
   if (!mPluginWinProc)
     return NS_ERROR_FAILURE;
 
-  nsPluginNativeWindowOS2 * win = (nsPluginNativeWindowOS2 *)::WinQueryProperty(hWnd, NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION);
+#ifdef DEBUG
+  nsPluginNativeWindowOS2 * win = (nsPluginNativeWindowOS2 *)
+            ::WinQueryProperty(hWnd, NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION);
   NS_ASSERTION(!win || (win == this), "plugin window already has property and this is not us");
-  
+#endif
+
   if (!::WinSetProperty(hWnd, NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION, (PVOID)this, 0))
     return NS_ERROR_FAILURE;
 
@@ -346,7 +515,7 @@ nsresult nsPluginNativeWindowOS2::UndoSubclassAndAssociateWindow()
 
   // remove window property
   HWND hWnd = (HWND)window;
-  if (WinIsWindow(/*HAB*/0, hWnd))
+  if (::WinIsWindow(/*HAB*/0, hWnd))
     ::WinRemoveProperty(hWnd, NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION);
 
   // restore the original win proc
@@ -354,7 +523,7 @@ nsresult nsPluginNativeWindowOS2::UndoSubclassAndAssociateWindow()
   if (mPluginWinProc) {
     PFNWP currentWndProc = (PFNWP)::WinQueryWindowPtr(hWnd, QWP_PFNWP);
     if (currentWndProc == PluginWndProc)
-      WinSubclassWindow(hWnd, mPluginWinProc);
+      ::WinSubclassWindow(hWnd, mPluginWinProc);
   }
 
   return NS_OK;

From 953bc74eeef19a021439c7fc554640ee9d9d6c30 Mon Sep 17 00:00:00 2001
From: Peter Weilbacher <mozilla@weilbacher.org>
Date: Thu, 30 Jul 2009 21:20:44 +0300
Subject: [PATCH 100/175] [OS/2] Bug 506997: fix build break after removal of
 deferred window position and clean up

---
 widget/src/os2/nsWindow.cpp | 38 ++++---------------------------------
 widget/src/os2/nsWindow.h   |  7 -------
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp
index b9eebad772c..39a69ccee60 100644
--- a/widget/src/os2/nsWindow.cpp
+++ b/widget/src/os2/nsWindow.cpp
@@ -145,11 +145,6 @@ static HPOINTER gPtrArray[IDC_COUNT];
 static PRBool gIsTrackPoint = PR_FALSE;
 static PRBool gIsDBCS = PR_FALSE;
 
-// The last user input event time in milliseconds. If there are any pending
-// native toolkit input events it returns the current time. The value is
-// compatible with PR_IntervalToMicroseconds(PR_IntervalNow()).
-static PRUint32 gLastInputEventTime = 0;
-
 #ifdef DEBUG_FOCUS
 int currentWindowIdentifier = 0;
 #endif
@@ -205,9 +200,6 @@ nsWindow::nsWindow() : nsBaseWidget()
     mPrevWndProc        = NULL;
     mParent             = 0;
     mNextID             = 1;
-    mSWPs               = 0;
-    mlHave              = 0;
-    mlUsed              = 0;
     mFrameIcon          = 0;
     mDeadKey            = 0;
     mHaveDeadKey        = FALSE;
@@ -1334,7 +1326,7 @@ NS_METHOD nsWindow::Resize(PRInt32 aX,
 {
    // For mWnd & eWindowType_child set the cached values upfront, see bug 286555.
    // For other mWnd types we defer transfer of values to mBounds to
-   // SetWindowPos(), see bug 391421.
+   // WinSetWindowPos(), see bug 391421.
    if( !mWnd || mWindowType == eWindowType_child) 
    {
       // Set cached value for lightweight and printing
@@ -1362,9 +1354,9 @@ NS_METHOD nsWindow::Resize(PRInt32 aX,
          ptl.y = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN) - h - 1 - aY;
       }
 
-      if( !SetWindowPos( 0, ptl.x, ptl.y, w, h, SWP_MOVE | SWP_SIZE))
-         if( aRepaint)
-            Invalidate(PR_FALSE);
+      WinSetWindowPos(GetMainWindow(), 0, ptl.x, ptl.y, w, h, SWP_MOVE | SWP_SIZE);
+      if (aRepaint)
+         Invalidate(PR_FALSE);
 
 #if DEBUG_sobotka
       printf("+++++++++++Resized 0x%lx at %ld, %ld to %d x %d (%d,%d)\n",
@@ -2788,11 +2780,6 @@ void nsWindow::OnDestroy()
    SubclassWindow( PR_FALSE);
    mWnd = 0;
 
-   // if we were in the middle of deferred window positioning then free up
-   if( mSWPs) free( mSWPs);
-   mSWPs = 0;
-   mlHave = mlUsed = 0;
-
    // release references to context, toolkit, appshell, children
    nsBaseWidget::OnDestroy();
 
@@ -3346,23 +3333,6 @@ nsWindow::HasPendingInputEvent()
 // OS2-specific routines to emulate Windows behaviors
 // --------------------------------------------------------------------------
 
-BOOL nsWindow::SetWindowPos( HWND ib, long x, long y, long cx, long cy, ULONG flags)
-{
-   BOOL bDeferred = FALSE;
-
-   if( mParent && mParent->mSWPs) // XXX bit implicit...
-   {
-      mParent->DeferPosition( GetMainWindow(), ib, x, y, cx, cy, flags);
-      bDeferred = TRUE;
-   }
-   else // WinSetWindowPos appears not to need msgq (hmm)
-      WinSetWindowPos( GetMainWindow(), ib, x, y, cx, cy, GetSWPFlags(flags));
-
-   // When the window is actually sized, mBounds will be updated in the fnwp.
-
-   return bDeferred;
-}
-
 nsresult nsWindow::GetWindowText( nsString &aStr, PRUint32 *rc)
 {
    // Switch to the PM thread if necessary...
diff --git a/widget/src/os2/nsWindow.h b/widget/src/os2/nsWindow.h
index 3012cb00765..26f7b445126 100644
--- a/widget/src/os2/nsWindow.h
+++ b/widget/src/os2/nsWindow.h
@@ -205,16 +205,12 @@ protected:
    // hooks subclasses may wish to override!
    virtual void     PostCreateWidget()            {}
    virtual PRInt32  GetClientHeight()             { return mBounds.height; }
-   virtual ULONG    GetSWPFlags( ULONG flags)     { return flags; }
    virtual void     SetupForPrint( HWND /*hwnd*/) {}
 
    // Useful functions for subclasses to use, threaded as necessary.
    virtual nsresult GetWindowText( nsString &str, PRUint32 *rc);
    virtual void     AddToStyle( ULONG style);
    virtual void     RemoveFromStyle( ULONG style);
-   // return true if deferred
-   virtual BOOL     SetWindowPos( HWND hwndInsertBehind, long x, long y,
-                                  long cx, long cy, unsigned long flags);
 
    // Message handlers - may wish to override.  Default implementation for
    // control, paint & scroll is to do nothing.
@@ -244,8 +240,6 @@ protected:
    PFNWP     mPrevWndProc;    // previous window procedure
    nsWindow *mParent;         // parent widget
    ULONG     mNextID;         // next child window id
-   PSWP      mSWPs;           // SWPs for deferred window positioning
-   ULONG     mlHave, mlUsed;  // description of mSWPs array
    HPOINTER  mFrameIcon;      // current frame icon
    VDKEY     mDeadKey;        // dead key from previous keyevent
    BOOL      mHaveDeadKey;    // is mDeadKey valid [0 may be a valid dead key, for all I know]
@@ -302,7 +296,6 @@ protected:
                                      PRInt16 aButton = nsMouseEvent::eLeftButton);
    virtual PRBool DispatchResizeEvent( PRInt32 aClientX, PRInt32 aClientY);
    void GetNonClientBounds(nsIntRect &aRect);
-   void    DeferPosition( HWND, HWND, long, long, long, long, ULONG);
    void ConstrainZLevel(HWND *aAfter);
 
    PRBool   CheckDragStatus(PRUint32 aAction, HPS * oHps);

From 6e80657f88682c3c3942b5cec5d53fcef9cb18c9 Mon Sep 17 00:00:00 2001
From: Walter Meinl <wuno@lsvw.de>
Date: Thu, 30 Jul 2009 21:20:44 +0300
Subject: [PATCH 101/175] [OS/2] Bug 507251: Fix build break of xulrunner,
 sunbird due to missing readme.*, r=pweilbacher

---
 widget/src/os2/Makefile.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/widget/src/os2/Makefile.in b/widget/src/os2/Makefile.in
index 599b43a487b..1e5dfe84a8d 100644
--- a/widget/src/os2/Makefile.in
+++ b/widget/src/os2/Makefile.in
@@ -126,8 +126,10 @@ DEFINES += -DMOZ_APP_DISPLAYNAME=\"$(MOZ_APP_DISPLAYNAME)\"
 
 LOCAL_INCLUDES	= -I. -I$(srcdir)/../xpwidgets -I$(srcdir)
 
+ifneq (,$(filter-out xulrunner sunbird,$(MOZ_APP_NAME)))
 libs::	README.$(MOZ_APP_NAME)
 	cp -f $^ $(DIST)/bin/README.txt
+endif
 
 export::
 	test -d ./res || mkdir ./res

From 185a86608f5d66ceb9d1cd64e27bd99e49005617 Mon Sep 17 00:00:00 2001
From: Josh Aas <joshmoz@gmail.com>
Date: Thu, 30 Jul 2009 14:21:40 -0400
Subject: [PATCH 102/175] Get rid of unnecessary conversion from CFURLRef to
 FSRef. b=506812 r=vlad

---
 toolkit/xre/nsAppRunner.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 1c5870399ae..14c5f22108e 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1439,13 +1439,7 @@ XRE_GetBinaryPath(const char* argv0, nsILocalFile* *aResult)
   if (!bundleURL)
     return NS_ERROR_FAILURE;
 
-  FSRef fileRef;
-  if (!CFURLGetFSRef(bundleURL, &fileRef)) {
-    CFRelease(bundleURL);
-    return NS_ERROR_FAILURE;
-  }
-
-  rv = lfm->InitWithFSRef(&fileRef);
+  rv = lfm->InitWithCFURL(bundleURL);
   CFRelease(bundleURL);
 
   if (NS_FAILED(rv))

From 3e011f0b6f9bec0b75ba1e83ef6cea02c83395d9 Mon Sep 17 00:00:00 2001
From: Blake Winton <bwinton@latte.ca>
Date: Thu, 30 Jul 2009 20:40:45 +0200
Subject: [PATCH 103/175] Bug 507386 - Unintended semicolons at the end of
 if-statements. r=dietrich

---
 browser/components/microsummaries/src/nsMicrosummaryService.js | 2 +-
 browser/components/places/content/controller.js                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/microsummaries/src/nsMicrosummaryService.js b/browser/components/microsummaries/src/nsMicrosummaryService.js
index cf06b0d913d..33ff4401395 100644
--- a/browser/components/microsummaries/src/nsMicrosummaryService.js
+++ b/browser/components/microsummaries/src/nsMicrosummaryService.js
@@ -2055,7 +2055,7 @@ MicrosummaryResource.prototype = {
                      getService(Ci.nsICharsetResolver);
       if (resolver) {
         var charset = resolver.requestCharset(null, request.channel, {}, {});
-        if (charset != "");
+        if (charset != "")
           request.channel.contentCharset = charset;
       }
     }
diff --git a/browser/components/places/content/controller.js b/browser/components/places/content/controller.js
index d31cdfd0453..fdb7d815ca4 100644
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -154,7 +154,7 @@ PlacesController.prototype = {
         var result = this._view.getResult();
         if (result) {
           var container = asContainer(result.root);
-          if (container.containerOpen && container.childCount > 0);
+          if (container.containerOpen && container.childCount > 0)
             return true;
         }
       }

From 1dd69b0568e9a2d7627ebd8a5dcc51ade6adf1cf Mon Sep 17 00:00:00 2001
From: Nochum Sossonko <highmind63@gmail.com>
Date: Thu, 30 Jul 2009 20:40:54 +0200
Subject: [PATCH 104/175] Bug 506104 - add a memoized getter for PluralForm.jsm
 inside DownloadUtils.jsm. r=gavin

---
 toolkit/mozapps/downloads/src/DownloadUtils.jsm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/toolkit/mozapps/downloads/src/DownloadUtils.jsm b/toolkit/mozapps/downloads/src/DownloadUtils.jsm
index e632690b478..b7505a8a4f2 100644
--- a/toolkit/mozapps/downloads/src/DownloadUtils.jsm
+++ b/toolkit/mozapps/downloads/src/DownloadUtils.jsm
@@ -66,7 +66,12 @@ var EXPORTED_SYMBOLS = [ "DownloadUtils" ];
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
-Cu.import("resource://gre/modules/PluralForm.jsm");
+
+__defineGetter__("PluralForm", function() {
+  delete this.PluralForm;
+  Cu.import("resource://gre/modules/PluralForm.jsm");
+  return PluralForm;
+});
 
 const kDownloadProperties =
   "chrome://mozapps/locale/downloads/downloads.properties";

From ceac0255627e242a85e6ef7319e45d222a810b95 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Thu, 30 Jul 2009 13:16:15 -0700
Subject: [PATCH 105/175] Backed out changeset 8506b25206cf (bug 504311)
 because the test added uses enablePrivilege which hangs tinderbox asking for
 privileges.

---
 layout/style/crashtests/504311-1.xul    | 24 ------------------------
 layout/style/crashtests/crashtests.list |  1 -
 layout/style/nsStyleStruct.cpp          |  3 +--
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 layout/style/crashtests/504311-1.xul

diff --git a/layout/style/crashtests/504311-1.xul b/layout/style/crashtests/504311-1.xul
deleted file mode 100644
index e2d40fa70a0..00000000000
--- a/layout/style/crashtests/504311-1.xul
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="f()">
-
-	<script type="text/javascript">
-		<![CDATA[
-			function f ()
-			{
-                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-                var tb = document. getElementById ("tb01");
-				var inputField = tb. inputField;
-				var editor = inputField. QueryInterface (Components. interfaces. nsIDOMNSEditableElement). editor;
-				editor = editor. QueryInterface (Components. interfaces. nsIEditor);
-				editor = editor. QueryInterface (Components. interfaces. nsIPlaintextEditor);
-				editor. wrapWidth = -1;
-			}
-		]]>
-	</script>
-	
-	<textbox id="tb01" multiline="true"/>
-
-</window>
diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list
index 97ebd56f53e..fe390f391c1 100644
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -39,4 +39,3 @@ load 473914-1.html
 skip load long-url-list-stack-overflow.html # skipped due to being slow (bug 477490)
 load 495269-1.html
 load 495269-2.html
-load 504311-1.xul
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 49eb59a0043..beaa8ab012e 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1873,14 +1873,13 @@ nsStyleText::~nsStyleText(void) { }
 
 nsChangeHint nsStyleText::CalcDifference(const nsStyleText& aOther) const
 {
-  if (NewlineIsSignificant() != aOther.NewlineIsSignificant()) {
+  if (mWhiteSpace != aOther.mWhiteSpace) {
     // This may require construction of suppressed text frames
     return NS_STYLE_HINT_FRAMECHANGE;
   }
 
   if ((mTextAlign != aOther.mTextAlign) ||
       (mTextTransform != aOther.mTextTransform) ||
-      (mWhiteSpace != aOther.mWhiteSpace) ||
       (mWordWrap != aOther.mWordWrap) ||
       (mLetterSpacing != aOther.mLetterSpacing) ||
       (mLineHeight != aOther.mLineHeight) ||

From 9ff77df80742409e7bc7530fb2e676d86a7b336f Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Thu, 30 Jul 2009 13:53:06 -0700
Subject: [PATCH 106/175] xpcshell unit test fix from async location bar
 landing on a CLOSED TREE.  no bug.  r=dietrich

---
 .../test_autocomplete_on_value_removed_479089.js      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js b/toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js
index ad1c93692b1..3a3ee300c8e 100644
--- a/toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js
+++ b/toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js
@@ -53,7 +53,8 @@ getService(Ci.nsINavHistoryService);
 function run_test()
 {
   // QI to nsIAutoCompleteSimpleResultListener
-  var historyService = histsvc.QueryInterface(Components.interfaces.nsIAutoCompleteSimpleResultListener);
+  var listener = Cc["@mozilla.org/autocomplete/search;1?name=history"].
+                 getService(Components.interfaces.nsIAutoCompleteSimpleResultListener);
 
   // add history visit
   var now = Date.now() * 1000;
@@ -61,20 +62,20 @@ function run_test()
   var ref = ios.newURI("http://mozilla.com/", null, null);
   var visit = histsvc.addVisit(uri, now, ref, 1, false, 0);
   // create a query object
-  var query = historyService.getNewQuery();
+  var query = histsvc.getNewQuery();
   // create the options object we will never use
-  var options = historyService.getNewQueryOptions();
+  var options = histsvc.getNewQueryOptions();
   // look for this uri only
   query.uri = uri;
   // execute
-  var queryRes = historyService.executeQuery(query, options);
+  var queryRes = histsvc.executeQuery(query, options);
   // open the result container
   queryRes.root.containerOpen = true;
   // debug queries
   // dump_table("moz_places_view");
   do_check_eq(queryRes.root.childCount, 1);  
   // call the untested code path
-  historyService.onValueRemoved(null, uri.spec, true);
+  listener.onValueRemoved(null, uri.spec, true);
   // make sure it is GONE from the DB
   do_check_eq(queryRes.root.childCount, 0);
   // close the container

From c66d288737f0d6414bcb40938b1417b79f4fdd52 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Thu, 30 Jul 2009 15:40:12 -0700
Subject: [PATCH 107/175] Linux scaling behavior differs from elsewhere, so
 this test doesn't fail there (followup to bug 189519 to hopefully reopen a
 CLOSED TREE)

---
 layout/reftests/backgrounds/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/backgrounds/reftest.list b/layout/reftests/backgrounds/reftest.list
index c037d0a0803..b247584d9a1 100644
--- a/layout/reftests/backgrounds/reftest.list
+++ b/layout/reftests/backgrounds/reftest.list
@@ -85,7 +85,7 @@
 # the image aren't the issue, because they're being obscured to avoid sampling
 # algorithm dependencies (at least assuming the sampling algorithm in use
 # doesn't sample too far astray from the boundaries).
-fails == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html
+fails-if(MOZ_WIDGET_TOOLKIT!="gtk2") == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html
 
 # background-size affects images without intrinsic dimensions specially; we may
 # not support such image formats right now, but when we do, we want

From fa1d6e27eff97be1dae40076990c344411c9be48 Mon Sep 17 00:00:00 2001
From: Matin Movassate <mmovassate@mozilla.com>
Date: Thu, 30 Jul 2009 14:02:08 -0700
Subject: [PATCH 108/175] Fixing bug 503598. Adding support for drag n' drop
 funcitonality for local files. r=enndeakin@gmail.com,
 sr=mrbkap@gmail.com/jonas@sicking.cc

--HG--
extra : rebase_source : 66d93e71d30ea18e045f95f7f94951c02739edd9
---
 content/events/src/nsDOMDataTransfer.cpp     | 49 +++++++++++++++++++-
 content/events/src/nsDOMDataTransfer.h       |  8 ++++
 dom/interfaces/events/nsIDOMDataTransfer.idl | 10 +++-
 3 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/content/events/src/nsDOMDataTransfer.cpp b/content/events/src/nsDOMDataTransfer.cpp
index 13536ac9074..b5521894386 100644
--- a/content/events/src/nsDOMDataTransfer.cpp
+++ b/content/events/src/nsDOMDataTransfer.cpp
@@ -38,7 +38,6 @@
 #include "nsDOMDataTransfer.h"
 
 #include "prlog.h"
-#include "nsAutoPtr.h"
 #include "nsString.h"
 #include "nsIServiceManager.h"
 #include "nsIVariant.h"
@@ -219,6 +218,52 @@ nsDOMDataTransfer::GetMozUserCancelled(PRBool* aUserCancelled)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDOMDataTransfer::GetFiles(nsIDOMFileList** aFileList)
+{
+  *aFileList = nsnull;
+
+  if (mEventType != NS_DRAGDROP_DROP && mEventType != NS_DRAGDROP_DRAGDROP)
+    return NS_OK;
+
+  if (!mFiles) {
+    mFiles = new nsDOMFileList();
+    NS_ENSURE_TRUE(mFiles, NS_ERROR_OUT_OF_MEMORY);
+
+    PRUint32 count = mItems.Length();
+
+    for (PRUint32 i = 0; i < count; i++) {
+      nsCOMPtr<nsIVariant> variant;
+      nsresult rv = MozGetDataAt(NS_ConvertUTF8toUTF16(kFileMime), i, getter_AddRefs(variant));
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      if (!variant)
+        continue;
+
+      nsCOMPtr<nsISupports> supports;
+      rv = variant->GetAsISupports(getter_AddRefs(supports));
+
+      if (NS_FAILED(rv))
+        continue;
+
+      nsCOMPtr<nsIFile> file = do_QueryInterface(supports);
+
+      if (!file)
+        continue;
+
+      nsRefPtr<nsDOMFile> domFile = new nsDOMFile(file);
+      NS_ENSURE_TRUE(domFile, NS_ERROR_OUT_OF_MEMORY);
+
+      if (!mFiles->Append(domFile))
+        return NS_ERROR_FAILURE;
+    }
+  }
+
+  *aFileList = mFiles;
+  NS_ADDREF(*aFileList);
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDOMDataTransfer::GetTypes(nsIDOMDOMStringList** aTypes)
 {
@@ -407,7 +452,7 @@ nsDOMDataTransfer::MozSetDataAt(const nsAString& aFormat,
   // XXX perhaps this should also limit any non-string type as well
   if ((aFormat.EqualsLiteral("application/x-moz-file-promise") ||
        aFormat.EqualsLiteral("application/x-moz-file")) &&
-       !nsContentUtils::IsCallerChrome()) {
+       !nsContentUtils::IsCallerTrustedForCapability("UniversalXPConnect")) {
     return NS_ERROR_DOM_SECURITY_ERR;
   }
 
diff --git a/content/events/src/nsDOMDataTransfer.h b/content/events/src/nsDOMDataTransfer.h
index 5a3f705e9c9..993ae3881ca 100644
--- a/content/events/src/nsDOMDataTransfer.h
+++ b/content/events/src/nsDOMDataTransfer.h
@@ -47,6 +47,11 @@
 #include "nsIDOMElement.h"
 #include "nsCycleCollectionParticipant.h"
 
+#include "nsAutoPtr.h"
+#include "nsIFile.h"
+#include "nsILocalFile.h"
+#include "nsDOMFile.h"
+
 class nsITransferable;
 
 /**
@@ -185,6 +190,9 @@ protected:
   // array of items, each containing an array of format->data pairs
   nsTArray<nsTArray<TransferItem> > mItems;
 
+  // array of files, containing only the files present in the dataTransfer
+  nsRefPtr<nsDOMFileList> mFiles;
+
   // the target of the drag. The drag and dragend events will fire at this.
   nsCOMPtr<nsIDOMElement> mDragTarget;
 
diff --git a/dom/interfaces/events/nsIDOMDataTransfer.idl b/dom/interfaces/events/nsIDOMDataTransfer.idl
index d1b7e3a72f2..1776f8e691e 100644
--- a/dom/interfaces/events/nsIDOMDataTransfer.idl
+++ b/dom/interfaces/events/nsIDOMDataTransfer.idl
@@ -38,8 +38,9 @@
 #include "domstubs.idl"
 
 interface nsIVariant;
+interface nsIDOMFileList;
 
-[scriptable, uuid(E4970BA1-9567-455C-8B4E-4607D7E741BB)]
+[scriptable, uuid(34042440-60A8-4992-AE5C-798E69148955)]
 interface nsIDOMDataTransfer : nsISupports
 {
   /**
@@ -90,6 +91,13 @@ interface nsIDOMDataTransfer : nsISupports
    */
   attribute DOMString effectAllowed;
 
+  /**
+   * Holds a list of all the local files available on this data transfer.
+   * A dataTransfer containing no files will return an empty list, and an
+   * invalid index access on the resulting file list will return null. 
+   */
+  readonly attribute nsIDOMFileList files;
+
   /**
    * Holds a list of the format types of the data that is stored for the first
    * item, in the same order the data was added. An empty list will be

From 214062c312b2c10276af65c2cb49050a7773ba8c Mon Sep 17 00:00:00 2001
From: Johnny Stenback <jst@mozilla.com>
Date: Thu, 30 Jul 2009 16:53:04 -0700
Subject: [PATCH 109/175] Fixing bug 492713. Remove security checks that are no
 longer needed. r+sr=mrbkap@gmail.com

---
 dom/base/nsDOMClassInfo.cpp | 145 +-----------------------------------
 dom/base/nsDOMClassInfo.h   |   4 -
 2 files changed, 3 insertions(+), 146 deletions(-)

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 2291ed8a17f..c1fd796626a 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -512,7 +512,6 @@ static const char kDOMStringBundleURL[] =
   (NODE_SCRIPTABLE_FLAGS |                                                    \
    nsIXPCScriptable::WANT_POSTCREATE |                                        \
    nsIXPCScriptable::WANT_ADDPROPERTY |                                       \
-   nsIXPCScriptable::WANT_DELPROPERTY |                                       \
    nsIXPCScriptable::WANT_GETPROPERTY |                                       \
    nsIXPCScriptable::WANT_ENUMERATE)
 
@@ -1448,8 +1447,6 @@ jsval nsDOMClassInfo::sPackages_id        = JSVAL_VOID;
 static const JSClass *sObjectClass = nsnull;
 const JSClass *nsDOMClassInfo::sXPCNativeWrapperClass = nsnull;
 
-static PRBool sDoSecurityCheckInAddProperty = PR_TRUE;
-
 /**
  * Set our JSClass pointer for the Object class
  */
@@ -3667,10 +3664,7 @@ nsDOMClassInfo::Init()
     RegisterClassProtos(i);
   }
 
-  PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-  sDoSecurityCheckInAddProperty = PR_FALSE;
   RegisterExternalClasses();
-  sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
 
   sDisableDocumentAllSupport =
     nsContentUtils::GetBoolPref("browser.dom.document.all.disabled");
@@ -4955,19 +4949,6 @@ nsWindowSH::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
     }
   }
 
-  // If we're in a state where we're not supposed to do a security
-  // check, return early.
-  if (!sDoSecurityCheckInAddProperty) {
-    return NS_OK;
-  }
-
-  if (id == sLocation_id) {
-    // Don't allow adding a window.location setter or getter, allowing
-    // that could lead to security bugs (see bug 143369).
-
-    return NS_ERROR_DOM_SECURITY_ERR;
-  }
-
   return nsEventReceiverSH::AddProperty(wrapper, cx, obj, id, vp, _retval);
 }
 
@@ -5015,13 +4996,6 @@ nsWindowSH::DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
     }
   }
 
-  if (id == sLocation_id) {
-    // Don't allow deleting window.location, allowing that could lead
-    // to security bugs (see bug 143369).
-
-    return NS_ERROR_DOM_SECURITY_ERR;
-  }
-
   // Notify any XOWs on our outer window.
 
   nsGlobalWindow *outerWin = win->GetOuterWindowInternal();
@@ -5314,16 +5288,12 @@ public:
 
   nsresult Install(JSContext *cx, JSObject *target, jsval thisAsVal)
   {
-    PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-    sDoSecurityCheckInAddProperty = PR_FALSE;
-
     JSBool ok =
       ::JS_DefineUCProperty(cx, target,
                             reinterpret_cast<const jschar *>(mClassName),
                             nsCRT::strlen(mClassName), thisAsVal, nsnull,
                             nsnull, JSPROP_PERMANENT);
 
-    sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
     return ok ? NS_OK : NS_ERROR_UNEXPECTED;
   }
 
@@ -5686,18 +5656,12 @@ ResolvePrototype(nsIXPConnect *aXPConnect, nsGlobalWindow *aWin, JSContext *cx,
                                          getter_AddRefs(constructor));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-  sDoSecurityCheckInAddProperty = PR_FALSE;
-
   nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
   jsval v;
 
   rv = nsDOMClassInfo::WrapNative(cx, obj, constructor,
                                   &NS_GET_IID(nsIDOMDOMConstructor),
                                   PR_FALSE, &v, getter_AddRefs(holder));
-
-  sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
-
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (install) {
@@ -5879,17 +5843,10 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
                                   getter_AddRefs(constructor));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-    sDoSecurityCheckInAddProperty = PR_FALSE;
-
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
     jsval v;
-
     rv = WrapNative(cx, obj, constructor, &NS_GET_IID(nsIDOMDOMConstructor),
                     PR_FALSE, &v, getter_AddRefs(holder));
-
-    sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
-
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = constructor->Install(cx, obj, v);
@@ -6042,15 +5999,11 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
 
     NS_ENSURE_SUCCESS(rv, rv);
 
-    PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-    sDoSecurityCheckInAddProperty = PR_FALSE;
-
     JSBool ok = ::JS_DefineUCProperty(cx, obj, ::JS_GetStringChars(str),
                                       ::JS_GetStringLength(str),
                                       prop_val, nsnull, nsnull,
                                       JSPROP_ENUMERATE);
 
-    sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
     *did_resolve = PR_TRUE;
 
     return ok ? NS_OK : NS_ERROR_FAILURE;
@@ -6181,14 +6134,9 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
         // A numeric property accessed and the numeric property is a
         // child frame. Define a property for this index.
 
-        PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-        sDoSecurityCheckInAddProperty = PR_FALSE;
-
         *_retval = ::JS_DefineElement(cx, obj, JSVAL_TO_INT(id), JSVAL_VOID,
                                       nsnull, nsnull, 0);
 
-        sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
-
         if (*_retval) {
           *objp = obj;
         }
@@ -6228,21 +6176,12 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
       JSObject *realObj;
       wrapper->GetJSObject(&realObj);
 
-      // Resolving a standard class won't do any evil, and it's possible
-      // for caps to get the answer wrong, so disable the security check
-      // for this case.
-    
-      PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-      sDoSecurityCheckInAddProperty = PR_FALSE;
-
       // Don't resolve standard classes on XPCNativeWrapper etc, only
       // resolve them if we're resolving on the real global object.
       ok = obj == realObj ?
            ::JS_ResolveStandardClass(my_cx, obj, id, &did_resolve) :
            JS_TRUE;
 
-      sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
-
       if (!ok) {
         // Trust the JS engine (or the script security manager) to set
         // the exception in the JS engine.
@@ -6341,18 +6280,6 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
         }
 #endif
 
-        // Script is accessing a child frame and this access can
-        // potentially come from a context from a different domain.
-        // ::JS_DefineUCProperty() will call
-        // nsWindowSH::AddProperty(), and that method will do a
-        // security check and that security check will fail since
-        // other domains can't add properties to a global object in
-        // this domain. Set the sDoSecurityCheckInAddProperty flag to
-        // false (and set it to true immediagtely when we're done) to
-        // tell nsWindowSH::AddProperty() that defining this new
-        // property is 'ok' in this case, even if the call comes from
-        // a different context.
-
         JSAutoRequest ar(cx);
 
         PRBool ok = ::JS_DefineUCProperty(cx, obj, chars,
@@ -6451,8 +6378,8 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
       wrapper->GetJSObject(&scope);
     }
 
-    jsval v;
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
+    jsval v;
     rv = WrapNative(cx, scope, location, &NS_GET_IID(nsIDOMLocation), PR_TRUE,
                     &v, getter_AddRefs(holder));
     NS_ENSURE_SUCCESS(rv, rv);
@@ -6466,17 +6393,12 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
     }
 #endif
 
-    PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-    sDoSecurityCheckInAddProperty = PR_FALSE;
-
     JSAutoRequest ar(cx);
 
     JSBool ok = ::JS_DefineUCProperty(cx, obj, ::JS_GetStringChars(str),
                                       ::JS_GetStringLength(str), v, nsnull,
                                       nsnull, JSPROP_ENUMERATE);
 
-    sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
-
     if (!ok) {
       return NS_ERROR_FAILURE;
     }
@@ -6572,9 +6494,6 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
 
       JSAutoRequest ar(cx);
 
-      PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-      sDoSecurityCheckInAddProperty = PR_FALSE;
-
       jsval winVal = OBJECT_TO_JSVAL(win->GetGlobalJSObject());
       if (!win->IsChromeWindow()) {
         JSObject *scope;
@@ -6598,8 +6517,6 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                               winVal, JS_PropertyStub, JS_PropertyStub,
                               JSPROP_READONLY | JSPROP_ENUMERATE);
 
-      sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
-
       if (!ok) {
         return NS_ERROR_FAILURE;
       }
@@ -6614,17 +6531,12 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
       if (!isResolvingJavaProperties) {
         isResolvingJavaProperties = PR_TRUE;
 
-        PRBool oldVal = sDoSecurityCheckInAddProperty;
-        sDoSecurityCheckInAddProperty = PR_FALSE;
-
         // Tell the window to initialize the Java properties. The
         // window needs to do this as we need to do this only once,
         // and detecting that reliably from here is hard.
 
         win->InitJavaProperties(); 
 
-        sDoSecurityCheckInAddProperty = oldVal;
-
         PRBool hasProp;
         PRBool ok = ::JS_HasProperty(cx, obj, ::JS_GetStringBytes(str),
                                      &hasProp);
@@ -7000,10 +6912,6 @@ nsNodeSH::DefineVoidProp(JSContext* cx, JSObject* obj, jsval id,
 
   JSString* str = JSVAL_TO_STRING(id);
 
-  // We might have a document here.
-  PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-  sDoSecurityCheckInAddProperty = PR_FALSE;
-
   // We want this to be as invisible to content script as possible.  So
   // don't enumerate this, and set is as JSPROP_SHARED so it won't get
   // cached on the object.
@@ -7011,8 +6919,6 @@ nsNodeSH::DefineVoidProp(JSContext* cx, JSObject* obj, jsval id,
                                     ::JS_GetStringLength(str), JSVAL_VOID,
                                     nsnull, nsnull, JSPROP_SHARED);
 
-  sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
-
   if (!ok) {
     return NS_ERROR_FAILURE;
   }
@@ -8179,44 +8085,6 @@ nsContentListSH::GetNamedItem(nsISupports *aNative, const nsAString& aName,
   return list->GetNamedItem(aName, aResult);
 }
 
-// Document helper for document.location and document.on*
-
-NS_IMETHODIMP
-nsDocumentSH::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                          JSObject *obj, jsval id, jsval *vp,
-                          PRBool *_retval)
-{
-  // If we're in a state where we're not supposed to do a security
-  // check, return early.
-  if (!sDoSecurityCheckInAddProperty) {
-    return NS_OK;
-  }
-
-  if (id == sLocation_id) {
-    // Don't allow adding a document.location setter or getter, allowing
-    // that could lead to security bugs (see bug 143369).
-
-    return NS_ERROR_DOM_SECURITY_ERR;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocumentSH::DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                          JSObject *obj, jsval id, jsval *vp,
-                          PRBool *_retval)
-{
-  if (id == sLocation_id) {
-    // Don't allow deleting document.location, allowing that could lead
-    // to security bugs (see bug 143369).
-
-    return NS_ERROR_DOM_SECURITY_ERR;
-  }
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDocumentSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          JSObject *obj, jsval id, PRUint32 flags,
@@ -8225,10 +8093,8 @@ nsDocumentSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
   nsresult rv;
 
   if (id == sLocation_id) {
-    // This must be done even if we're just getting the value of
-    // document.location (i.e. no checking flags & JSRESOLVE_ASSIGNING
-    // here) since we must define document.location to prevent the
-    // getter from being overriden (for security reasons).
+    // Define the location property on the document object itself so
+    // that we can intercept getting and setting of document.location.
 
     nsCOMPtr<nsIDOMNSDocument> doc(do_QueryWrappedNative(wrapper, obj));
     NS_ENSURE_TRUE(doc, NS_ERROR_UNEXPECTED);
@@ -8244,9 +8110,6 @@ nsDocumentSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                     &v, getter_AddRefs(holder));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    PRBool doSecurityCheckInAddProperty = sDoSecurityCheckInAddProperty;
-    sDoSecurityCheckInAddProperty = PR_FALSE;
-
     JSAutoRequest ar(cx);
 
     JSString *str = JSVAL_TO_STRING(id);
@@ -8254,8 +8117,6 @@ nsDocumentSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                                       ::JS_GetStringLength(str), v, nsnull,
                                       nsnull, JSPROP_ENUMERATE);
 
-    sDoSecurityCheckInAddProperty = doSecurityCheckInAddProperty;
-
     if (!ok) {
       return NS_ERROR_FAILURE;
     }
diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h
index 16dc5d2c37f..32b6380e6f2 100644
--- a/dom/base/nsDOMClassInfo.h
+++ b/dom/base/nsDOMClassInfo.h
@@ -899,10 +899,6 @@ public:
   }
 
 public:
-  NS_IMETHOD AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                         JSObject *obj, jsval id, jsval *vp, PRBool *_retval);
-  NS_IMETHOD DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                         JSObject *obj, jsval id, jsval *vp, PRBool *_retval);
   NS_IMETHOD NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                         JSObject *obj, jsval id, PRUint32 flags,
                         JSObject **objp, PRBool *_retval);

From b7fae378bcdc3d7a6443b068abed488825f72dac Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Thu, 30 Jul 2009 17:34:05 -0700
Subject: [PATCH 110/175] Bug 505934 - Skip the write access checks on Windows
 CE. r=dtownsend

---
 toolkit/mozapps/update/src/nsUpdateService.js.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/toolkit/mozapps/update/src/nsUpdateService.js.in b/toolkit/mozapps/update/src/nsUpdateService.js.in
index 94b5af7f73c..2db112bbc24 100644
--- a/toolkit/mozapps/update/src/nsUpdateService.js.in
+++ b/toolkit/mozapps/update/src/nsUpdateService.js.in
@@ -1647,6 +1647,8 @@ UpdateService.prototype = {
     if (gCanUpdate !== null)
       return gCanUpdate;
 
+// On Windows CE skip the write access checks and assume we have write access
+#ifndef WINCE
     try {
       var appDirFile = getUpdateFile([FILE_PERMS_TEST]);
       LOG("UpdateService", "canUpdate - testing " + appDirFile.path);
@@ -1737,13 +1739,15 @@ UpdateService.prototype = {
           actualAppDirFile.remove(false);
         }
       }
-#endif
+#endif //XP_WIN
     }
     catch (e) {
        LOG("UpdateService", "canUpdate - unable to update. Exception: " + e);
       // No write privileges to install directory
       return gCanUpdate = false;
     }
+#endif //WINCE
+
     // If the administrator has locked the app update functionality
     // OFF - this is not just a user setting, so disable the manual
     // UI too.

From 722d84dbc4c32b7cdf5d2a10ea1fb688b8826313 Mon Sep 17 00:00:00 2001
From: Ian van den Berg <ian.vdberg@gmail.com>
Date: Thu, 30 Jul 2009 17:35:02 -0700
Subject: [PATCH 111/175] Bug 393951 - Remove appID from
 nsIExtensionManager.getIncompatibleItemList. r=rstrong, sr=vlad

---
 toolkit/mozapps/extensions/content/update.js             | 2 +-
 .../mozapps/extensions/public/nsIExtensionManager.idl    | 7 ++-----
 toolkit/mozapps/extensions/src/nsExtensionManager.js.in  | 9 +++------
 toolkit/mozapps/extensions/test/unit/test_bug324121.js   | 2 +-
 toolkit/mozapps/update/content/updates.js                | 4 ++--
 toolkit/mozapps/update/src/nsUpdateService.js.in         | 4 ++--
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/toolkit/mozapps/extensions/content/update.js b/toolkit/mozapps/extensions/content/update.js
index 591fb22bf27..ce1a5fa21d8 100644
--- a/toolkit/mozapps/extensions/content/update.js
+++ b/toolkit/mozapps/extensions/content/update.js
@@ -204,7 +204,7 @@ var gVersionInfoPage = {
     var em = Components.classes["@mozilla.org/extensions/manager;1"]
                        .getService(nsIExtensionManager);
     // Retrieve the remaining incompatible items.
-    gUpdateWizard.items = em.getIncompatibleItemList(null, null, null,
+    gUpdateWizard.items = em.getIncompatibleItemList(null, null,
                                                      nsIUpdateItem.TYPE_ANY,
                                                      true, { });
     gUpdateWizard.items = gUpdateWizard.items.filter(function(item) {
diff --git a/toolkit/mozapps/extensions/public/nsIExtensionManager.idl b/toolkit/mozapps/extensions/public/nsIExtensionManager.idl
index 9004bd5519a..e74ce874888 100644
--- a/toolkit/mozapps/extensions/public/nsIExtensionManager.idl
+++ b/toolkit/mozapps/extensions/public/nsIExtensionManager.idl
@@ -198,7 +198,7 @@ interface nsIInstallLocation : nsISupports
  * XXXben - Some of this stuff should go into a management-ey interface,
  *          some into an app-startup-ey interface.
  */
-[scriptable, uuid(c6838785-ddb5-4886-8c05-4dd6424a01ac)]
+[scriptable, uuid(27571455-f0d3-4293-bb9c-4af60adfe9b9)]
 interface nsIExtensionManager : nsISupports
 {
   /**
@@ -346,8 +346,6 @@ interface nsIExtensionManager : nsISupports
   /**
    * Retrieves a list of nsIUpdateItems of items that are incompatible
    * with the supplied parameters.
-   * @param   id
-   *          The id of the application to check compatibility against
    * @param   appVersion
    *          The version of the application to check compatibility against
    * @param   platformVersion
@@ -361,8 +359,7 @@ interface nsIExtensionManager : nsISupports
    *          The XPCJS reference to the number of items returned.
    * @returns An array of incompatible nsIUpdateItems.
    */
-  void getIncompatibleItemList(in AString id,
-                               in AString appVersion,
+  void getIncompatibleItemList(in AString appVersion,
                                in AString platformVersion,
                                in unsigned long type,
                                in boolean includeDisabled,
diff --git a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
index a293d3ef7f9..42278c17a46 100644
--- a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+++ b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
@@ -4984,12 +4984,12 @@ ExtensionManager.prototype = {
   },
 
   /* See nsIExtensionManager.idl */
-  getIncompatibleItemList: function EM_getIncompatibleItemList(id, appVersion,
+  getIncompatibleItemList: function EM_getIncompatibleItemList(appVersion,
                                                                platformVersion,
                                                                type,
                                                                includeDisabled,
                                                                countRef) {
-    var items = this.datasource.getIncompatibleItemList(id, appVersion ? appVersion : undefined,
+    var items = this.datasource.getIncompatibleItemList(appVersion ? appVersion : undefined,
                                                         platformVersion ? platformVersion : undefined,
                                                         type, includeDisabled);
     countRef.value = items.length;
@@ -6636,8 +6636,6 @@ ExtensionsDataSource.prototype = {
 
   /**
    * Gets a list of items that are incompatible with a specific application version.
-   * @param   appID
-   *          The ID of the application - XXXben unused?
    * @param   appVersion
    *          The Version of the application to check for incompatibility against.
    * @param   platformVersion
@@ -6649,8 +6647,7 @@ ExtensionsDataSource.prototype = {
    * @returns An array of nsIUpdateItems that are incompatible with the application
    *          ID/Version supplied.
    */
-  getIncompatibleItemList: function EMDS_getIncompatibleItemList(appID,
-                                                                 appVersion,
+  getIncompatibleItemList: function EMDS_getIncompatibleItemList(appVersion,
                                                                  platformVersion,
                                                                  desiredType,
                                                                  includeDisabled) {
diff --git a/toolkit/mozapps/extensions/test/unit/test_bug324121.js b/toolkit/mozapps/extensions/test/unit/test_bug324121.js
index 84fdcf61e29..ab6216181cb 100644
--- a/toolkit/mozapps/extensions/test/unit/test_bug324121.js
+++ b/toolkit/mozapps/extensions/test/unit/test_bug324121.js
@@ -160,7 +160,7 @@ function run_test() {
   gEM.disableItem(ADDONS[0].id);
   restartEM();
 
-  var items = gEM.getIncompatibleItemList("", "3", "3", Ci.nsIUpdateItem.TYPE_ANY,
+  var items = gEM.getIncompatibleItemList("3", "3", Ci.nsIUpdateItem.TYPE_ANY,
                                           false, { });
 
   // Verify only items incompatible with the next app version are returned
diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js
index faebf3f9b98..24a2761263c 100644
--- a/toolkit/mozapps/update/content/updates.js
+++ b/toolkit/mozapps/update/content/updates.js
@@ -600,14 +600,14 @@ var gIncompatibleCheckPage = {
 
     var em = CoC["@mozilla.org/extensions/manager;1"].
              getService(CoI.nsIExtensionManager);
-    this.addons = em.getIncompatibleItemList("", gUpdates.update.extensionVersion,
+    this.addons = em.getIncompatibleItemList(gUpdates.update.extensionVersion,
                                              gUpdates.update.platformVersion,
                                              CoI.nsIUpdateItem.TYPE_ANY, false,
                                              { });
     if (this.addons.length > 0) {
       // Don't include add-ons that are already incompatible with the current
       // version of the application
-      var addons = em.getIncompatibleItemList("", null, null,
+      var addons = em.getIncompatibleItemList(null, null,
                                               CoI.nsIUpdateItem.TYPE_ANY, false,
                                               { });
       for (var i = 0; i < addons.length; ++i) {
diff --git a/toolkit/mozapps/update/src/nsUpdateService.js.in b/toolkit/mozapps/update/src/nsUpdateService.js.in
index 2db112bbc24..724930467b8 100644
--- a/toolkit/mozapps/update/src/nsUpdateService.js.in
+++ b/toolkit/mozapps/update/src/nsUpdateService.js.in
@@ -1520,14 +1520,14 @@ UpdateService.prototype = {
                getService(Ci.nsIExtensionManager);
     // Get the add-ons that are incompatible with the update's application
     // version and toolkit version.
-    var currentAddons = em.getIncompatibleItemList("", this._update.extensionVersion,
+    var currentAddons = em.getIncompatibleItemList(this._update.extensionVersion,
                                                    this._update.platformVersion,
                                                    Ci.nsIUpdateItem.TYPE_ANY,
                                                    false, { });
     if (currentAddons.length > 0) {
       // Get the add-ons that are incompatible with the current application
       // version and toolkit version.
-      var previousAddons = em.getIncompatibleItemList("", null, null,
+      var previousAddons = em.getIncompatibleItemList(null, null,
                                                       Ci.nsIUpdateItem.TYPE_ANY,
                                                       false, { });
       // Don't include add-ons that are already incompatible with the current

From 351839bba2daa83ce78bd68d0408157f382429b0 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Fri, 31 Jul 2009 00:05:57 -0400
Subject: [PATCH 112/175] Followup for bug 495176.  Fix the localization notes.

---
 .../en-US/chrome/security/caps.properties     | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/dom/locales/en-US/chrome/security/caps.properties b/dom/locales/en-US/chrome/security/caps.properties
index 5628acdfaf5..b7a4c968381 100644
--- a/dom/locales/en-US/chrome/security/caps.properties
+++ b/dom/locales/en-US/chrome/security/caps.properties
@@ -46,31 +46,31 @@ CheckSameOriginError = Security Error: Content at %S may not load data from %S.
 
 # LOCALIZATION NOTE (GetPropertyDeniedOrigins):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the property of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the property of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 GetPropertyDeniedOrigins = Permission denied for <%1$S> to get property %2$S.%3$S from <%4$S>.
 # LOCALIZATION NOTE (GetPropertyDeniedOriginsSubjectDomain):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the property of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the property of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the script which was denied access;
 #      don't translate "document.domain".
 GetPropertyDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to get property %2$S.%3$S from <%4$S> (document.domain has not been set).
 # LOCALIZATION NOTE (GetPropertyDeniedOriginsObjectDomain):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the property of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the property of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the object being accessed;
 #      don't translate "document.domain".
 GetPropertyDeniedOriginsObjectDomain = Permission denied for <%1$S> (document.domain has not been set) to get property %2$S.%3$S from <%4$S> (document.domain=<%5$S>).
 # LOCALIZATION NOTE (GetPropertyDeniedOriginsSubjectDomainObjectDomain):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the property of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the property of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the script which was denied access;
 #      don't translate "document.domain"
 # %6$S is the value of document.domain for the object being accessed;
@@ -79,31 +79,31 @@ GetPropertyDeniedOriginsSubjectDomainObjectDomain = Permission denied for <%1$S>
 
 # LOCALIZATION NOTE (SetPropertyDeniedOrigins):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the property of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the property of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 SetPropertyDeniedOrigins = Permission denied for <%1$S> to set property %2$S.%3$S on <%4$S>.
 # LOCALIZATION NOTE (SetPropertyDeniedOriginsSubjectDomain):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the property of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the property of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the script which was denied access;
 #      don't translate "document.domain".
 SetPropertyDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to set property %2$S.%3$S on <%4$S> (document.domain has not been set).
 # LOCALIZATION NOTE (SetPropertyDeniedOriginsObjectDomain):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the property of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the property of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the object being accessed;
 #      don't translate "document.domain".
 SetPropertyDeniedOriginsObjectDomain = Permission denied for <%1$S> (document.domain has not been set) to set property %2$S.%3$S on <%4$S> (document.domain=<%5$S>).
 # LOCALIZATION NOTE (SetPropertyDeniedOriginsSubjectDomainObjectDomain):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the property of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the property of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the script which was denied access;
 #      don't translate "document.domain"
 # %6$S is the value of document.domain for the object being accessed;
@@ -112,31 +112,31 @@ SetPropertyDeniedOriginsSubjectDomainObjectDomain = Permission denied for <%1$S>
 
 # LOCALIZATION NOTE (CallMethodDeniedOrigins):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the method of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the method of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 CallMethodDeniedOrigins = Permission denied for <%1$S> to call method %2$S.%3$S on <%4$S>.
 # LOCALIZATION NOTE (CallMethodDeniedOriginsSubjectDomain):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the method of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the method of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the script which was denied access;
 #      don't translate "document.domain".
 CallMethodDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to call method %2$S.%3$S on <%4$S> (document.domain has not been set).
 # LOCALIZATION NOTE (CallMethodDeniedOriginsObjectDomain):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the method of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the method of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the object being accessed;
 #      don't translate "document.domain".
 CallMethodDeniedOriginsObjectDomain = Permission denied for <%1$S> (document.domain has not been set) to call method %2$S.%3$S on <%4$S> (document.domain=<%5$S>).
 # LOCALIZATION NOTE (CallMethodDeniedOriginsSubjectDomainObjectDomain):
 # %1$S is the origin of the script which was denied access.
-# %2$S is the origin of the object access was denied to.
-# %3$S is the type of object it was.
-# %4$S is the method of that object that access was denied for.
+# %2$S is the type of object it was.
+# %3$S is the method of that object that access was denied for.
+# %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the script which was denied access;
 #      don't translate "document.domain"
 # %6$S is the value of document.domain for the object being accessed;

From aa484e4f27fff365d833cd1249b797bef57c32a9 Mon Sep 17 00:00:00 2001
From: Nils Maier <MaierMan@web.de>
Date: Fri, 31 Jul 2009 06:57:57 +0200
Subject: [PATCH 113/175] Bug 354894 - Session restore doesn't work if process
 hasn't exited. r=zeniko,dao sr=vlad

---
 browser/base/content/browser.js               |  50 +-
 browser/components/nsBrowserGlue.js           |  35 +-
 .../sessionstore/src/nsSessionStore.js        |  52 +-
 .../sessionstore/test/browser/Makefile.in     |   1 +
 .../test/browser/browser_354894.js            | 516 ++++++++++++++++++
 5 files changed, 643 insertions(+), 11 deletions(-)
 create mode 100644 browser/components/sessionstore/test/browser/browser_354894.js

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 12f78515ddd..bfed9769333 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -46,6 +46,7 @@
 #   Thomas K. Dyas <tdyas@zecador.org>
 #   Edward Lee <edward.lee@engineering.uiuc.edu>
 #   Paul O’Shannessy <paul@oshannessy.com>
+#   Nils Maier <maierman@web.de>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -5653,11 +5654,7 @@ function WindowIsClosing()
 {
   var cn = gBrowser.tabContainer.childNodes;
   var numtabs = cn.length;
-  var reallyClose = 
-    closeWindow(false,
-                function () {
-                  return gBrowser.warnAboutClosingTabs(true);
-                });
+  var reallyClose = closeWindow(false, warnAboutClosingWindow);
 
   if (!reallyClose)
     return false;
@@ -5672,6 +5669,49 @@ function WindowIsClosing()
   return reallyClose;
 }
 
+/**
+ * Checks if this is the last full *browser* window around. If it is, this will
+ * be communicated like quitting. Otherwise, we warn about closing multiple tabs.
+ * @returns true if closing can proceed, false if it got cancelled.
+ */
+function warnAboutClosingWindow() {
+  // Popups aren't considered full browser windows.
+  if (!toolbar.visible)
+    return gBrowser.warnAboutClosingTabs(true);
+
+  // Figure out if there's at least one other browser window around.
+  let foundOtherBrowserWindow = false;
+  let wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
+  let e = wm.getEnumerator("navigator:browser");
+  while (e.hasMoreElements() && !foundOtherBrowserWindow) {
+    let win = e.getNext();
+    if (win != window && win.toolbar.visible)
+      foundOtherBrowserWindow = true;
+  }
+  if (foundOtherBrowserWindow)
+    return gBrowser.warnAboutClosingTabs(true);
+
+  let os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+
+  let closingCanceled = Cc["@mozilla.org/supports-PRBool;1"].
+                        createInstance(Ci.nsISupportsPRBool);
+  os.notifyObservers(closingCanceled,
+                                   "browser-lastwindow-close-requested", null);
+  if (closingCanceled.data)
+    return false;
+
+  os.notifyObservers(null, "browser-lastwindow-close-granted", null);
+
+#ifdef XP_MACOSX
+  // OS X doesn't quit the application when the last window is closed, but keeps
+  // the session alive. Hence don't prompt users to save tabs, but warn about
+  // closing multiple tabs.
+  return gBrowser.warnAboutClosingTabs(true);
+#else
+  return true;
+#endif
+}
+
 var MailIntegration = {
   sendLinkForWindow: function (aWindow) {
     this.sendMessage(aWindow.location.href,
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index afb7f3585ab..6d49a79adc4 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -25,6 +25,7 @@
 #   Marco Bonardo <mak77@bonardo.net>
 #   Dietrich Ayala <dietrich@mozilla.com>
 #   Ehsan Akhgari <ehsan.akhgari@gmail.com>
+#   Nils Maier <maierman@web.de>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -102,6 +103,12 @@ function BrowserGlue() {
   this._init();
 }
 
+#ifndef XP_MACOSX
+# OS X has the concept of zero-window sessions and therefore ignores the
+# browser-lastwindow-close-* topics.
+#define OBSERVE_LASTWINDOW_CLOSE_TOPICS 1
+#endif
+
 BrowserGlue.prototype = {
   
   _saveSession: false,
@@ -151,6 +158,17 @@ BrowserGlue.prototype = {
         // and history synchronization could fail.
         this._onProfileShutdown();
         break;
+#ifdef OBSERVE_LASTWINDOW_CLOSE_TOPICS
+      case "browser-lastwindow-close-requested":
+        // The application is not actually quitting, but the last full browser
+        // window is about to be closed.
+        this._onQuitRequest(subject, "lastwindow");
+        break;
+      case "browser-lastwindow-close-granted":
+        if (this._saveSession)
+          this._setPrefToSaveSession();
+        break;
+#endif
       case "session-save":
         this._setPrefToSaveSession();
         subject.QueryInterface(Ci.nsISupportsPRBool);
@@ -189,6 +207,10 @@ BrowserGlue.prototype = {
     osvr.addObserver(this, "browser:purge-session-history", false);
     osvr.addObserver(this, "quit-application-requested", false);
     osvr.addObserver(this, "quit-application-granted", false);
+#ifdef OBSERVE_LASTWINDOW_CLOSE_TOPICS
+    osvr.addObserver(this, "browser-lastwindow-close-requested", false);
+    osvr.addObserver(this, "browser-lastwindow-close-granted", false);
+#endif
     osvr.addObserver(this, "session-save", false);
     osvr.addObserver(this, "places-init-complete", false);
     osvr.addObserver(this, "places-database-locked", false);
@@ -205,6 +227,10 @@ BrowserGlue.prototype = {
     osvr.removeObserver(this, "sessionstore-windows-restored");
     osvr.removeObserver(this, "browser:purge-session-history");
     osvr.removeObserver(this, "quit-application-requested");
+#ifdef OBSERVE_LASTWINDOW_CLOSE_TOPICS
+    osvr.removeObserver(this, "browser-lastwindow-close-requested");
+    osvr.removeObserver(this, "browser-lastwindow-close-granted");
+#endif
     osvr.removeObserver(this, "quit-application-granted");
     osvr.removeObserver(this, "session-save");
   },
@@ -338,7 +364,6 @@ BrowserGlue.prototype = {
     if (!showPrompt || inPrivateBrowsing)
       return false;
 
-    var buttonChoice = 0;
     var quitBundle = this._bundleService.createBundle("chrome://browser/locale/quitDialog.properties");
     var brandBundle = this._bundleService.createBundle("chrome://branding/locale/brand.properties");
 
@@ -377,9 +402,11 @@ BrowserGlue.prototype = {
       button2Title = quitBundle.GetStringFromName("quitTitle");
     }
 
-    buttonChoice = promptService.confirmEx(null, quitDialogTitle, message,
-                                 flags, button0Title, button1Title, button2Title,
-                                 neverAskText, neverAsk);
+    var mostRecentBrowserWindow = wm.getMostRecentWindow("navigator:browser");
+    var buttonChoice =
+      promptService.confirmEx(mostRecentBrowserWindow, quitDialogTitle, message,
+                              flags, button0Title, button1Title, button2Title,
+                              neverAskText, neverAsk);
 
     switch (buttonChoice) {
     case 2: // Quit
diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js
index 2c49606a2ef..bfec2661bfa 100644
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -23,6 +23,7 @@
  *   Ehsan Akhgari <ehsan.akhgari@gmail.com>
  *   Michael Kraft <morac99-firefox@yahoo.com>
  *   Paul O’Shannessy <paul@oshannessy.com>
+ *   Nils Maier <maierman@web.de>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -74,6 +75,7 @@ const NOTIFY_WINDOWS_RESTORED = "sessionstore-windows-restored";
 const OBSERVING = [
   "domwindowopened", "domwindowclosed",
   "quit-application-requested", "quit-application-granted",
+  "browser-lastwindow-close-granted",
   "quit-application", "browser:purge-session-history",
   "private-browsing", "browser:purge-domain-data",
   "private-browsing-change-granted"
@@ -169,6 +171,11 @@ SessionStoreService.prototype = {
   // whether we clearing history on shutdown
   _clearingOnShutdown: false,
 
+#ifndef XP_MACOSX
+  // whether the last window was closed and should be restored
+  _restoreLastWindow: false,
+#endif
+
 /* ........ Global Event Handlers .............. */
 
   /**
@@ -329,6 +336,15 @@ SessionStoreService.prototype = {
       // freeze the data at what we've got (ignoring closing windows)
       this._loadState = STATE_QUITTING;
       break;
+#ifndef XP_MACOSX
+    case "browser-lastwindow-close-granted":
+      // last browser window is quitting.
+      // remember to restore the last window when another browser window is openend
+      // do not account for pref(resume_session_once) at this point, as it might be
+      // set by another observer getting this notice after us
+      this._restoreLastWindow = true;
+      break;
+#endif
     case "quit-application":
       if (aData == "restart") {
         this._prefBranch.setBoolPref("sessionstore.resume_session_once", true);
@@ -568,7 +584,8 @@ SessionStoreService.prototype = {
         this.restoreWindow(aWindow, this._initialState, this._isCmdLineEmpty(aWindow));
         delete this._initialState;
         
-        // mark ourselves as running
+        // _loadState changed from "stopped" to "running"
+        // force a save operation so that crashes happening during startup are correctly counted
         this.saveState(true);
       }
       else {
@@ -586,7 +603,38 @@ SessionStoreService.prototype = {
       let followUp = this._statesToRestore[aWindow.__SS_restoreID].windows.length == 1;
       this.restoreWindow(aWindow, this._statesToRestore[aWindow.__SS_restoreID], true, followUp);
     }
-    
+#ifndef XP_MACOSX
+    else if (this._restoreLastWindow && aWindow.toolbar.visible &&
+             this._closedWindows.length && this._doResumeSession() &&
+             !this._inPrivateBrowsing) {
+
+      // default to the most-recently closed window
+      // don't use popup windows
+      let state = null;
+      this._closedWindows = this._closedWindows.filter(function(aWinState) {
+        if (!state && !aWinState.isPopup) {
+          state = aWinState;
+          return false;
+        }
+        return true;
+      });
+      if (state) {
+        delete state.hidden;
+        state = { windows: [state] };
+        this._restoreCount = 1;
+        this.restoreWindow(aWindow, state, this._isCmdLineEmpty(aWindow));
+      }
+      // we actually restored the session just now.
+      this._prefBranch.setBoolPref("sessionstore.resume_session_once", false);
+    }
+    if (this._restoreLastWindow && aWindow.toolbar.visible) {
+      // always reset (if not a popup window)
+      // we don't want to restore a window directly after, for example,
+      // undoCloseWindow was executed.
+      this._restoreLastWindow = false;
+    }
+#endif
+
     var tabbrowser = aWindow.getBrowser();
     var tabpanels = tabbrowser.mPanelContainer;
     
diff --git a/browser/components/sessionstore/test/browser/Makefile.in b/browser/components/sessionstore/test/browser/Makefile.in
index 6d15d7470ec..5a10ff20562 100644
--- a/browser/components/sessionstore/test/browser/Makefile.in
+++ b/browser/components/sessionstore/test/browser/Makefile.in
@@ -58,6 +58,7 @@ _BROWSER_TEST_FILES = \
 	browser_346337.js \
 	browser_346337_sample.html \
 	browser_350525.js \
+	browser_354894.js \
 	browser_367052.js \
 	browser_393716.js \
 	browser_394759.js \
diff --git a/browser/components/sessionstore/test/browser/browser_354894.js b/browser/components/sessionstore/test/browser/browser_354894.js
new file mode 100644
index 00000000000..df91ec34fb0
--- /dev/null
+++ b/browser/components/sessionstore/test/browser/browser_354894.js
@@ -0,0 +1,516 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is sessionstore test code.
+ *
+ * The Initial Developer of the Original Code is
+ * Nils Maier <maierman@web.de>
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Simon Bünzli <zeniko@gmail.com>
+ * Paul O’Shannessy <paul@oshannessy.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Checks that restoring the last browser window in session is actually
+ * working:
+ *  1.1) Open a new browser window
+ *  1.2) Add some tabs
+ *  1.3) Close that window
+ *  1.4) Opening another window
+ *  --> State is restored
+ *
+ *  2.1) Open a new browser window
+ *  2.2) Add some tabs
+ *  2.3) Enter private browsing mode
+ *  2.4) Close the window while still in private browsing mode
+ *  2.5) Opening a new window
+ *  --> State is not restored, because private browsing mode is still active
+ *  2.6) Leaving private browsing mode
+ *  2.7) Open another window
+ *  --> State (that was before entering PBM) is restored
+ *
+ *  3.1) Open a new browser window
+ *  3.2) Add some tabs
+ *  3.4) Open some popups
+ *  3.5) Add another tab to one popup (so that it gets stored) and close it again
+ *  3.5) Close the browser window
+ *  3.6) Open another browser window
+ *  --> State of the closed browser window, but not of the popup, is restored
+ *
+ *  4.1) Open a popup
+ *  4.2) Add another tab to the popup (so that it gets stored) and close it again
+ *  4.3) Open a window
+ *  --> Nothing at all should be restored
+ *
+ *  5.1) Open two browser windows and close them again
+ *  5.2) undoCloseWindow() one
+ *  5.3) Open another browser window
+ *  --> Nothing at all should be restored
+ *
+ * Checks the new notifications are correctly posted and processed, that is
+ * for each successful -requested a -granted is received, but omitted if
+ *  -requested was cnceled
+ * Said notifications are:
+ *  - browser-lastwindow-close-requested
+ *  - browser-lastwindow-close-granted
+ * Tests are:
+ *  6) Cancel closing when first observe a -requested
+ *  --> Window is kept open
+ *  7) Count the number of notifications
+ *  --> count(-requested) == count(-granted) + 1
+ *  --> (The first -requested was canceled, so off-by-one)
+ *  8) (Mac only) Mac version of Test 5 additionally preparing Test 6
+ *
+ * @see https://bugzilla.mozilla.org/show_bug.cgi?id=354894
+ * @note It is implicitly tested that restoring the last window works when
+ * non-browser windows are around. The "Run Tests" window as well as the main
+ * browser window (wherein the test code gets executed) won't be considered
+ * browser windows. To achiveve this said main browser window has it's windowtype
+ * attribute modified so that it's not considered a browser window any longer.
+ * This is crucial, because otherwise there would be two browser windows around,
+ * said main test window and the one opened by the tests, and hence the new
+ * logic wouldn't be executed at all.
+ * @note Mac only tests the new notifications, as restoring the last window is
+ * not enabled on that platform (platform shim; the application is kept running
+ * although there are no windows left)
+ * @note There is a difference when closing a browser window with
+ * BrowserTryToCloseWindow() as opposed to close(). The former will make
+ * nsSessionStore restore a window next time it gets a chance and will post
+ * notifications. The latter won't.
+ */
+function test() {
+  waitForExplicitFinish();
+
+  // Some urls that might be opened in tabs and/or popups
+  // Do not use about:blank:
+  // That one is reserved for special purposes in the tests
+  const TEST_URLS = ["about:mozilla", "about:buildconfig"];
+
+  // Number of -request notifications to except
+  // remember to adjust when adding new tests
+  const NOTIFICATIONS_EXPECTED = 6;
+
+  // Window features of popup windows
+  const POPUP_FEATURES = "toolbar=no,resizable=no,status=no";
+
+  // Window features of browser windows
+  const CHROME_FEATURES = "chrome,all,dialog=no";
+
+  // Store the old window type for cleanup
+  let oldWinType = "";
+  // Store the old tabs.warnOnClose pref so that we may reset it during
+  // cleanup
+  let oldWarnTabsOnClose = gPrefService.getBoolPref("browser.tabs.warnOnClose");
+
+  // Observe these, and also use to count the number of hits
+  let observing = {
+    "browser-lastwindow-close-requested": 0,
+    "browser-lastwindow-close-granted": 0
+  };
+
+  /**
+   * Helper: Will observe and handle the notifications for us
+   */
+  let observer = {
+    hitCount: 0,
+
+    observe: function(aCancel, aTopic, aData) {
+      // count so that we later may compare
+      observing[aTopic]++;
+
+      // handle some tests
+      if (++this.hitCount == 1) {
+        // Test 6
+        aCancel.QueryInterface(Ci.nsISupportsPRBool).data = true;
+      }
+    }
+  };
+  let observerService = Cc["@mozilla.org/observer-service;1"].
+                        getService(Ci.nsIObserverService);
+
+  /**
+   * Helper: Sets prefs as the testsuite requires
+   * @note Will be reset in cleanTestSuite just before finishing the tests
+   */
+  function setPrefs() {
+    gPrefService.setIntPref("browser.startup.page", 3);
+    gPrefService.setBoolPref(
+      "browser.privatebrowsing.keep_current_session",
+      true
+    );
+    gPrefService.setBoolPref("browser.tabs.warnOnClose", false);
+  }
+
+  /**
+   * Helper: Sets up this testsuite
+   */
+  function setupTestsuite(testFn) {
+    // Register our observers
+    for (let o in observing) {
+      observerService.addObserver(observer, o, false);
+    }
+
+    // Make the main test window not count as a browser window any longer
+    oldWinType = document.documentElement.getAttribute("windowtype");
+    document.documentElement.setAttribute("windowtype", "navigator:testrunner");
+  }
+
+  /**
+   * Helper: Cleans up behind the testsuite
+   */
+  function cleanupTestsuite(callback) {
+    // Finally remove observers again
+    for (let o in observing) {
+      observerService.removeObserver(observer, o, false);
+    }
+    // Reset the prefs we touched
+    for each (let pref in [
+      "browser.startup.page",
+      "browser.privatebrowsing.keep_current_session"
+    ]) {
+      if (gPrefService.prefHasUserValue(pref)) {
+        gPrefService.clearUserPref(pref);
+      }
+    }
+    gPrefService.setBoolPref("browser.tabs.warnOnClose", oldWarnTabsOnClose);
+
+    // Reset the window type
+    document.documentElement.setAttribute("windowtype", oldWinType);
+  }
+
+  /**
+   * Helper: sets the prefs and a new window with our test tabs
+   */
+  function setupTestAndRun(testFn) {
+    // Prepare the prefs
+    setPrefs();
+
+    // Prepare a window; open it and add more tabs
+    let newWin = openDialog(location, "_blank", CHROME_FEATURES, "about:config");
+    newWin.addEventListener("load", function(aEvent) {
+      newWin.removeEventListener("load", arguments.callee, false);
+      newWin.gBrowser.addEventListener("load", function(aEvent) {
+        newWin.gBrowser.removeEventListener("load", arguments.callee, true);
+        for each (let url in TEST_URLS) {
+          newWin.gBrowser.addTab(url);
+        }
+
+        executeSoon(function() testFn(newWin));
+      }, true);
+    }, false);
+  }
+
+  /**
+   * Test 1: Normal in-session restore
+   * @note: Non-Mac only
+   */
+  function testOpenCloseNormal(nextFn) {
+    setupTestAndRun(function(newWin) {
+      // Close the window
+      // window.close doesn't push any close events,
+      // so use BrowserTryToCloseWindow
+      newWin.BrowserTryToCloseWindow();
+
+      // The first request to close is denied by our observer (Test 6)
+      ok(!newWin.closed, "First close request was denied");
+      if (!newWin.closed) {
+        newWin.BrowserTryToCloseWindow();
+        ok(newWin.closed, "Second close request was granted");
+      }
+
+      // Open a new window
+      // The previously closed window should be restored
+      newWin = openDialog(location, "_blank", CHROME_FEATURES);
+      newWin.addEventListener("load", function() {
+        executeSoon(function() {
+          is(newWin.gBrowser.browsers.length, TEST_URLS.length + 1,
+             "Restored window in-session with otherpopup windows around");
+
+          // Cleanup
+          newWin.close();
+
+          // Next please
+          executeSoon(nextFn);
+        });
+      }, true);
+    });
+  }
+
+  /**
+   * Test 2: PrivateBrowsing in-session restore
+   * @note: Non-Mac only
+   */
+  function testOpenClosePrivateBrowsing(nextFn) {
+    setupTestAndRun(function(newWin) {
+      let pb = Cc["@mozilla.org/privatebrowsing;1"].
+               getService(Ci.nsIPrivateBrowsingService);
+
+      // Close the window
+      newWin.BrowserTryToCloseWindow();
+
+      // Enter private browsing mode
+      pb.privateBrowsingEnabled = true;
+
+      // Open a new window.
+      // The previously closed window should NOT be restored
+      newWin = openDialog(location, "_blank", CHROME_FEATURES);
+      newWin.addEventListener("load", function() {
+        executeSoon(function() {
+          is(newWin.gBrowser.browsers.length, 1,
+             "Did not restore in private browing mode");
+
+          // Cleanup
+          newWin.BrowserTryToCloseWindow();
+
+          // Exit private browsing mode again
+          pb.privateBrowsingEnabled = false;
+
+          newWin = openDialog(location, "_blank", CHROME_FEATURES);
+          newWin.addEventListener("load", function() {
+            executeSoon(function() {
+              is(newWin.gBrowser.browsers.length, TEST_URLS.length + 1,
+                 "Restored after leaving private browsing again");
+
+              newWin.close();
+
+              // Next please
+              executeSoon(nextFn);
+            });
+          }, true);
+        });
+      }, true);
+    });
+  }
+
+  /**
+   * Test 3: Open some popup windows to check those aren't restored, but
+   *         the browser window is
+   * @note: Non-Mac only
+   */
+  function testOpenCloseWindowAndPopup(nextFn) {
+    setupTestAndRun(function(newWin) {
+      // open some popups
+      let popup = openDialog(location, "popup", POPUP_FEATURES, TEST_URLS[0]);
+      let popup2 = openDialog(location, "popup2", POPUP_FEATURES, TEST_URLS[1]);
+      popup2.addEventListener("load", function() {
+        popup2.removeEventListener("load", arguments.callee, false);
+        popup2.gBrowser.addEventListener("load", function() {
+          popup2.gBrowser.removeEventListener("load", arguments.callee, true);
+          popup2.gBrowser.addTab(TEST_URLS[0]);
+          // close the window
+          newWin.BrowserTryToCloseWindow();
+
+          // Close the popup window
+          // The test is successful when not this popup window is restored
+          // but instead newWin
+          popup2.close();
+
+          // open a new window the previously closed window should be restored to
+          newWin = openDialog(location, "_blank", CHROME_FEATURES);
+          newWin.addEventListener("load", function() {
+            executeSoon(function() {
+              is(newWin.gBrowser.browsers.length, TEST_URLS.length + 1,
+                 "Restored window and associated tabs in session");
+
+              // Cleanup
+              newWin.close();
+              popup.close();
+
+              // Next please
+              executeSoon(nextFn);
+            });
+          }, true);
+        }, true);
+      }, false);
+    });
+  }
+
+  /**
+   * Test 4: Open some popup window to check it isn't restored.
+   *         Instead nothing at all should be restored
+   * @note: Non-Mac only
+   */
+  function testOpenCloseOnlyPopup(nextFn) {
+    // prepare the prefs
+    setPrefs();
+
+    // This will cause nsSessionStore to restore a window the next time it
+    // gets a chance.
+    let popup = openDialog(location, "popup", POPUP_FEATURES, TEST_URLS[1]);
+    popup.addEventListener("load", function() {
+      is(popup.gBrowser.browsers.length, 1,
+         "Did not restore the popup window (1)");
+      popup.BrowserTryToCloseWindow();
+
+      // Real tests
+      popup = openDialog(location, "popup", POPUP_FEATURES, TEST_URLS[1]);
+      popup.addEventListener("load", function() {
+        popup.removeEventListener("load", arguments.callee, false);
+        popup.gBrowser.addEventListener("load", function() {
+          popup.gBrowser.removeEventListener("load", arguments.callee, true);
+          popup.gBrowser.addTab(TEST_URLS[0]);
+
+          is(popup.gBrowser.browsers.length, 2,
+             "Did not restore to the popup window (2)");
+
+          // Close the popup window
+          // The test is successful when not this popup window is restored
+          // but instead a new window is opened without restoring anything
+          popup.close();
+
+          let newWin = openDialog(location, "_blank", CHROME_FEATURES, "about:blank");
+          newWin.addEventListener("load", function() {
+            newWin.removeEventListener("load", arguments.callee, true);
+            executeSoon(function() {
+              isnot(newWin.gBrowser.browsers.length, 2,
+                    "Did not restore the popup window");
+              is(TEST_URLS.indexOf(newWin.gBrowser.browsers[0].currentURI.spec), -1,
+                 "Did not restore the popup window (2)");
+
+              // Cleanup
+              newWin.close();
+
+              // Next please
+              executeSoon(nextFn);
+            });
+          }, true);
+        }, true);
+      }, false);
+    }, true);
+  }
+
+    /**
+   * Test 5: Open some windows and do undoCloseWindow. This should prevent any
+   *         restoring later in the test
+   * @note: Non-Mac only
+   */
+  function testOpenCloseRestoreFromPopup(nextFn) {
+    setupTestAndRun(function(newWin) {
+      setupTestAndRun(function(newWin2) {
+        newWin.BrowserTryToCloseWindow();
+        newWin2.BrowserTryToCloseWindow();
+
+        newWin = undoCloseWindow(0);
+
+        newWin2 = openDialog(location, "_blank", CHROME_FEATURES);
+        newWin2.addEventListener("load", function() {
+          newWin2.removeEventListener("load", arguments.callee, true);
+          executeSoon(function() {
+            is(newWin2.gBrowser.browsers.length, 1,
+               "Did not restore, as undoCloseWindow() was last called");
+            is(TEST_URLS.indexOf(newWin2.gBrowser.browsers[0].currentURI.spec), -1,
+               "Did not restore, as undoCloseWindow() was last called (2)");
+
+            // Cleanup
+            newWin.close();
+            newWin2.close();
+
+            // Next please
+            executeSoon(nextFn);
+          });
+        }, true);
+      });
+    });
+  }
+
+  /**
+   * Test 7: Check whether the right number of notifications was received during
+   *         the tests
+   */
+  function testNotificationCount(nextFn) {
+    is(observing["browser-lastwindow-close-requested"], NOTIFICATIONS_EXPECTED,
+       "browser-lastwindow-close-requested notifications observed");
+
+    // -request must be one more as we cancel the first one we hit,
+    // and hence won't produce a corresponding -grant
+    // @see observer.observe
+    is(observing["browser-lastwindow-close-requested"],
+       observing["browser-lastwindow-close-granted"] + 1,
+       "Notification count for -request and -grant matches");
+
+    executeSoon(nextFn);
+  }
+
+  /**
+   * Test 8: Test if closing can be denied on Mac
+   *         Futhermore prepares the testNotificationCount test (Test 6)
+   * @note: Mac only
+   */
+  function testMacNotifications(nextFn, iteration) {
+    iteration = iteration || 1;
+    setupTestAndRun(function(newWin) {
+      // close the window
+      // window.close doesn't push any close events,
+      // so use BrowserTryToCloseWindow
+      newWin.BrowserTryToCloseWindow();
+      if (iteration == 1) {
+        ok(!newWin.closed, "First close attempt denied");
+        if (!newWin.closed) {
+          newWin.BrowserTryToCloseWindow();
+          ok(newWin.closed, "Second close attempt granted");
+        }
+      }
+
+      if (iteration < NOTIFICATIONS_EXPECTED - 1) {
+        executeSoon(function() testMacNotifications(nextFn, ++iteration));
+      }
+      else {
+        executeSoon(nextFn);
+      }
+    });
+  }
+
+  // Execution starts here
+
+  setupTestsuite();
+  if (navigator.platform.match(/Mac/)) {
+    // Mac tests
+    testMacNotifications(
+      function() testNotificationCount(
+        function() cleanupTestsuite() + finish()
+      )
+    );
+  }
+  else {
+    // Non-Mac Tests
+    testOpenCloseNormal(
+      function() testOpenClosePrivateBrowsing(
+        function() testOpenCloseWindowAndPopup(
+          function() testOpenCloseOnlyPopup(
+            function() testOpenCloseRestoreFromPopup (
+              function() testNotificationCount(
+                function() cleanupTestsuite() + finish()
+              )
+            )
+          )
+        )
+      )
+    );
+  }
+}

From 9a6880e6610726595544e23bf1840895bda202ad Mon Sep 17 00:00:00 2001
From: Nochum Sossonko <highmind63@gmail.com>
Date: Fri, 31 Jul 2009 07:09:21 +0200
Subject: [PATCH 114/175] Bug 506099 - lazy load DownloadUtils.jsm in
 browser.js via memoized getter. r=gavin

---
 browser/base/content/browser.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index bfed9769333..2575b63af85 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6693,6 +6693,12 @@ let DownloadMonitorPanel = {
   _lastTime: Infinity,
   _listening: false,
 
+  get DownloadUtils() {
+    delete this.DownloadUtils;
+    Cu.import("resource://gre/modules/DownloadUtils.jsm", this);
+    return this.DownloadUtils;
+  },
+
   //////////////////////////////////////////////////////////////////////////////
   //// DownloadMonitorPanel Public Methods
 
@@ -6700,9 +6706,6 @@ let DownloadMonitorPanel = {
    * Initialize the status panel and member variables
    */
   init: function DMP_init() {
-    // Load the modules to help display strings
-    Cu.import("resource://gre/modules/DownloadUtils.jsm");
-
     // Initialize "private" member variables
     this._panel = document.getElementById("download-monitor");
 
@@ -6754,7 +6757,8 @@ let DownloadMonitorPanel = {
 
     // Get the remaining time string and last sec for time estimation
     let timeLeft;
-    [timeLeft, this._lastTime] = DownloadUtils.getTimeLeft(maxTime, this._lastTime);
+    [timeLeft, this._lastTime] =
+      this.DownloadUtils.getTimeLeft(maxTime, this._lastTime);
 
     // Figure out how many downloads are currently downloading
     let numDls = numActive - numPaused;

From 85525a524be6e3b321242a7ddb6dcb32ea780bd3 Mon Sep 17 00:00:00 2001
From: Tyler Downer <tyler.downer@gmail.com>
Date: Fri, 31 Jul 2009 07:09:39 +0200
Subject: [PATCH 115/175] Bug 405376 - "Current Window" option in Open Web
 Location window should be named "Current Tab". r=rstrong, ui-r=jboriss

---
 browser/base/content/openLocation.xul                 | 2 +-
 browser/locales/en-US/chrome/browser/openLocation.dtd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/openLocation.xul b/browser/base/content/openLocation.xul
index e8893732bf4..70a5a315c9c 100644
--- a/browser/base/content/openLocation.xul
+++ b/browser/base/content/openLocation.xul
@@ -79,7 +79,7 @@
         <label value="&openWhere.label;"/>
         <menulist id="openWhereList">
           <menupopup>
-            <menuitem value="0" id="currentWindow" label="&topWindow.label;"/>
+            <menuitem value="0" id="currentWindow" label="&topTab.label;"/>
             <menuitem value="1" label="&newWindow.label;"/>
             <menuitem value="3" label="&newTab.label;"/>
           </menupopup>
diff --git a/browser/locales/en-US/chrome/browser/openLocation.dtd b/browser/locales/en-US/chrome/browser/openLocation.dtd
index 342d4e88d30..6738a403d8e 100644
--- a/browser/locales/en-US/chrome/browser/openLocation.dtd
+++ b/browser/locales/en-US/chrome/browser/openLocation.dtd
@@ -4,7 +4,7 @@
 <!ENTITY chooseFile.label "Choose File…">
 <!ENTITY newWindow.label "New Window">
 <!ENTITY newTab.label "New Tab">
-<!ENTITY topWindow.label "Current Window">
+<!ENTITY topTab.label "Current Tab">
 <!ENTITY caption.label "Open Web Location">
 <!ENTITY openWhere.label "Open in:">
 <!ENTITY openBtn.label "Open">

From f977879e0073d1b74411536f58fabaa44dbd4eee Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Fri, 31 Jul 2009 07:23:51 +0200
Subject: [PATCH 116/175] Bug 501608 - menu popup sounds are played when
 showing the autoscrolling popup. r=enn

---
 toolkit/content/tests/browser/Makefile.in     |   6 +
 .../browser_keyevents_during_autoscrolling.js | 118 ++++++++++++++++++
 toolkit/content/widgets/browser.xml           |  24 +++-
 3 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js

diff --git a/toolkit/content/tests/browser/Makefile.in b/toolkit/content/tests/browser/Makefile.in
index 20da998b2a8..f01914c6d6e 100644
--- a/toolkit/content/tests/browser/Makefile.in
+++ b/toolkit/content/tests/browser/Makefile.in
@@ -50,5 +50,11 @@ _BROWSER_FILES = \
   browser_bug471962.js \
   $(NULL)
 
+# browser_keyevents_during_autoscrolling.js cannot start the autoscrolling by
+# synthesizeMouse with middle button on linux, therefore, disable it temporarily
+ifneq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+_BROWSER_FILES += browser_keyevents_during_autoscrolling.js
+endif
+
 libs:: $(_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
diff --git a/toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js b/toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js
new file mode 100644
index 00000000000..c94ef68e07d
--- /dev/null
+++ b/toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js
@@ -0,0 +1,118 @@
+function test()
+{
+  const kPrefName_AutoScroll = "general.autoScroll";
+  const kPrefName_ContentLoadURL = "middlemouse.contentLoadURL";
+  var prefSvc = Components.classes["@mozilla.org/preferences-service;1"]
+                          .getService(Components.interfaces.nsIPrefBranch2);
+  var kAutoScrollingEnabled = prefSvc.getBoolPref(kPrefName_AutoScroll);
+  prefSvc.setBoolPref(kPrefName_AutoScroll, true);
+
+  const kNoKeyEvents   = 0;
+  const kKeyDownEvent  = 1;
+  const kKeyPressEvent = 2;
+  const kKeyUpEvent    = 4;
+  const kAllKeyEvents  = 7;
+
+  var expectedKeyEvents;
+  var dispatchedKeyEvents;
+  var key;
+  var root;
+
+  function sendKey(aKey)
+  {
+    key = aKey;
+    dispatchedKeyEvents = kNoKeyEvents;
+    EventUtils.synthesizeKey(key, {}, gBrowser.contentWindow);
+    is(dispatchedKeyEvents, expectedKeyEvents,
+       "unexpected key events were dispatched or not dispatched: " + key);
+  }
+
+  function onKey(aEvent)
+  {
+    if (aEvent.target != root) {
+      ok(false, "unknown target: " + aEvent.target.tagName);
+      return;
+    }
+
+    var keyFlag;
+    switch (aEvent.type) {
+      case "keydown":
+        keyFlag = kKeyDownEvent;
+        break;
+      case "keypress":
+        keyFlag = kKeyPressEvent;
+        break;
+      case "keyup":
+        keyFlag = kKeyUpEvent;
+        break;
+      default:
+        ok(false, "Unknown events: " + aEvent.type);
+        return;
+    }
+    dispatchedKeyEvents |= keyFlag;
+    is(keyFlag, expectedKeyEvents & keyFlag, aEvent.type + " fired: " + key);
+  }
+
+  function startTest() {
+    waitForExplicitFinish();
+    gBrowser.addEventListener("load", onLoad, false);
+    var dataUri = 'data:text/html,<body style="height:10000px;"></body>';
+    gBrowser.loadURI(dataUri);
+  }
+
+  function onLoad() {
+    gBrowser.removeEventListener("load", onLoad, false);
+
+    gBrowser.contentWindow.focus();
+
+    var doc = gBrowser.contentDocument;
+
+    root = doc.documentElement;
+    root.addEventListener("keydown", onKey, true);
+    root.addEventListener("keypress", onKey, true);
+    root.addEventListener("keyup", onKey, true);
+
+    // Test whether the key events are handled correctly under normal condition
+    expectedKeyEvents = kAllKeyEvents;
+    sendKey("A");
+
+    // Start autoscrolling by middle button lick on the page
+    EventUtils.synthesizeMouse(root, 10, 10, { button: 1 },
+                               gBrowser.contentWindow);
+
+    // Most key events should be eaten by the browser.
+    expectedKeyEvents = kNoKeyEvents;
+    sendKey("A");
+    sendKey("VK_DOWN");
+    sendKey("VK_RETURN");
+    sendKey("VK_ENTER");
+    sendKey("VK_HOME");
+    sendKey("VK_END");
+    sendKey("VK_TAB");
+    sendKey("VK_ENTER");
+
+    // Finish autoscrolling by ESC key.  Note that only keydown and keypress
+    // events are eaten because keyup event is fired *after* the autoscrolling
+    // is finished.
+    expectedKeyEvents = kKeyUpEvent;
+    sendKey("VK_ESCAPE");
+
+    // Test whether the key events are handled correctly under normal condition
+    expectedKeyEvents = kAllKeyEvents;
+    sendKey("A");
+
+    root.removeEventListener("keydown", onKey, true);
+    root.removeEventListener("keypress", onKey, true);
+    root.removeEventListener("keyup", onKey, true);
+
+    // restore the changed prefs
+    prefSvc.setBoolPref(kPrefName_AutoScroll, kAutoScrollingEnabled);
+
+    // cleaning-up
+    gBrowser.loadURI("about:blank");
+
+    finish();
+  }
+
+  startTest();
+}
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index 12a73b2b84c..fdd6cd78ef7 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -757,6 +757,9 @@
               window.removeEventListener("mousedown", this, true);
               window.removeEventListener("mouseup", this, true);
               window.removeEventListener("contextmenu", this, true);
+              window.removeEventListener("keydown", this, true);
+              window.removeEventListener("keypress", this, true);
+              window.removeEventListener("keyup", this, true);
               clearInterval(this._autoScrollTimer);
             }
          ]]>
@@ -767,7 +770,7 @@
         <body>
           <![CDATA[
             const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-            var popup = document.createElementNS(XUL_NS, "popup");
+            var popup = document.createElementNS(XUL_NS, "panel");
             popup.className = "autoscroller";
             return popup;
           ]]>
@@ -828,6 +831,9 @@
             window.addEventListener("mousedown", this, true);
             window.addEventListener("mouseup", this, true);
             window.addEventListener("contextmenu", this, true);
+            window.addEventListener("keydown", this, true);
+            window.addEventListener("keypress", this, true);
+            window.addEventListener("keyup", this, true);
 
             this._scrollErrorX = 0;
             this._scrollErrorY = 0;
@@ -951,6 +957,22 @@
                 this.stopScroll();
                 break;
               }
+              case "keypress": {
+                if (aEvent.keyCode == aEvent.DOM_VK_ESCAPE) {
+                  // the escape key will be processed by
+                  // nsXULPopupManager::KeyPress and the panel will be closed.
+                  // So, nothing to do here.
+                  break;
+                }
+                // don't break here. we need to eat keypress events.
+              }
+              case "keydown":
+              case "keyup": {
+                // All keyevents should be eaten here during autoscrolling.
+                aEvent.stopPropagation();
+                aEvent.preventDefault();
+                break;
+              }
             }
           }
         ]]>

From a3ad575eaafe041e38b37c1c67611eaf7fb9f6e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 31 Jul 2009 11:20:42 +0200
Subject: [PATCH 117/175] Fix sessionstore tests that fail to remove their
 event listeners. No bug.

---
 .../components/sessionstore/test/browser/browser_483330.js    | 4 ++--
 .../components/sessionstore/test/browser/browser_491168.js    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/components/sessionstore/test/browser/browser_483330.js b/browser/components/sessionstore/test/browser/browser_483330.js
index c060e7ab5fb..993c94c8c1e 100644
--- a/browser/components/sessionstore/test/browser/browser_483330.js
+++ b/browser/components/sessionstore/test/browser/browser_483330.js
@@ -10,7 +10,7 @@ function test() {
 
   let browser = tab.linkedBrowser;
   browser.addEventListener("load", function loadListener(e) {
-    browser.removeEventListener("load", arguments.callee, false);
+    browser.removeEventListener("load", arguments.callee, true);
 
     // Scroll the content document
     browser.contentWindow.scrollTo(1100, 1200);
@@ -21,7 +21,7 @@ function test() {
 
     let newTab = ss.undoCloseTab(window, 0);
     newTab.addEventListener("SSTabRestored", function tabRestored(e) {
-      newTab.removeEventListener("SSTabRestored", arguments.callee, false);
+      newTab.removeEventListener("SSTabRestored", arguments.callee, true);
 
       let newBrowser = newTab.linkedBrowser;
 
diff --git a/browser/components/sessionstore/test/browser/browser_491168.js b/browser/components/sessionstore/test/browser/browser_491168.js
index 09b7820290c..b6bbd6a3adc 100644
--- a/browser/components/sessionstore/test/browser/browser_491168.js
+++ b/browser/components/sessionstore/test/browser/browser_491168.js
@@ -61,13 +61,13 @@ function test() {
     ss.setTabState(tab, JSON.stringify(tabState));
 
     tab.addEventListener("SSTabRestored", function() {
-      tab.removeEventListener("SSTabRestored", arguments.callee, false);
+      tab.removeEventListener("SSTabRestored", arguments.callee, true);
       is(window.content.document.referrer, REFERRER2, "document.referrer matches referrer set via setTabState.");
 
       gBrowser.removeTab(tab);
       let newTab = ss.undoCloseTab(window, 0);
       newTab.addEventListener("SSTabRestored", function() {
-        newTab.removeEventListener("SSTabRestored", arguments.callee, false);
+        newTab.removeEventListener("SSTabRestored", arguments.callee, true);
 
         is(window.content.document.referrer, REFERRER2, "document.referrer is still correct after closing and reopening the tab.");
         gBrowser.removeTab(newTab);

From e8972fd5ade36fddd0600d7b31da9d7816344be3 Mon Sep 17 00:00:00 2001
From: Michael Ventnor <ventnor.bugzilla@gmail.com>
Date: Fri, 31 Jul 2009 13:32:32 +0200
Subject: [PATCH 118/175] Bug 479220 - Implement the CSS gradients proposal.
 r=roc,dbaron sr=roc

---
 layout/base/nsCSSRendering.cpp                | 146 +++++++++---
 layout/base/nsCSSRendering.h                  |  11 +
 layout/base/nsDisplayList.cpp                 |   6 +-
 layout/base/nsPresContext.cpp                 |   6 +-
 layout/generic/nsFrame.cpp                    |   9 +-
 .../css-gradients/linear-keywords-ref.html    |  23 ++
 .../css-gradients/linear-keywords.html        |   1 +
 .../css-gradients/linear-mix-ref.html         |  34 +++
 layout/reftests/css-gradients/linear-mix.html |   3 +
 .../css-gradients/linear-percent-ref.html     |  23 ++
 .../css-gradients/linear-percent.html         |   1 +
 layout/reftests/css-gradients/linear-ref.html |  24 ++
 layout/reftests/css-gradients/linear.html     |   1 +
 .../reftests/css-gradients/nostops-ref.html   |  21 ++
 layout/reftests/css-gradients/nostops.html    |   1 +
 .../reftests/css-gradients/onestop-ref.html   |  22 ++
 layout/reftests/css-gradients/onestop.html    |   1 +
 layout/reftests/css-gradients/radial-ref.html |  24 ++
 layout/reftests/css-gradients/radial.html     |   1 +
 layout/reftests/css-gradients/reftest.list    |   8 +
 .../reftests/css-gradients/twostops-ref.html  |  23 ++
 layout/reftests/css-gradients/twostops.html   |   1 +
 layout/reftests/reftest.list                  |   3 +
 layout/style/nsCSSDeclaration.cpp             |  44 ++++
 layout/style/nsCSSParser.cpp                  | 215 ++++++++++++++++--
 layout/style/nsCSSValue.cpp                   |  64 +++++-
 layout/style/nsCSSValue.h                     | 137 ++++++++++-
 layout/style/nsComputedDOMStyle.cpp           | 117 +++++++++-
 layout/style/nsComputedDOMStyle.h             |   3 +
 layout/style/nsRuleNode.cpp                   |  98 +++++++-
 layout/style/nsStyleStruct.cpp                | 147 +++++++++++-
 layout/style/nsStyleStruct.h                  | 110 ++++++++-
 layout/style/test/property_database.js        |  28 ++-
 layout/tables/nsTablePainter.cpp              |   2 +-
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |   4 +-
 35 files changed, 1278 insertions(+), 84 deletions(-)
 create mode 100644 layout/reftests/css-gradients/linear-keywords-ref.html
 create mode 100644 layout/reftests/css-gradients/linear-keywords.html
 create mode 100644 layout/reftests/css-gradients/linear-mix-ref.html
 create mode 100644 layout/reftests/css-gradients/linear-mix.html
 create mode 100644 layout/reftests/css-gradients/linear-percent-ref.html
 create mode 100644 layout/reftests/css-gradients/linear-percent.html
 create mode 100644 layout/reftests/css-gradients/linear-ref.html
 create mode 100644 layout/reftests/css-gradients/linear.html
 create mode 100644 layout/reftests/css-gradients/nostops-ref.html
 create mode 100644 layout/reftests/css-gradients/nostops.html
 create mode 100644 layout/reftests/css-gradients/onestop-ref.html
 create mode 100644 layout/reftests/css-gradients/onestop.html
 create mode 100644 layout/reftests/css-gradients/radial-ref.html
 create mode 100644 layout/reftests/css-gradients/radial.html
 create mode 100644 layout/reftests/css-gradients/reftest.list
 create mode 100644 layout/reftests/css-gradients/twostops-ref.html
 create mode 100644 layout/reftests/css-gradients/twostops.html

diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index ded69d92211..034e57bc7b6 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1513,9 +1513,12 @@ DetermineBackgroundColorInternal(nsPresContext* aPresContext,
     aDrawBackgroundColor = aPresContext->GetBackgroundColorDraw();
   }
 
-  aBottomImage = aBackground.BottomLayer().mImage;
-
-  if (!aDrawBackgroundImage || !HaveCompleteBackgroundImage(aBottomImage)) {
+  if (aBackground.BottomLayer().mImage.GetType() == eBackgroundImage_Image) {
+    aBottomImage = aBackground.BottomLayer().mImage.GetImageData();
+    if (!aDrawBackgroundImage || !HaveCompleteBackgroundImage(aBottomImage)) {
+      aBottomImage = nsnull;
+    }
+  } else {
     aBottomImage = nsnull;
   }
 
@@ -1555,6 +1558,84 @@ nsCSSRendering::DetermineBackgroundColor(nsPresContext* aPresContext,
                                           bottomImage);
 }
 
+static gfxFloat
+ConvertGradientValueToPixels(const nsStyleCoord& aCoord,
+                             nscoord aFillLength,
+                             nscoord aAppUnitsPerPixel)
+{
+  switch (aCoord.GetUnit()) {
+    case eStyleUnit_Percent:
+      return aCoord.GetPercentValue() * aFillLength / aAppUnitsPerPixel;
+    case eStyleUnit_Coord:
+      return aCoord.GetCoordValue() / aAppUnitsPerPixel;
+    default:
+      NS_WARNING("Unexpected coord unit");
+      return 0;
+  }
+}
+
+void
+nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
+                              nsIRenderingContext& aRenderingContext,
+                              nsStyleGradient* aGradient,
+                              const nsRect& aDirtyRect,
+                              const nsRect& aOneCellArea,
+                              const nsRect& aFillArea,
+                              PRBool aRepeat)
+{
+  gfxContext *ctx = aRenderingContext.ThebesContext();
+  nscoord appUnitsPerPixel = aPresContext->AppUnitsPerDevPixel();
+
+  gfxRect dirtyRect = RectToGfxRect(aDirtyRect, appUnitsPerPixel);
+  gfxRect areaToFill = RectToGfxRect(aFillArea, appUnitsPerPixel);
+  gfxRect oneCellArea = RectToGfxRect(aOneCellArea, appUnitsPerPixel);
+  gfxPoint fillOrigin = oneCellArea.TopLeft();
+
+  areaToFill = areaToFill.Intersect(dirtyRect);
+  if (areaToFill.IsEmpty())
+    return;
+
+  gfxFloat gradX0 = ConvertGradientValueToPixels(aGradient->mStartX,
+                        aOneCellArea.width, appUnitsPerPixel);
+  gfxFloat gradY0 = ConvertGradientValueToPixels(aGradient->mStartY,
+                        aOneCellArea.height, appUnitsPerPixel);
+  gfxFloat gradX1 = ConvertGradientValueToPixels(aGradient->mEndX,
+                        aOneCellArea.width, appUnitsPerPixel);
+  gfxFloat gradY1 = ConvertGradientValueToPixels(aGradient->mEndY,
+                        aOneCellArea.height, appUnitsPerPixel);
+
+  nsRefPtr<gfxPattern> gradientPattern;
+  if (aGradient->mIsRadial) {
+    gfxFloat gradRadius0 = double(aGradient->mStartRadius) / appUnitsPerPixel;
+    gfxFloat gradRadius1 = double(aGradient->mEndRadius) / appUnitsPerPixel;
+    gradientPattern = new gfxPattern(gradX0, gradY0, gradRadius0,
+                                     gradX1, gradY1, gradRadius1);
+  } else {
+    gradientPattern = new gfxPattern(gradX0, gradY0, gradX1, gradY1);
+  }
+
+  if (!gradientPattern || gradientPattern->CairoStatus())
+    return;
+
+  for (PRUint32 i = 0; i < aGradient->mStops.Length(); i++) {
+    gradientPattern->AddColorStop(aGradient->mStops[i].mPosition,
+                                  gfxRGBA(aGradient->mStops[i].mColor));
+  }
+
+  if (aRepeat)
+    gradientPattern->SetExtend(gfxPattern::EXTEND_REPEAT);
+
+  ctx->Save();
+  ctx->NewPath();
+  // The fill origin is part of the translate call so the pattern starts at
+  // the desired point, rather than (0,0).
+  ctx->Translate(fillOrigin);
+  ctx->SetPattern(gradientPattern);
+  ctx->Rectangle(areaToFill - fillOrigin, PR_TRUE);
+  ctx->Fill();
+  ctx->Restore();
+}
+
 void
 nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
                                       nsIRenderingContext& aRenderingContext,
@@ -1811,26 +1892,6 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
    *   background-repeat
    */
 
-  // Lookup the image
-  imgIRequest *req = aLayer.mImage;
-  if (!HaveCompleteBackgroundImage(req))
-    return;
-
-  nsCOMPtr<imgIContainer> image;
-  req->GetImage(getter_AddRefs(image));
-  req = nsnull;
-
-  nsIntSize imageIntSize;
-  image->GetWidth(&imageIntSize.width);
-  image->GetHeight(&imageIntSize.height);
-
-  nsSize imageSize;
-  imageSize.width = nsPresContext::CSSPixelsToAppUnits(imageIntSize.width);
-  imageSize.height = nsPresContext::CSSPixelsToAppUnits(imageIntSize.height);
-
-  if (imageSize.width == 0 || imageSize.height == 0)
-    return;
-
   // relative to aBorderArea
   nsRect bgPositioningArea(0, 0, 0, 0);
 
@@ -1885,6 +1946,32 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
     }
   }
 
+  nsSize imageSize;
+  nsCOMPtr<imgIContainer> image;
+  if (aLayer.mImage.GetType() == eBackgroundImage_Image) {
+    // Lookup the image
+    imgIRequest *req = aLayer.mImage.GetImageData();
+    if (!HaveCompleteBackgroundImage(req))
+      return;
+
+    req->GetImage(getter_AddRefs(image));
+    req = nsnull;
+
+    nsIntSize imageIntSize;
+    image->GetWidth(&imageIntSize.width);
+    image->GetHeight(&imageIntSize.height);
+
+    imageSize.width = nsPresContext::CSSPixelsToAppUnits(imageIntSize.width);
+    imageSize.height = nsPresContext::CSSPixelsToAppUnits(imageIntSize.height);
+  } else if (aLayer.mImage.GetType() == eBackgroundImage_Gradient) {
+    imageSize = bgPositioningArea.Size();
+  } else {
+    return;
+  }
+
+  if (imageSize.width == 0 || imageSize.height == 0)
+    return;
+
   // Compute the anchor point.
   //
   // relative to aBorderArea.TopLeft() (which is where the top-left
@@ -1994,9 +2081,16 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
   }
   fillArea.IntersectRect(fillArea, aBGClipRect);
 
-  nsLayoutUtils::DrawImage(&aRenderingContext, image,
-      nsLayoutUtils::GetGraphicsFilterForFrame(aForFrame),
-      destArea, fillArea, anchor + aBorderArea.TopLeft(), aDirtyRect);
+  if (aLayer.mImage.GetType() == eBackgroundImage_Image) {
+    nsLayoutUtils::DrawImage(&aRenderingContext, image,
+        nsLayoutUtils::GetGraphicsFilterForFrame(aForFrame),
+        destArea, fillArea, anchor + aBorderArea.TopLeft(), aDirtyRect);
+  } else {
+    nsCSSRendering::PaintGradient(aPresContext, aRenderingContext,
+                  aLayer.mImage.GetGradientData(),
+                  aDirtyRect, destArea, fillArea,
+                  (repeat != NS_STYLE_BG_REPEAT_OFF));
+  }
 }
 
 static void
diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index a672f26e26e..ac3e9e1c885 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -127,6 +127,17 @@ struct nsCSSRendering {
                          const nsRect& aFocusRect,
                          nscolor aColor);
 
+  /**
+   * Render a gradient for an element.
+   */
+  static void PaintGradient(nsPresContext* aPresContext,
+                            nsIRenderingContext& aRenderingContext,
+                            nsStyleGradient* aGradient,
+                            const nsRect& aDirtyRect,
+                            const nsRect& aOneCellArea,
+                            const nsRect& aFillArea,
+                            PRBool aRepeat);
+
   /**
    * Gets the root frame for the frame
    */
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index a6c82474f82..24081535f5c 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -562,9 +562,9 @@ nsDisplayBackground::IsOpaque(nsDisplayListBuilder* aBuilder) {
     return PR_TRUE;
 
   if (bottomLayer.mRepeat == NS_STYLE_BG_REPEAT_XY) {
-    if (bottomLayer.mImage) {
+    if (bottomLayer.mImage.GetType() == eBackgroundImage_Image) {
       nsCOMPtr<imgIContainer> container;
-      bottomLayer.mImage->GetImage(getter_AddRefs(container));
+      bottomLayer.mImage.GetImageData()->GetImage(getter_AddRefs(container));
       if (container) {
         PRBool animated;
         container->GetAnimated(&animated);
@@ -591,7 +591,7 @@ nsDisplayBackground::IsUniform(nsDisplayListBuilder* aBuilder) {
     nsCSSRendering::FindBackground(mFrame->PresContext(), mFrame, &bg);
   if (!hasBG)
     return PR_TRUE;
-  if (!bg->BottomLayer().mImage &&
+  if (bg->BottomLayer().mImage.GetType() == eBackgroundImage_Null &&
       bg->mImageCount == 1 &&
       !nsLayoutUtils::HasNonZeroCorner(mFrame->GetStyleBorder()->mBorderRadius) &&
       bg->BottomLayer().mClip == NS_STYLE_BG_CLIP_BORDER)
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index a1ba13754e7..04762d35f0e 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1268,8 +1268,10 @@ nsPresContext::SetupBackgroundImageLoaders(nsIFrame* aFrame,
 {
   nsRefPtr<nsImageLoader> loaders;
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, aStyleBackground) {
-    imgIRequest *image = aStyleBackground->mLayers[i].mImage;
-    loaders = nsImageLoader::Create(aFrame, image, PR_FALSE, loaders);
+    if (aStyleBackground->mLayers[i].mImage.GetType() == eBackgroundImage_Image) {
+      imgIRequest *image = aStyleBackground->mLayers[i].mImage.GetImageData();
+      loaders = nsImageLoader::Create(aFrame, image, PR_FALSE, loaders);
+    }
   }
   SetImageLoaders(aFrame, BACKGROUND_IMAGE, loaders);
 }
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 7a6f377008f..285d934cea5 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -532,11 +532,8 @@ nsFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
     const nsStyleBackground *oldBG = aOldStyleContext->GetStyleBackground();
     const nsStyleBackground *newBG = GetStyleBackground();
     NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, oldBG) {
-      imgIRequest *oldImage = oldBG->mLayers[i].mImage;
-      imgIRequest *newImage = i < newBG->mImageCount
-                                ? newBG->mLayers[i].mImage.get()
-                                : nsnull;
-      if (oldImage && !EqualImages(oldImage, newImage)) {
+      if (i >= newBG->mImageCount ||
+          oldBG->mLayers[i].mImage != newBG->mLayers[i].mImage) {
         // stop the image loading for the frame, the image has changed
         PresContext()->SetImageLoaders(this,
           nsPresContext::BACKGROUND_IMAGE, nsnull);
@@ -4092,7 +4089,7 @@ nsIFrame::CheckInvalidateSizeChange(const nsRect& aOldRect,
   const nsStyleBackground *bg = GetStyleBackground();
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, bg) {
     const nsStyleBackground::Layer &layer = bg->mLayers[i];
-    if (layer.mImage &&
+    if (layer.mImage.GetType() != eBackgroundImage_Null &&
         (layer.mPosition.mXIsPercent || layer.mPosition.mYIsPercent)) {
       Invalidate(nsRect(0, 0, aOldRect.width, aOldRect.height));
       return;
diff --git a/layout/reftests/css-gradients/linear-keywords-ref.html b/layout/reftests/css-gradients/linear-keywords-ref.html
new file mode 100644
index 00000000000..867e42675f4
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-keywords-ref.html
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(0,0,150,300);
+  grad.addColorStop(0, '#0000ff');
+  grad.addColorStop(1, '#000000');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/linear-keywords.html b/layout/reftests/css-gradients/linear-keywords.html
new file mode 100644
index 00000000000..2f1223fdcbd
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-keywords.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(left top, center bottom, from(#0000ff), to(#000000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/linear-mix-ref.html b/layout/reftests/css-gradients/linear-mix-ref.html
new file mode 100644
index 00000000000..cab59addfa0
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-mix-ref.html
@@ -0,0 +1,34 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(150,20,270,130);
+  grad.addColorStop(0, '#0000ff');
+  grad.addColorStop(1, '#000000');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  ctx = document.getElementById('canvas2').getContext('2d');
+
+  grad = ctx.createLinearGradient(30,300,300,50);
+  grad.addColorStop(0, '#00ff00');
+  grad.addColorStop(1, '#000000');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"></canvas>
+<br/><br/>
+<canvas id="canvas2" width="300" height="300"></canvas>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/linear-mix.html b/layout/reftests/css-gradients/linear-mix.html
new file mode 100644
index 00000000000..1bce8ba993f
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-mix.html
@@ -0,0 +1,3 @@
+<div style="background: -moz-linear-gradient(center 20px, 90% 130px, from(#0000ff), to(#000000)) no-repeat; width: 300px; height: 300px;"><br></div>
+<br>
+<div style="background: -moz-linear-gradient(10% bottom, right 50px, from(#00ff00), to(#000000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/linear-percent-ref.html b/layout/reftests/css-gradients/linear-percent-ref.html
new file mode 100644
index 00000000000..b1bf73d897f
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-percent-ref.html
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(30,60,240,270);
+  grad.addColorStop(0, '#0000ff');
+  grad.addColorStop(1, '#000000');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/linear-percent.html b/layout/reftests/css-gradients/linear-percent.html
new file mode 100644
index 00000000000..d2f6eb1eee8
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-percent.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(10% 20%, 80% 90%, from(#0000ff), to(#000000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/linear-ref.html b/layout/reftests/css-gradients/linear-ref.html
new file mode 100644
index 00000000000..fe1d6fdd922
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-ref.html
@@ -0,0 +1,24 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(10,20,50,100);
+  grad.addColorStop(0, 'red');
+  grad.addColorStop(1, 'rgb(100, 200, 0)');
+  grad.addColorStop(0.5, '#7777FF');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/linear.html b/layout/reftests/css-gradients/linear.html
new file mode 100644
index 00000000000..83dd41238e7
--- /dev/null
+++ b/layout/reftests/css-gradients/linear.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(10px 20px, 50px 100px, from(red), to(rgb(100, 200, 0)), color-stop(0.5, #7777FF)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/nostops-ref.html b/layout/reftests/css-gradients/nostops-ref.html
new file mode 100644
index 00000000000..4aa8b1e704c
--- /dev/null
+++ b/layout/reftests/css-gradients/nostops-ref.html
@@ -0,0 +1,21 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(0,0,150,300);
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/nostops.html b/layout/reftests/css-gradients/nostops.html
new file mode 100644
index 00000000000..d0a78e66202
--- /dev/null
+++ b/layout/reftests/css-gradients/nostops.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(left top, center bottom) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/onestop-ref.html b/layout/reftests/css-gradients/onestop-ref.html
new file mode 100644
index 00000000000..99c384ffce4
--- /dev/null
+++ b/layout/reftests/css-gradients/onestop-ref.html
@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(0,0,150,300);
+  grad.addColorStop(0.5, '#0000ff');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/onestop.html b/layout/reftests/css-gradients/onestop.html
new file mode 100644
index 00000000000..498ba5cde06
--- /dev/null
+++ b/layout/reftests/css-gradients/onestop.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(left top, center bottom, color-stop(0.5, #0000ff)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/radial-ref.html b/layout/reftests/css-gradients/radial-ref.html
new file mode 100644
index 00000000000..10473c7aa79
--- /dev/null
+++ b/layout/reftests/css-gradients/radial-ref.html
@@ -0,0 +1,24 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var radgrad = ctx.createRadialGradient(45,45,10,52,50,30);
+  radgrad.addColorStop(0, '#A7D30C');
+  radgrad.addColorStop(0.9, '#019F62');
+  radgrad.addColorStop(1, 'rgba(1,159,98,0)');
+
+  ctx.fillStyle = radgrad;
+  ctx.fillRect(0,0,150,150);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/radial.html b/layout/reftests/css-gradients/radial.html
new file mode 100644
index 00000000000..019196d1933
--- /dev/null
+++ b/layout/reftests/css-gradients/radial.html
@@ -0,0 +1 @@
+<div style="background: -moz-radial-gradient(45px 45px, 10px, 52px 50px, 30px, from(#a7d30c), color-stop(90%, #019f62), to(rgba(1, 159, 98, 0))) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list
new file mode 100644
index 00000000000..30c30917aa4
--- /dev/null
+++ b/layout/reftests/css-gradients/reftest.list
@@ -0,0 +1,8 @@
+== linear.html linear-ref.html
+== radial.html radial-ref.html
+== linear-keywords.html linear-keywords-ref.html
+== linear-percent.html linear-percent-ref.html
+== linear-mix.html linear-mix-ref.html
+== nostops.html nostops-ref.html
+== onestop.html onestop-ref.html
+== twostops.html twostops-ref.html
diff --git a/layout/reftests/css-gradients/twostops-ref.html b/layout/reftests/css-gradients/twostops-ref.html
new file mode 100644
index 00000000000..9a4624728a2
--- /dev/null
+++ b/layout/reftests/css-gradients/twostops-ref.html
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(0,0,150,300);
+  grad.addColorStop(0.5, '#0000ff');
+  grad.addColorStop(0.5, '#ff0000');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/twostops.html b/layout/reftests/css-gradients/twostops.html
new file mode 100644
index 00000000000..f4f51727b43
--- /dev/null
+++ b/layout/reftests/css-gradients/twostops.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(left top, center bottom, color-stop(0.5, #0000ff), color-stop(0.5, #ff0000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index dcd15fc36ef..6f21e928c67 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -41,6 +41,9 @@ include css-import/reftest.list
 # css character encoding tests
 include css-charset/reftest.list
 
+# css gradients
+include css-gradients/reftest.list
+
 # css media queries (tests for print mode)
 include css-mediaqueries/reftest.list
 
diff --git a/layout/style/nsCSSDeclaration.cpp b/layout/style/nsCSSDeclaration.cpp
index 4eebd5bf336..870076f0351 100644
--- a/layout/style/nsCSSDeclaration.cpp
+++ b/layout/style/nsCSSDeclaration.cpp
@@ -413,6 +413,49 @@ nsCSSDeclaration::AppendCSSValueToString(nsCSSProperty aProperty,
     tmpStr.AppendFloat(aValue.GetFloatValue());
     aResult.Append(tmpStr);
   }
+  else if (eCSSUnit_Gradient == unit) {
+    nsCSSValueGradient* gradient = aValue.GetGradientValue();
+
+    if (gradient->mIsRadial)
+      aResult.AppendLiteral("-moz-radial-gradient(");
+    else
+      aResult.AppendLiteral("-moz-linear-gradient(");
+
+    AppendCSSValueToString(eCSSProperty_background_position,
+                           gradient->mStartX, aResult);
+    aResult.AppendLiteral(" ");
+
+    AppendCSSValueToString(eCSSProperty_background_position,
+                           gradient->mStartY, aResult);
+    aResult.AppendLiteral(", ");
+
+    if (gradient->mIsRadial) {
+      AppendCSSValueToString(aProperty, gradient->mStartRadius, aResult);
+      aResult.AppendLiteral(", ");
+    }
+
+    AppendCSSValueToString(eCSSProperty_background_position,
+                           gradient->mEndX, aResult);
+    aResult.AppendLiteral(" ");
+
+    AppendCSSValueToString(eCSSProperty_background_position,
+                           gradient->mEndY, aResult);
+
+    if (gradient->mIsRadial) {
+      aResult.AppendLiteral(", ");
+      AppendCSSValueToString(aProperty, gradient->mEndRadius, aResult);
+    }
+
+    for (PRUint32 i = 0; i < gradient->mStops.Length(); i++) {
+      aResult.AppendLiteral(", color-stop(");
+      AppendCSSValueToString(aProperty, gradient->mStops[i].mLocation, aResult);
+      aResult.AppendLiteral(", ");
+      AppendCSSValueToString(aProperty, gradient->mStops[i].mColor, aResult);
+      aResult.AppendLiteral(")");
+    }
+
+    aResult.AppendLiteral(")");
+  }
 
   switch (unit) {
     case eCSSUnit_Null:         break;
@@ -446,6 +489,7 @@ nsCSSDeclaration::AppendCSSValueToString(nsCSSProperty aProperty,
     case eCSSUnit_Color:        break;
     case eCSSUnit_Percent:      aResult.Append(PRUnichar('%'));    break;
     case eCSSUnit_Number:       break;
+    case eCSSUnit_Gradient:     break;
 
     case eCSSUnit_Inch:         aResult.AppendLiteral("in");   break;
     case eCSSUnit_Millimeter:   aResult.AppendLiteral("mm");   break;
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index ea13346b31f..6ca629c2fc5 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -66,7 +66,6 @@
 #include "nsIAtom.h"
 #include "nsCOMArray.h"
 #include "nsColor.h"
-#include "nsStyleConsts.h"
 #include "nsCSSPseudoClasses.h"
 #include "nsCSSPseudoElements.h"
 #include "nsCSSAnonBoxes.h"
@@ -107,6 +106,7 @@
 #define VARIANT_NONE            0x040000  // O
 #define VARIANT_NORMAL          0x080000  // M
 #define VARIANT_SYSFONT         0x100000  // eCSSUnit_System_Font
+#define VARIANT_GRADIENT        0x200000  // eCSSUnit_Gradient
 
 // Common combinations of variants
 #define VARIANT_AL   (VARIANT_AUTO | VARIANT_LENGTH)
@@ -422,7 +422,7 @@ protected:
 
   PRBool ParseBackgroundList(nsCSSProperty aPropID); // a single value prop-id
   PRBool ParseBackgroundPosition();
-  PRBool ParseBoxPositionValues(nsCSSValuePair& aOut);
+  PRBool ParseBoxPositionValues(nsCSSValuePair& aOut, PRBool aAcceptsInherit);
   PRBool ParseBackgroundSize();
   PRBool ParseBackgroundSizeValues(nsCSSValuePair& aOut);
   PRBool ParseBorderColor();
@@ -510,6 +510,8 @@ protected:
   PRBool ParseURL(nsCSSValue& aValue);
   PRBool TranslateDimension(nsCSSValue& aValue, PRInt32 aVariantMask,
                             float aNumber, const nsString& aUnit);
+  PRBool ParseGradientStop(nsCSSValueGradient* aGradient);
+  PRBool ParseGradient(nsCSSValue& aValue, PRBool aIsRadial);
 
   void SetParsingCompoundProperty(PRBool aBool) {
     NS_ASSERTION(aBool == PR_TRUE || aBool == PR_FALSE, "bad PRBool value");
@@ -4513,6 +4515,15 @@ CSSParserImpl::ParseVariant(nsCSSValue& aValue,
     }
     return PR_FALSE;
   }
+  if ((aVariantMask & VARIANT_GRADIENT) != 0 &&
+      eCSSToken_Function == tk->mType) {
+    // a generated gradient
+    if (tk->mIdent.LowerCaseEqualsLiteral("-moz-linear-gradient"))
+      return ParseGradient(aValue, PR_FALSE);
+
+    if (tk->mIdent.LowerCaseEqualsLiteral("-moz-radial-gradient"))
+      return ParseGradient(aValue, PR_TRUE);
+  }
   if ((aVariantMask & VARIANT_COLOR) != 0) {
     if ((mNavQuirkMode && !IsParsingCompoundProperty()) || // NONSTANDARD: Nav interprets 'xxyyzz' values even without '#' prefix
         (eCSSToken_ID == tk->mType) ||
@@ -4762,6 +4773,181 @@ CSSParserImpl::ParseURL(nsCSSValue& aValue)
   return PR_TRUE;
 }
 
+PRBool
+CSSParserImpl::ParseGradientStop(nsCSSValueGradient* aGradient)
+{
+  if (!GetToken(PR_TRUE))
+    return PR_FALSE;
+
+  if (eCSSToken_Function != mToken.mType) {
+    UngetToken();
+    return PR_FALSE;
+  }
+
+  if (mToken.mIdent.LowerCaseEqualsLiteral("from")) {
+    // Start of the gradient
+    if (!ExpectSymbol('(', PR_FALSE)) {
+      NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
+    }
+
+    nsCSSValue fromFloat(0.0f, eCSSUnit_Percent);
+    nsCSSValue fromColor;
+    if (!ParseVariant(fromColor, VARIANT_COLOR, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    if (!ExpectSymbol(')', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    aGradient->mStops.AppendElement(nsCSSValueGradientStop(fromFloat, fromColor));
+    return PR_TRUE;
+  }
+
+  if (mToken.mIdent.LowerCaseEqualsLiteral("to")) {
+    // End of the gradient
+    if (!ExpectSymbol('(', PR_FALSE)) {
+      NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
+    }
+
+    nsCSSValue toFloat(1.0f, eCSSUnit_Percent);
+    nsCSSValue toColor;
+    if (!ParseVariant(toColor, VARIANT_COLOR, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    if (!ExpectSymbol(')', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    aGradient->mStops.AppendElement(nsCSSValueGradientStop(toFloat, toColor));
+    return PR_TRUE;
+  }
+
+  if (mToken.mIdent.LowerCaseEqualsLiteral("color-stop")) {
+    // Some kind of gradient stop, somewhere...
+    if (!ExpectSymbol('(', PR_FALSE)) {
+      NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
+    }
+
+    nsCSSValue stopFloat;
+    if (!ParseVariant(stopFloat, VARIANT_PERCENT | VARIANT_NUMBER, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    // Check for a sane position value, and clamp it if it isn't
+    if (stopFloat.GetUnit() == eCSSUnit_Percent) {
+      if (stopFloat.GetPercentValue() > 1.0)
+        stopFloat.SetPercentValue(1.0);
+      else if (stopFloat.GetPercentValue() < 0.0)
+        stopFloat.SetPercentValue(0.0);
+    } else {
+      if (stopFloat.GetFloatValue() > 1.0)
+        stopFloat.SetFloatValue(1.0, eCSSUnit_Number);
+      else if (stopFloat.GetFloatValue() < 0.0)
+        stopFloat.SetFloatValue(0.0, eCSSUnit_Number);
+    }
+
+    if (!ExpectSymbol(',', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    nsCSSValue stopColor;
+    if (!ParseVariant(stopColor, VARIANT_COLOR, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    if (!ExpectSymbol(')', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    aGradient->mStops.AppendElement(nsCSSValueGradientStop(stopFloat, stopColor));
+    return PR_TRUE;
+  }
+
+  // No idea what this is
+  return PR_FALSE;
+}
+
+PRBool
+CSSParserImpl::ParseGradient(nsCSSValue& aValue,
+                             PRBool aIsRadial)
+{
+  if (!ExpectSymbol('(', PR_FALSE)) {
+    NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
+  }
+
+  nsCSSValuePair startPos;
+  if (!ParseBoxPositionValues(startPos, PR_FALSE))
+    return PR_FALSE;
+
+  if (!ExpectSymbol(',', PR_TRUE)) {
+    SkipUntil(')');
+    return PR_FALSE;
+  }
+
+  nsCSSValue startRadius;
+  if (aIsRadial) {
+    if (!ParseNonNegativeVariant(startRadius, VARIANT_LENGTH, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    if (!ExpectSymbol(',', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+  }
+
+  nsCSSValuePair endPos;
+  if (!ParseBoxPositionValues(endPos, PR_FALSE)) {
+    SkipUntil(')');
+    return PR_FALSE;
+  }
+
+  nsCSSValue endRadius;
+  if (aIsRadial) {
+    if (!ExpectSymbol(',', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    if (!ParseNonNegativeVariant(endRadius, VARIANT_LENGTH, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+  }
+
+  nsRefPtr<nsCSSValueGradient> cssGradient =
+    new nsCSSValueGradient(aIsRadial, startPos.mXValue, startPos.mYValue,
+                           startRadius, endPos.mXValue, endPos.mYValue,
+                           endRadius);
+
+  // Do optional stop functions
+  while (ExpectSymbol(',', PR_TRUE)) {
+    if (!ParseGradientStop(cssGradient)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+  }
+
+  if (!ExpectSymbol(')', PR_TRUE)) {
+    SkipUntil(')');
+    return PR_FALSE;
+  }
+
+  aValue.SetGradientValue(cssGradient);
+  return PR_TRUE;
+}
+
 PRInt32
 CSSParserImpl::ParseChoice(nsCSSValue aValues[],
                            const nsCSSProperty aPropIDs[], PRInt32 aNumIDs)
@@ -5421,7 +5607,7 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
     return ParseVariant(aValue, VARIANT_HC, nsnull);
   case eCSSProperty_background_image:
     // Used only internally.
-    return ParseVariant(aValue, VARIANT_HUO, nsnull);
+    return ParseVariant(aValue, VARIANT_HUO | VARIANT_GRADIENT, nsnull);
   case eCSSProperty__moz_background_inline_policy:
     return ParseVariant(aValue, VARIANT_HK,
                         nsCSSProps::kBackgroundInlinePolicyKTable);
@@ -6155,7 +6341,7 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
         if (havePosition)
           return PR_FALSE;
         havePosition = PR_TRUE;
-        if (!ParseBoxPositionValues(aItem.mPosition)) {
+        if (!ParseBoxPositionValues(aItem.mPosition, PR_FALSE)) {
           return PR_FALSE;
         }
 #if 0
@@ -6202,7 +6388,9 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
         aItem.mLastItem = PR_TRUE;
       }
     } else if (eCSSToken_Function == tt &&
-               mToken.mIdent.LowerCaseEqualsLiteral("url")) {
+               (mToken.mIdent.LowerCaseEqualsLiteral("url") ||
+                mToken.mIdent.LowerCaseEqualsLiteral("-moz-linear-gradient") ||
+                mToken.mIdent.LowerCaseEqualsLiteral("-moz-radial-gradient"))) {
       if (haveImage)
         return PR_FALSE;
       haveImage = PR_TRUE;
@@ -6214,7 +6402,7 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
       if (havePosition)
         return PR_FALSE;
       havePosition = PR_TRUE;
-      if (!ParseBoxPositionValues(aItem.mPosition)) {
+      if (!ParseBoxPositionValues(aItem.mPosition, PR_FALSE)) {
         return PR_FALSE;
       }
     } else {
@@ -6285,15 +6473,11 @@ CSSParserImpl::ParseBackgroundPosition()
   nsCSSValuePair valuePair;
   nsCSSValuePairList *head = nsnull, **tail = &head;
   for (;;) {
-    if (!ParseBoxPositionValues(valuePair)) {
+    if (!ParseBoxPositionValues(valuePair, !head)) {
       break;
     }
     PRBool inheritOrInitial = valuePair.mXValue.GetUnit() == eCSSUnit_Inherit ||
                               valuePair.mXValue.GetUnit() == eCSSUnit_Initial;
-    if (inheritOrInitial && head) {
-      // inherit and initial are only allowed on their own
-      break;
-    }
     nsCSSValuePairList *item = new nsCSSValuePairList;
     if (!item) {
       mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
@@ -6323,14 +6507,17 @@ CSSParserImpl::ParseBackgroundPosition()
  * like "top," "left center," etc.
  *
  * @param aOut The nsCSSValuePair in which to place the result.
+ * @param aAcceptsInherit If true, 'inherit' and 'initial' are legal values
  * @return Whether or not the operation succeeded.
  */
-PRBool CSSParserImpl::ParseBoxPositionValues(nsCSSValuePair &aOut)
+PRBool CSSParserImpl::ParseBoxPositionValues(nsCSSValuePair &aOut,
+                                             PRBool aAcceptsInherit)
 {
   // First try a percentage or a length value
   nsCSSValue &xValue = aOut.mXValue,
              &yValue = aOut.mYValue;
-  if (ParseVariant(xValue, VARIANT_HLP, nsnull)) {
+  PRInt32 variantMask = aAcceptsInherit ? VARIANT_HLP : VARIANT_LP;
+  if (ParseVariant(xValue, variantMask, nsnull)) {
     if (eCSSUnit_Inherit == xValue.GetUnit() ||
         eCSSUnit_Initial == xValue.GetUnit()) {  // both are inherited or both are set to initial
       yValue = xValue;
@@ -7585,7 +7772,7 @@ PRBool CSSParserImpl::ParseMozTransform()
 PRBool CSSParserImpl::ParseMozTransformOrigin()
 {
   /* Read in a box position, fail if we can't. */
-  if (!ParseBoxPositionValues(mTempData.mDisplay.mTransformOrigin) ||
+  if (!ParseBoxPositionValues(mTempData.mDisplay.mTransformOrigin, PR_TRUE) ||
       !ExpectEndProperty())
     return PR_FALSE;
 
diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp
index 5257821a18f..cfcfc6edc96 100644
--- a/layout/style/nsCSSValue.cpp
+++ b/layout/style/nsCSSValue.cpp
@@ -124,6 +124,13 @@ nsCSSValue::nsCSSValue(nsCSSValue::Image* aValue)
   mValue.mImage->AddRef();
 }
 
+nsCSSValue::nsCSSValue(nsCSSValueGradient* aValue)
+  : mUnit(eCSSUnit_Gradient)
+{
+  mValue.mGradient = aValue;
+  mValue.mGradient->AddRef();
+}
+
 nsCSSValue::nsCSSValue(const nsCSSValue& aCopy)
   : mUnit(aCopy.mUnit)
 {
@@ -155,6 +162,10 @@ nsCSSValue::nsCSSValue(const nsCSSValue& aCopy)
     mValue.mImage = aCopy.mValue.mImage;
     mValue.mImage->AddRef();
   }
+  else if (eCSSUnit_Gradient == mUnit) {
+    mValue.mGradient = aCopy.mValue.mGradient;
+    mValue.mGradient->AddRef();
+  }
   else {
     NS_NOTREACHED("unknown unit");
   }
@@ -194,6 +205,9 @@ PRBool nsCSSValue::operator==(const nsCSSValue& aOther) const
     else if (eCSSUnit_Image == mUnit) {
       return *mValue.mImage == *aOther.mValue.mImage;
     }
+    else if (eCSSUnit_Gradient == mUnit) {
+      return *mValue.mGradient == *aOther.mValue.mGradient;
+    }
     else {
       return mValue.mFloat == aOther.mValue.mFloat;
     }
@@ -243,6 +257,8 @@ void nsCSSValue::DoReset()
     mValue.mURL->Release();
   } else if (eCSSUnit_Image == mUnit) {
     mValue.mImage->Release();
+  } else if (eCSSUnit_Gradient == mUnit) {
+    mValue.mGradient->Release();
   }
   mUnit = eCSSUnit_Null;
 }
@@ -326,6 +342,14 @@ void nsCSSValue::SetImageValue(nsCSSValue::Image* aValue)
   mValue.mImage->AddRef();
 }
 
+void nsCSSValue::SetGradientValue(nsCSSValueGradient* aValue)
+{
+  Reset();
+  mUnit = eCSSUnit_Gradient;
+  mValue.mGradient = aValue;
+  mValue.mGradient->AddRef();
+}
+
 void nsCSSValue::SetAutoValue()
 {
   Reset();
@@ -439,15 +463,12 @@ nsCSSValue::URL::URL(nsIURI* aURI, nsStringBuffer* aString, nsIURI* aReferrer,
     mRefCnt(0)
 {
   NS_PRECONDITION(aOriginPrincipal, "Must have an origin principal");
-  
   mString->AddRef();
-  MOZ_COUNT_CTOR(nsCSSValue::URL);
 }
 
 nsCSSValue::URL::~URL()
 {
   mString->Release();
-  MOZ_COUNT_DTOR(nsCSSValue::URL);
 }
 
 PRBool
@@ -485,8 +506,6 @@ nsCSSValue::Image::Image(nsIURI* aURI, nsStringBuffer* aString,
                          nsIDocument* aDocument)
   : URL(aURI, aString, aReferrer, aOriginPrincipal)
 {
-  MOZ_COUNT_CTOR(nsCSSValue::Image);
-
   if (mURI &&
       nsContentUtils::CanLoadImage(mURI, aDocument, aDocument,
                                    aOriginPrincipal)) {
@@ -498,5 +517,38 @@ nsCSSValue::Image::Image(nsIURI* aURI, nsStringBuffer* aString,
 
 nsCSSValue::Image::~Image()
 {
-  MOZ_COUNT_DTOR(nsCSSValue::Image);
+}
+
+nsCSSValueGradientStop::nsCSSValueGradientStop(const nsCSSValue& aLocation,
+                                               const nsCSSValue& aColor)
+  : mLocation(aLocation),
+    mColor(aColor)
+{ 
+  MOZ_COUNT_CTOR(nsCSSValueGradientStop);
+}
+
+nsCSSValueGradientStop::nsCSSValueGradientStop(const nsCSSValueGradientStop& aOther)
+  : mLocation(aOther.mLocation),
+    mColor(aOther.mColor)
+{ 
+  MOZ_COUNT_CTOR(nsCSSValueGradientStop);
+}
+
+nsCSSValueGradientStop::~nsCSSValueGradientStop()
+{
+  MOZ_COUNT_DTOR(nsCSSValueGradientStop);
+}
+
+nsCSSValueGradient::nsCSSValueGradient(PRBool aIsRadial, const nsCSSValue& aStartX,
+           const nsCSSValue& aStartY, const nsCSSValue& aStartRadius, const nsCSSValue& aEndX,
+           const nsCSSValue& aEndY, const nsCSSValue& aEndRadius)
+  : mIsRadial(aIsRadial),
+    mStartX(aStartX),
+    mStartY(aStartY),
+    mEndX(aEndX),
+    mEndY(aEndY),
+    mStartRadius(aStartRadius),
+    mEndRadius(aEndRadius),
+    mRefCnt(0)
+{ 
 }
diff --git a/layout/style/nsCSSValue.h b/layout/style/nsCSSValue.h
index 2c7673eb8cd..06728267e9e 100644
--- a/layout/style/nsCSSValue.h
+++ b/layout/style/nsCSSValue.h
@@ -49,6 +49,7 @@
 #include "nsAutoPtr.h"
 #include "nsCRTGlue.h"
 #include "nsStringBuffer.h"
+#include "nsTArray.h"
 
 class imgIRequest;
 class nsIDocument;
@@ -112,6 +113,7 @@ enum nsCSSUnit {
 
   eCSSUnit_URL          = 30,     // (nsCSSValue::URL*) value
   eCSSUnit_Image        = 31,     // (nsCSSValue::Image*) value
+  eCSSUnit_Gradient     = 32,     // (nsCSSValueGradient*) value
   eCSSUnit_Integer      = 50,     // (int) simple value
   eCSSUnit_Enumerated   = 51,     // (int) value has enumerated meaning
   eCSSUnit_EnumColor    = 80,     // (int) enumerated color (kColorKTable)
@@ -155,6 +157,8 @@ enum nsCSSUnit {
   eCSSUnit_Milliseconds = 3001     // (float) 1/1000 second
 };
 
+struct nsCSSValueGradient;
+
 class nsCSSValue {
 public:
   struct Array;
@@ -180,6 +184,7 @@ public:
   nsCSSValue(Array* aArray, nsCSSUnit aUnit) NS_HIDDEN;
   explicit nsCSSValue(URL* aValue) NS_HIDDEN;
   explicit nsCSSValue(Image* aValue) NS_HIDDEN;
+  explicit nsCSSValue(nsCSSValueGradient* aValue) NS_HIDDEN;
   nsCSSValue(const nsCSSValue& aCopy) NS_HIDDEN;
   ~nsCSSValue() { Reset(); }
 
@@ -266,6 +271,12 @@ public:
       mValue.mURL->mURI : mValue.mImage->mURI;
   }
 
+  nsCSSValueGradient* GetGradientValue() const
+  {
+    NS_ASSERTION(mUnit == eCSSUnit_Gradient, "not a gradient value");
+    return mValue.mGradient;
+  }
+
   URL* GetURLStructValue() const
   {
     // Not allowing this for Image values, because if the caller takes
@@ -307,6 +318,7 @@ public:
   NS_HIDDEN_(void)  SetArrayValue(nsCSSValue::Array* aArray, nsCSSUnit aUnit);
   NS_HIDDEN_(void)  SetURLValue(nsCSSValue::URL* aURI);
   NS_HIDDEN_(void)  SetImageValue(nsCSSValue::Image* aImage);
+  NS_HIDDEN_(void)  SetGradientValue(nsCSSValueGradient* aGradient);
   NS_HIDDEN_(void)  SetAutoValue();
   NS_HIDDEN_(void)  SetInheritValue();
   NS_HIDDEN_(void)  SetInitialValue();
@@ -355,17 +367,24 @@ public:
         return;
       }
       ++mRefCnt;
+      NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::URL", sizeof(*this));
     }
     void Release() {
       if (mRefCnt == PR_UINT32_MAX) {
         NS_WARNING("refcount overflow, leaking nsCSSValue::URL");
         return;
       }
-      if (--mRefCnt == 0)
+      --mRefCnt;
+      NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::URL");
+      if (mRefCnt == 0)
         delete this;
     }
   protected:
     nsrefcnt mRefCnt;
+
+    // not to be implemented
+    URL(const URL& aOther);
+    URL& operator=(const URL& aOther);
   };
 
   struct Image : public URL {
@@ -381,13 +400,25 @@ public:
 
     nsCOMPtr<imgIRequest> mRequest; // null == image load blocked or somehow failed
 
-    // Override Release so we delete correctly without a virtual destructor
+    // Override AddRef and Release to not only log ourselves correctly, but
+    // also so that we delete correctly without a virtual destructor
+    void AddRef() {
+      if (mRefCnt == PR_UINT32_MAX) {
+        NS_WARNING("refcount overflow, leaking nsCSSValue::Image");
+        return;
+      }
+      ++mRefCnt;
+      NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Image", sizeof(*this));
+    }
+
     void Release() {
       if (mRefCnt == PR_UINT32_MAX) {
         NS_WARNING("refcount overflow, leaking nsCSSValue::Image");
         return;
       }
-      if (--mRefCnt == 0)
+      --mRefCnt;
+      NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Image");
+      if (mRefCnt == 0)
         delete this;
     }
   };
@@ -409,9 +440,105 @@ protected:
     Array*     mArray;
     URL*       mURL;
     Image*     mImage;
+    nsCSSValueGradient* mGradient;
   }         mValue;
 };
 
+struct nsCSSValueGradientStop {
+public:
+  nsCSSValueGradientStop(const nsCSSValue& aLocation, const nsCSSValue& aColor) NS_HIDDEN;
+  // needed to keep bloat logs happy when we use the nsTArray in nsCSSValueGradient
+  nsCSSValueGradientStop(const nsCSSValueGradientStop& aOther) NS_HIDDEN;
+  ~nsCSSValueGradientStop() NS_HIDDEN;
+
+  nsCSSValue mLocation;
+  nsCSSValue mColor;
+
+  PRBool operator==(const nsCSSValueGradientStop& aOther) const
+  {
+    return (mLocation == aOther.mLocation &&
+            mColor == aOther.mColor);
+  }
+
+  PRBool operator!=(const nsCSSValueGradientStop& aOther) const
+  {
+    return !(*this == aOther);
+  }
+};
+
+struct nsCSSValueGradient {
+  nsCSSValueGradient(PRBool aIsRadial, const nsCSSValue& aStartX, const nsCSSValue& aStartY,
+           const nsCSSValue& aStartRadius, const nsCSSValue& aEndX, const nsCSSValue& aEndY,
+           const nsCSSValue& aEndRadius) NS_HIDDEN;
+
+  // true if gradient is radial, false if it is linear
+  PRPackedBool mIsRadial;
+  nsCSSValue mStartX;
+  nsCSSValue mStartY;
+
+  nsCSSValue mEndX;
+  nsCSSValue mEndY;
+
+  // Only meaningful if mIsRadial is true
+  nsCSSValue mStartRadius;
+  nsCSSValue mEndRadius;
+
+  nsTArray<nsCSSValueGradientStop> mStops;
+
+  PRBool operator==(const nsCSSValueGradient& aOther) const
+  {
+    if (mIsRadial != aOther.mIsRadial ||
+        mStartX != aOther.mStartX ||
+        mStartY != aOther.mStartY ||
+        mStartRadius != aOther.mStartRadius ||
+        mEndX != aOther.mEndX ||
+        mEndY != aOther.mEndY ||
+        mEndRadius != aOther.mEndRadius)
+      return PR_FALSE;
+
+    if (mStops.Length() != aOther.mStops.Length())
+      return PR_FALSE;
+
+    for (PRUint32 i = 0; i < mStops.Length(); i++) {
+      if (mStops[i] != aOther.mStops[i])
+        return PR_FALSE;
+    }
+
+    return PR_TRUE;
+  }
+
+  PRBool operator!=(const nsCSSValueGradient& aOther) const
+  {
+    return !(*this == aOther);
+  }
+
+  void AddRef() {
+    if (mRefCnt == PR_UINT32_MAX) {
+      NS_WARNING("refcount overflow, leaking nsCSSValue::Gradient");
+      return;
+    }
+    ++mRefCnt;
+    NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Gradient", sizeof(*this));
+  }
+  void Release() {
+    if (mRefCnt == PR_UINT32_MAX) {
+      NS_WARNING("refcount overflow, leaking nsCSSValue::Gradient");
+      return;
+    }
+    --mRefCnt;
+    NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Gradient");
+    if (mRefCnt == 0)
+      delete this;
+  }
+
+private:
+  nsrefcnt mRefCnt;
+
+  // not to be implemented
+  nsCSSValueGradient(const nsCSSValueGradient& aOther);
+  nsCSSValueGradient& operator=(const nsCSSValueGradient& aOther);
+};
+
 struct nsCSSValue::Array {
 
   // return |Array| with reference count of zero
@@ -508,7 +635,9 @@ private:
 #undef CSSVALUE_LIST_FOR_EXTRA_VALUES
 
 private:
-  Array(const Array& aOther); // not to be implemented
+  // not to be implemented
+  Array(const Array& aOther);
+  Array& operator=(const Array& aOther);
 };
 
 #endif /* nsCSSValue_h___ */
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index c299ffa80d5..aa765b863e1 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -1250,6 +1250,97 @@ nsComputedDOMStyle::GetBackgroundColor(nsIDOMCSSValue** aValue)
   return CallQueryInterface(val, aValue);
 }
 
+static void
+AppendCSSGradientLength(const nsStyleCoord& aValue,
+                        nsROCSSPrimitiveValue* aPrimitive,
+                        nsAString& aString)
+{
+  nsAutoString tokenString;
+  if (aValue.GetUnit() == eStyleUnit_Coord)
+    aPrimitive->SetAppUnits(aValue.GetCoordValue());
+  else
+    aPrimitive->SetPercent(aValue.GetPercentValue());
+  aPrimitive->GetCssText(tokenString);
+  aString.Append(tokenString);
+}
+
+static void
+AppendCSSGradientRadius(const nscoord aValue,
+                        nsROCSSPrimitiveValue* aPrimitive,
+                        nsAString& aString)
+{
+  nsAutoString tokenString;
+  aPrimitive->SetAppUnits(aValue);
+  aPrimitive->GetCssText(tokenString);
+  aString.Append(tokenString);
+}
+
+nsresult
+nsComputedDOMStyle::GetCSSGradientString(const nsStyleGradient* aGradient,
+                                         nsAString& aString)
+{
+  if (aGradient->mIsRadial)
+    aString.AssignLiteral("-moz-radial-gradient(");
+  else
+    aString.AssignLiteral("-moz-linear-gradient(");
+
+  nsROCSSPrimitiveValue *tmpVal = GetROCSSPrimitiveValue();
+  if (!tmpVal)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  // starting X position
+  AppendCSSGradientLength(aGradient->mStartX, tmpVal, aString);
+  aString.AppendLiteral(" ");
+
+  // starting Y position
+  AppendCSSGradientLength(aGradient->mStartY, tmpVal, aString);
+  aString.AppendLiteral(", ");
+
+  // starting radius
+  if (aGradient->mIsRadial) {
+    AppendCSSGradientRadius(aGradient->mStartRadius, tmpVal, aString);
+    aString.AppendLiteral(", ");
+  }
+
+  // ending X position
+  AppendCSSGradientLength(aGradient->mEndX, tmpVal, aString);
+  aString.AppendLiteral(" ");
+
+  // ending Y position
+  AppendCSSGradientLength(aGradient->mEndY, tmpVal, aString);
+
+  // ending radius
+  if (aGradient->mIsRadial) {
+    aString.AppendLiteral(", ");
+    AppendCSSGradientRadius(aGradient->mStartRadius, tmpVal, aString);
+  }
+
+  // color stops
+  for (PRUint32 i = 0; i < aGradient->mStops.Length(); ++i) {
+    nsAutoString tokenString;
+    aString.AppendLiteral(", color-stop(");
+
+    tmpVal->SetPercent(aGradient->mStops[i].mPosition);
+    tmpVal->GetCssText(tokenString);
+    aString.Append(tokenString);
+    aString.AppendLiteral(", ");
+
+    nsresult rv = SetToRGBAColor(tmpVal, aGradient->mStops[i].mColor);
+    if (NS_FAILED(rv)) {
+      delete tmpVal;
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    tmpVal->GetCssText(tokenString);
+    aString.Append(tokenString);
+    aString.AppendLiteral(")");
+  }
+
+  delete tmpVal;
+  aString.AppendLiteral(")");
+  return NS_OK;
+}
+
 nsresult
 nsComputedDOMStyle::GetBackgroundImage(nsIDOMCSSValue** aValue)
 {
@@ -1266,13 +1357,27 @@ nsComputedDOMStyle::GetBackgroundImage(nsIDOMCSSValue** aValue)
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    imgIRequest *image = bg->mLayers[i].mImage;
-    if (!image) {
-      val->SetIdent(eCSSKeyword_none);
+    const nsStyleBackground::Image &image = bg->mLayers[i].mImage;
+    if (image.GetType() == eBackgroundImage_Image) {
+      imgIRequest *req = image.GetImageData();
+      if (!req) {
+        val->SetIdent(eCSSKeyword_none);
+      } else {
+        nsCOMPtr<nsIURI> uri;
+        req->GetURI(getter_AddRefs(uri));
+        val->SetURI(uri);
+      }
+    } else if (image.GetType() == eBackgroundImage_Gradient) {
+      nsAutoString gradientString;
+      nsresult rv = GetCSSGradientString(image.GetGradientData(),
+                                         gradientString);
+      if (NS_FAILED(rv)) {
+        delete valueList;
+        return rv;
+      }
+      val->SetString(gradientString);
     } else {
-      nsCOMPtr<nsIURI> uri;
-      image->GetURI(getter_AddRefs(uri));
-      val->SetURI(uri);
+      val->SetIdent(eCSSKeyword_none);
     }
   }
 
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 7e8bf8fc710..5ecc5ce249a 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -131,6 +131,9 @@ private:
                              const PRInt32 aTable[],
                              nsIDOMCSSValue** aResult);
 
+  nsresult GetCSSGradientString(const nsStyleGradient* aGradient,
+                                nsAString& aString);
+
   /* Properties Queryable as CSSValues */
 
   nsresult GetAppearance(nsIDOMCSSValue** aValue);
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 47625d13eab..8cc514fc93b 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -471,6 +471,81 @@ static PRBool SetColor(const nsCSSValue& aValue, const nscolor aParentColor,
   return result;
 }
 
+static void SetGradientCoord(const nsCSSValue& aValue, nsPresContext* aPresContext,
+                             nsStyleContext* aContext, nsStyleCoord& aResult,
+                             PRBool& aCanStoreInRuleTree)
+{
+  // If coordinate is an enumerated type, handle it explicitly.
+  if (aValue.GetUnit() == eCSSUnit_Enumerated) {
+    aResult.SetPercentValue(GetFloatFromBoxPosition(aValue.GetIntValue()));
+    return;
+  }
+
+  // OK to pass bad aParentCoord since we're not passing SETCOORD_INHERIT
+  PRBool result = SetCoord(aValue, aResult, nsStyleCoord(), SETCOORD_LP,
+                           aContext, aPresContext, aCanStoreInRuleTree);
+  NS_ABORT_IF_FALSE(result, "Incorrect data structure created by parsing code");
+}
+
+static void SetGradient(const nsCSSValue& aValue, nsPresContext* aPresContext,
+                        nsStyleContext* aContext, nsStyleGradient& aResult,
+                        PRBool& aCanStoreInRuleTree)
+{
+  NS_ABORT_IF_FALSE(aValue.GetUnit() == eCSSUnit_Gradient,
+                    "The given data is not a gradient");
+
+  nsCSSValueGradient* gradient = aValue.GetGradientValue();
+  aResult.mIsRadial = gradient->mIsRadial;
+
+  // start values
+  SetGradientCoord(gradient->mStartX, aPresContext, aContext,
+                   aResult.mStartX, aCanStoreInRuleTree);
+
+  SetGradientCoord(gradient->mStartY, aPresContext, aContext,
+                   aResult.mStartY, aCanStoreInRuleTree);
+
+  if (gradient->mIsRadial) {
+    NS_ABORT_IF_FALSE(gradient->mStartRadius.IsLengthUnit(),
+                      "Incorrect data structure created by parsing code");
+    aResult.mStartRadius = CalcLength(gradient->mStartRadius, aContext,
+                                      aPresContext, aCanStoreInRuleTree);
+  }
+
+  // end values
+  SetGradientCoord(gradient->mEndX, aPresContext, aContext,
+                   aResult.mEndX, aCanStoreInRuleTree);
+
+  SetGradientCoord(gradient->mEndY, aPresContext, aContext,
+                   aResult.mEndY, aCanStoreInRuleTree);
+
+  if (gradient->mIsRadial) {
+    NS_ABORT_IF_FALSE(gradient->mEndRadius.IsLengthUnit(),
+                      "Incorrect data structure created by parsing code");
+    aResult.mEndRadius = CalcLength(gradient->mEndRadius, aContext,
+                                    aPresContext, aCanStoreInRuleTree);
+  }
+
+  // stops
+  for (PRUint32 i = 0; i < gradient->mStops.Length(); i++) {
+    nsStyleGradientStop stop;
+    nsCSSValueGradientStop &valueStop = gradient->mStops[i];
+
+    if (valueStop.mLocation.GetUnit() == eCSSUnit_Percent)
+      stop.mPosition = valueStop.mLocation.GetPercentValue();
+    else
+      stop.mPosition = valueStop.mLocation.GetFloatValue();
+
+    // inherit is not a valid color for stops, so we pass in a dummy
+    // parent color
+    NS_ASSERTION(valueStop.mColor.GetUnit() != eCSSUnit_Inherit,
+                 "inherit is not a valid color for gradient stops");
+    SetColor(valueStop.mColor, NS_RGB(0, 0, 0), aPresContext,
+             aContext, stop.mColor, aCanStoreInRuleTree);
+
+    aResult.mStops.AppendElement(stop);
+  }
+}
+
 // flags for SetDiscrete - align values with SETCOORD_* constants
 // where possible
 
@@ -3803,20 +3878,30 @@ struct BackgroundItemComputer<nsCSSValueList, PRUint8>
 };
 
 NS_SPECIALIZE_TEMPLATE
-struct BackgroundItemComputer<nsCSSValueList, nsCOMPtr<imgIRequest> >
+struct BackgroundItemComputer<nsCSSValueList, nsStyleBackground::Image>
 {
   static void ComputeValue(nsStyleContext* aStyleContext,
                            const nsCSSValueList* aSpecifiedValue,
-                           nsCOMPtr<imgIRequest>& aComputedValue,
+                           nsStyleBackground::Image& aComputedValue,
                            PRBool& aCanStoreInRuleTree)
   {
     const nsCSSValue &value = aSpecifiedValue->mValue;
     if (eCSSUnit_Image == value.GetUnit()) {
-      aComputedValue = value.GetImageValue();
+      aComputedValue.SetImageData(value.GetImageValue());
+    }
+    else if (eCSSUnit_Gradient == value.GetUnit()) {
+      nsStyleGradient* gradient = new nsStyleGradient();
+      if (gradient) {
+        SetGradient(value, aStyleContext->PresContext(), aStyleContext,
+                    *gradient, aCanStoreInRuleTree);
+        aComputedValue.SetGradientData(gradient);
+      } else {
+        aComputedValue.SetNull();
+      }
     }
     else {
       NS_ASSERTION(eCSSUnit_None == value.GetUnit(), "unexpected unit");
-      aComputedValue = nsnull;
+      aComputedValue.SetNull();
     }
   }
 };
@@ -4056,10 +4141,11 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct,
   PRBool rebuild = PR_FALSE;
 
   // background-image: url (stored as image), none, inherit [list]
+  nsStyleBackground::Image initialImage;
   SetBackgroundList(aContext, colorData.mBackImage, bg->mLayers,
                     parentBG->mLayers, &nsStyleBackground::Layer::mImage,
-                    nsCOMPtr<imgIRequest>(nsnull), parentBG->mImageCount,
-                    bg->mImageCount, maxItemCount, rebuild, canStoreInRuleTree);
+                    initialImage, parentBG->mImageCount, bg->mImageCount,
+                    maxItemCount, rebuild, canStoreInRuleTree);
 
   // background-repeat: enum, inherit, initial [list]
   SetBackgroundList(aContext, colorData.mBackRepeat, bg->mLayers,
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 55e97e4dfd7..e936354b76a 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1206,6 +1206,51 @@ nsChangeHint nsStyleColor::MaxDifference()
 }
 #endif
 
+// --------------------
+// nsStyleGradient
+//
+PRBool
+nsStyleGradient::operator==(const nsStyleGradient& aOther) const
+{
+  NS_ABORT_IF_FALSE(mIsRadial || (mStartRadius == 0 && mEndRadius == 0),
+                    "incorrect unused radius values");
+  NS_ABORT_IF_FALSE(aOther.mIsRadial ||
+                    (aOther.mStartRadius == 0 && aOther.mEndRadius == 0),
+                    "incorrect unused radius values");
+
+  if (mIsRadial != aOther.mIsRadial ||
+      mStartX != aOther.mStartX ||
+      mStartY != aOther.mStartY ||
+      mStartRadius != aOther.mStartRadius ||
+      mEndX != aOther.mEndX ||
+      mEndY != aOther.mEndY ||
+      mEndRadius != aOther.mEndRadius)
+    return PR_FALSE;
+
+  if (mStops.Length() != aOther.mStops.Length())
+    return PR_FALSE;
+
+  for (PRUint32 i = 0; i < mStops.Length(); i++) {
+    if (mStops[i].mPosition != aOther.mStops[i].mPosition ||
+        mStops[i].mColor != aOther.mStops[i].mColor)
+      return PR_FALSE;
+  }
+
+  return PR_TRUE;
+}
+
+nsStyleGradient::nsStyleGradient(void)
+  : mIsRadial(PR_FALSE)
+  , mStartRadius(0)
+  , mEndRadius(0)
+  , mRefCnt(0)
+{
+  mStartX.SetCoordValue(0);
+  mStartY.SetCoordValue(0);
+  mEndX.SetCoordValue(0);
+  mEndY.SetCoordValue(0);
+}
+
 // --------------------
 // nsStyleBackground
 //
@@ -1284,7 +1329,8 @@ PRBool nsStyleBackground::HasFixedBackground() const
 {
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, this) {
     const Layer &layer = mLayers[i];
-    if (layer.mAttachment == NS_STYLE_BG_ATTACHMENT_FIXED && layer.mImage) {
+    if (layer.mAttachment == NS_STYLE_BG_ATTACHMENT_FIXED &&
+        layer.mImage.GetType() != eBackgroundImage_Null) {
       return PR_TRUE;
     }
   }
@@ -1293,7 +1339,8 @@ PRBool nsStyleBackground::HasFixedBackground() const
 
 PRBool nsStyleBackground::IsTransparent() const
 {
-  return !BottomLayer().mImage && mImageCount == 1 &&
+  return BottomLayer().mImage.GetType() == eBackgroundImage_Null &&
+         mImageCount == 1 &&
          NS_GET_A(mBackgroundColor) == 0;
 }
 
@@ -1363,7 +1410,7 @@ nsStyleBackground::Layer::SetInitialValues()
   mRepeat = NS_STYLE_BG_REPEAT_XY;
   mPosition.SetInitialValues();
   mSize.SetInitialValues();
-  mImage = nsnull;
+  mImage.SetNull();
 }
 
 PRBool nsStyleBackground::Layer::operator==(const Layer& aOther) const
@@ -1374,7 +1421,99 @@ PRBool nsStyleBackground::Layer::operator==(const Layer& aOther) const
          mRepeat == aOther.mRepeat &&
          mPosition == aOther.mPosition &&
          mSize == aOther.mSize &&
-         EqualImages(mImage, aOther.mImage);
+         mImage == aOther.mImage;
+}
+
+nsStyleBackground::Image::Image()
+{
+  MOZ_COUNT_CTOR(nsStyleBackground::Image);
+  mType = eBackgroundImage_Null;
+}
+
+nsStyleBackground::Image::~Image()
+{
+  MOZ_COUNT_DTOR(nsStyleBackground::Image);
+  if (mType != eBackgroundImage_Null)
+    SetNull();
+}
+
+nsStyleBackground::Image::Image(const nsStyleBackground::Image& aOther)
+{
+  // We need our own copy constructor because we don't want
+  // to copy the reference count
+  MOZ_COUNT_CTOR(nsStyleBackground::Image);
+  DoCopy(aOther);
+}
+
+nsStyleBackground::Image&
+nsStyleBackground::Image::operator=(const nsStyleBackground::Image& aOther)
+{
+  DoCopy(aOther);
+  return *this;
+}
+
+void nsStyleBackground::Image::DoCopy(const nsStyleBackground::Image& aOther)
+{
+  if (this == &aOther)
+    return;
+
+  SetNull();
+
+  if (aOther.mType == eBackgroundImage_Image)
+    SetImageData(aOther.mImage);
+  else if (aOther.mType == eBackgroundImage_Gradient)
+    SetGradientData(aOther.mGradient);
+}
+
+void nsStyleBackground::Image::SetImageData(imgIRequest* aImage)
+{
+  NS_IF_ADDREF(aImage);
+
+  if (mType != eBackgroundImage_Null)
+    SetNull();
+
+  if (aImage) {
+    mImage = aImage;
+    mType = eBackgroundImage_Image;
+  }
+}
+
+void nsStyleBackground::Image::SetGradientData(nsStyleGradient* aGradient)
+{
+  if (aGradient)
+    aGradient->AddRef();
+
+  if (mType != eBackgroundImage_Null)
+    SetNull();
+
+  if (aGradient) {
+    mGradient = aGradient;
+    mType = eBackgroundImage_Gradient;
+  }
+}
+
+void nsStyleBackground::Image::SetNull()
+{
+  if (mType == eBackgroundImage_Gradient)
+    mGradient->Release();
+  else if (mType == eBackgroundImage_Image)
+    NS_RELEASE(mImage);
+
+  mType = eBackgroundImage_Null;
+}
+
+PRBool nsStyleBackground::Image::operator==(const Image& aOther) const
+{
+  if (mType != aOther.mType)
+    return PR_FALSE;
+
+  if (mType == eBackgroundImage_Image)
+    return EqualImages(mImage, aOther.mImage);
+
+  if (mType == eBackgroundImage_Gradient)
+    return *mGradient == *aOther.mGradient;
+
+  return PR_TRUE;
 }
 
 // --------------------
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index c8fff5e98ee..e1189bb5379 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -124,6 +124,68 @@ struct nsStyleFont {
 #endif
 };
 
+struct nsStyleGradientStop {
+  nscolor mColor;
+  float mPosition; // 0.0 - 1.0
+};
+
+class nsStyleGradient {
+public:
+  nsStyleGradient();
+
+  PRPackedBool mIsRadial;
+
+  nsStyleCoord mStartX; // percent or coord
+  nsStyleCoord mStartY; // percent or coord
+
+  nsStyleCoord mEndX; // percent or coord
+  nsStyleCoord mEndY; // percent or coord
+
+  nscoord mStartRadius;
+  nscoord mEndRadius;
+
+  // stops are in the order specified in the stylesheet
+  nsTArray<nsStyleGradientStop> mStops;
+
+  nsrefcnt AddRef() {
+    if (mRefCnt == PR_UINT32_MAX) {
+      NS_WARNING("refcount overflow, leaking nsStyleGradient");
+      return mRefCnt;
+    }
+    ++mRefCnt;
+    NS_LOG_ADDREF(this, mRefCnt, "nsStyleGradient", sizeof(*this));
+    return mRefCnt;
+  }
+
+  nsrefcnt Release() {
+    if (mRefCnt == PR_UINT32_MAX) {
+      NS_WARNING("refcount overflow, leaking nsStyleGradient");
+      return mRefCnt;
+    }
+    --mRefCnt;
+    NS_LOG_RELEASE(this, mRefCnt, "nsStyleGradient");
+    if (mRefCnt == 0) {
+      delete this;
+      return 0;
+    }
+    return mRefCnt;
+  }
+
+  PRBool operator==(const nsStyleGradient& aOther) const;
+  PRBool operator!=(const nsStyleGradient& aOther) const {
+    return !(*this == aOther);
+  };
+
+private:
+  nsrefcnt mRefCnt;
+
+  ~nsStyleGradient() {}
+
+  // Not to be implemented
+  nsStyleGradient(const nsStyleGradient& aOther);
+  nsStyleGradient& operator=(const nsStyleGradient& aOther);
+};
+
 struct nsStyleColor {
   nsStyleColor(nsPresContext* aPresContext);
   nsStyleColor(const nsStyleColor& aOther);
@@ -147,6 +209,12 @@ struct nsStyleColor {
   nscolor mColor;                 // [inherited]
 };
 
+enum nsStyleBackgroundImageType {
+  eBackgroundImage_Null,
+  eBackgroundImage_Image,
+  eBackgroundImage_Gradient
+};
+
 struct nsStyleBackground {
   nsStyleBackground();
   nsStyleBackground(const nsStyleBackground& aOther);
@@ -228,6 +296,46 @@ struct nsStyleBackground {
     }
   };
 
+  struct Image;
+  friend struct Image;
+  struct Image {
+  public:
+    Image();
+    ~Image();
+    Image(const Image& aOther);
+    Image& operator=(const Image& aOther);
+
+    void SetImageData(imgIRequest* aImage);
+    void SetGradientData(nsStyleGradient* aGradient);
+    void SetNull();
+
+    nsStyleBackgroundImageType GetType() const {
+      return mType;
+    };
+    imgIRequest* GetImageData() const {
+      NS_ASSERTION(mType == eBackgroundImage_Image, "Data is not an image!");
+      return mImage;
+    };
+    nsStyleGradient* GetGradientData() const {
+      NS_ASSERTION(mType == eBackgroundImage_Gradient, "Data is not a gradient!");
+      return mGradient;
+    };
+
+    PRBool operator==(const Image& aOther) const;
+    PRBool operator!=(const Image& aOther) const {
+      return !(*this == aOther);
+    }
+
+  private:
+    void DoCopy(const Image& aOther);
+
+    nsStyleBackgroundImageType mType;
+    union {
+      imgIRequest* mImage;
+      nsStyleGradient* mGradient;
+    };
+  };
+
   struct Layer;
   friend struct Layer;
   struct Layer {
@@ -236,7 +344,7 @@ struct nsStyleBackground {
     PRUint8 mOrigin;                    // [reset] See nsStyleConsts.h
     PRUint8 mRepeat;                    // [reset] See nsStyleConsts.h
     Position mPosition;                 // [reset]
-    nsCOMPtr<imgIRequest> mImage;       // [reset]
+    Image mImage;                       // [reset]
     Size mSize;                         // [reset]
 
     // Initializes only mImage
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 420b0955676..a9fe6599e84 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -625,7 +625,7 @@ var gCSSProperties = {
 		initial_values: [ "transparent", "none", "repeat", "scroll", "0% 0%", "top left", "left top", "transparent none", "top left none", "left top none", "none left top", "none top left", "none 0% 0%", "transparent none repeat scroll top left", "left top repeat none scroll transparent" ],
 		other_values: [
 		        /* without multiple backgrounds */
-		        "green", "none green repeat scroll left top", "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)", "repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') transparent left top scroll", "repeat-x", "repeat-y", "no-repeat", "none repeat-y transparent scroll 0% 0%", "fixed", "0% top transparent fixed repeat none", "top", "left", "50% 50%", "center", "bottom right scroll none transparent repeat", "50% transparent", "transparent 50%", "50%",
+		        "green", "none green repeat scroll left top", "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)", "repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') transparent left top scroll", "repeat-x", "repeat-y", "no-repeat", "none repeat-y transparent scroll 0% 0%", "fixed", "0% top transparent fixed repeat none", "top", "left", "50% 50%", "center", "bottom right scroll none transparent repeat", "50% transparent", "transparent 50%", "50%", "-moz-radial-gradient(10% bottom, 30px, 20px 20px, 10px, from(#ffffff), to(black)) scroll no-repeat", "-moz-linear-gradient(10px 10px, 20px 20px, from(red), to(blue)) repeat",
 		        /* multiple backgrounds */
 		        "url(404.png), url(404.png)",
 		        "url(404.png), url(404.png) transparent",
@@ -633,6 +633,7 @@ var gCSSProperties = {
 		        "repeat-x, fixed, none",
 		        "0% top url(404.png), url(404.png) 0% top",
 		        "fixed repeat-y top left url(404.png), repeat-x green",
+		        "url(404.png), -moz-linear-gradient(20px 20px, 30px 30px, from(blue), to(green)) black",
 		        /* test cases with clip+origin in the shorthand */
     // This is commented out for now until we change
     // -moz-background-clip to background-clip, -moz-background-origin
@@ -688,9 +689,30 @@ var gCSSProperties = {
 			"none, none, none, none, none",
 			"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), none",
 			"none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), none",
-			"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)"
+			"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)",
+
+            "-moz-radial-gradient(45px 60px, 10px, 52px 50px, 30px, from(red), color-stop(90%, #019f62), to(rgba(1, 159, 98, 0)))",
+            "-moz-linear-gradient(20% center, left bottom, color-stop(0, #ffff00), to(green))",
+            "-moz-radial-gradient(50% 50%, 60px, 10% 20%, 20px, to(red), from(pink), color-stop(0.94, goldenrod))",
+            "-moz-linear-gradient(20px 10px, 100px top, from(rgb(10, 100, 0)), color-stop(1, rgba(10, 20, 30, 0.4)))",
+            "-moz-radial-gradient(center top, 10px, right bottom, 20px, color-stop(0.7, green), color-stop(20%, #ccddee), from(rgb(1, 2, 3)), color-stop(0.95, #aa0012))",
+            "-moz-linear-gradient(10px 20%, -50px -10%, from(green))",
+            "-moz-linear-gradient(10px 10px, 20px 20px)",
+            "-moz-linear-gradient(10px 10px, 20px 20px, color-stop(314%, blue))",
+            "-moz-linear-gradient(10px 10px, 20px 20px, color-stop(-0.2, green))",
+            "-moz-linear-gradient( 10px  10px  , 40px 20px ,  from(blue)  )"
 		],
-		invalid_values: []
+		invalid_values: [ "-moz-linear-gradient(10px 10px, 20px, 30px 30px, 40px, from(blue), to(red))",
+                          "-moz-radial-gradient(20px 20px, 10px 10px, from(green), to(#ff00ff))",
+                          "-moz-radial-gradient(10px 10px, 20%, 40px 40px, 10px, from(green), to(#ff00ff))",
+                          "-moz-linear-gradient(10px, 20px, 30px, 40px, color-stop(0.5, #00ccff))",
+                          "-moz-linear-gradient(20px 20px, from(blue), to(red))",
+                          "-moz-linear-gradient(40px 40px, 10px 10px, from(blue) to(red) color-stop(10%, fuchsia))",
+                          "-moz-linear-gradient(20px 20px 30px, 10px 10px, from(red), to(#ff0000))",
+                          "-moz-radial-gradient(left top, center, 20px 20px, 10px, from(blue), to(red))",
+                          "-moz-linear-gradient(left left, top top, from(blue))",
+                          "-moz-linear-gradient(inherit, 10px 10px, from(blue))",
+                          "-moz-linear-gradient()" ]
 	},
 	"background-position": {
 		domProp: "backgroundPosition",
diff --git a/layout/tables/nsTablePainter.cpp b/layout/tables/nsTablePainter.cpp
index 8b1a4c2016f..b9d6b477110 100644
--- a/layout/tables/nsTablePainter.cpp
+++ b/layout/tables/nsTablePainter.cpp
@@ -202,7 +202,7 @@ TableBackgroundPainter::TableBackgroundData::ShouldSetBCBorder()
   }
 
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, mBackground) {
-    if (mBackground->mLayers[i].mImage)
+    if (mBackground->mLayers[i].mImage.GetType() != eBackgroundImage_Null)
       return PR_TRUE;
   }
   return PR_FALSE;
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 102e8a9c6c6..6e96ada345d 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -4118,7 +4118,7 @@ nsTreeBodyFrame::ScrollInternal(const ScrollParts& aParts, PRInt32 aRow)
   // See if we have a transparent background or a background image.  
   // If we do, then we cannot blit.
   const nsStyleBackground* background = GetStyleBackground();
-  if (background->BottomLayer().mImage ||
+  if (background->BottomLayer().mImage.GetType() != eBackgroundImage_Null ||
       background->mImageCount > 1 ||
       NS_GET_A(background->mBackgroundColor) < 255 ||
       PR_ABS(delta)*mRowHeight >= mRect.height) {
@@ -4175,7 +4175,7 @@ nsTreeBodyFrame::ScrollHorzInternal(const ScrollParts& aParts, PRInt32 aPosition
   // See if we have a transparent background or a background image.  
   // If we do, then we cannot blit.
   const nsStyleBackground* background = GetStyleBackground();
-  if (background->BottomLayer().mImage ||
+  if (background->BottomLayer().mImage.GetType() != eBackgroundImage_Null ||
       background->mImageCount > 1 ||
       NS_GET_A(background->mBackgroundColor) < 255 ||
       PR_ABS(delta) >= mRect.width) {

From 067fd95b76966b44679d18567a1623eaa1bf837a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 31 Jul 2009 14:35:48 +0200
Subject: [PATCH 119/175] Backed out changeset c086fca6fc55

---
 layout/base/nsCSSRendering.cpp                | 146 +++---------
 layout/base/nsCSSRendering.h                  |  11 -
 layout/base/nsDisplayList.cpp                 |   6 +-
 layout/base/nsPresContext.cpp                 |   6 +-
 layout/generic/nsFrame.cpp                    |   9 +-
 .../css-gradients/linear-keywords-ref.html    |  23 --
 .../css-gradients/linear-keywords.html        |   1 -
 .../css-gradients/linear-mix-ref.html         |  34 ---
 layout/reftests/css-gradients/linear-mix.html |   3 -
 .../css-gradients/linear-percent-ref.html     |  23 --
 .../css-gradients/linear-percent.html         |   1 -
 layout/reftests/css-gradients/linear-ref.html |  24 --
 layout/reftests/css-gradients/linear.html     |   1 -
 .../reftests/css-gradients/nostops-ref.html   |  21 --
 layout/reftests/css-gradients/nostops.html    |   1 -
 .../reftests/css-gradients/onestop-ref.html   |  22 --
 layout/reftests/css-gradients/onestop.html    |   1 -
 layout/reftests/css-gradients/radial-ref.html |  24 --
 layout/reftests/css-gradients/radial.html     |   1 -
 layout/reftests/css-gradients/reftest.list    |   8 -
 .../reftests/css-gradients/twostops-ref.html  |  23 --
 layout/reftests/css-gradients/twostops.html   |   1 -
 layout/reftests/reftest.list                  |   3 -
 layout/style/nsCSSDeclaration.cpp             |  44 ----
 layout/style/nsCSSParser.cpp                  | 215 ++----------------
 layout/style/nsCSSValue.cpp                   |  64 +-----
 layout/style/nsCSSValue.h                     | 137 +----------
 layout/style/nsComputedDOMStyle.cpp           | 117 +---------
 layout/style/nsComputedDOMStyle.h             |   3 -
 layout/style/nsRuleNode.cpp                   |  98 +-------
 layout/style/nsStyleStruct.cpp                | 147 +-----------
 layout/style/nsStyleStruct.h                  | 110 +--------
 layout/style/test/property_database.js        |  28 +--
 layout/tables/nsTablePainter.cpp              |   2 +-
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |   4 +-
 35 files changed, 84 insertions(+), 1278 deletions(-)
 delete mode 100644 layout/reftests/css-gradients/linear-keywords-ref.html
 delete mode 100644 layout/reftests/css-gradients/linear-keywords.html
 delete mode 100644 layout/reftests/css-gradients/linear-mix-ref.html
 delete mode 100644 layout/reftests/css-gradients/linear-mix.html
 delete mode 100644 layout/reftests/css-gradients/linear-percent-ref.html
 delete mode 100644 layout/reftests/css-gradients/linear-percent.html
 delete mode 100644 layout/reftests/css-gradients/linear-ref.html
 delete mode 100644 layout/reftests/css-gradients/linear.html
 delete mode 100644 layout/reftests/css-gradients/nostops-ref.html
 delete mode 100644 layout/reftests/css-gradients/nostops.html
 delete mode 100644 layout/reftests/css-gradients/onestop-ref.html
 delete mode 100644 layout/reftests/css-gradients/onestop.html
 delete mode 100644 layout/reftests/css-gradients/radial-ref.html
 delete mode 100644 layout/reftests/css-gradients/radial.html
 delete mode 100644 layout/reftests/css-gradients/reftest.list
 delete mode 100644 layout/reftests/css-gradients/twostops-ref.html
 delete mode 100644 layout/reftests/css-gradients/twostops.html

diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 034e57bc7b6..ded69d92211 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1513,12 +1513,9 @@ DetermineBackgroundColorInternal(nsPresContext* aPresContext,
     aDrawBackgroundColor = aPresContext->GetBackgroundColorDraw();
   }
 
-  if (aBackground.BottomLayer().mImage.GetType() == eBackgroundImage_Image) {
-    aBottomImage = aBackground.BottomLayer().mImage.GetImageData();
-    if (!aDrawBackgroundImage || !HaveCompleteBackgroundImage(aBottomImage)) {
-      aBottomImage = nsnull;
-    }
-  } else {
+  aBottomImage = aBackground.BottomLayer().mImage;
+
+  if (!aDrawBackgroundImage || !HaveCompleteBackgroundImage(aBottomImage)) {
     aBottomImage = nsnull;
   }
 
@@ -1558,84 +1555,6 @@ nsCSSRendering::DetermineBackgroundColor(nsPresContext* aPresContext,
                                           bottomImage);
 }
 
-static gfxFloat
-ConvertGradientValueToPixels(const nsStyleCoord& aCoord,
-                             nscoord aFillLength,
-                             nscoord aAppUnitsPerPixel)
-{
-  switch (aCoord.GetUnit()) {
-    case eStyleUnit_Percent:
-      return aCoord.GetPercentValue() * aFillLength / aAppUnitsPerPixel;
-    case eStyleUnit_Coord:
-      return aCoord.GetCoordValue() / aAppUnitsPerPixel;
-    default:
-      NS_WARNING("Unexpected coord unit");
-      return 0;
-  }
-}
-
-void
-nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
-                              nsIRenderingContext& aRenderingContext,
-                              nsStyleGradient* aGradient,
-                              const nsRect& aDirtyRect,
-                              const nsRect& aOneCellArea,
-                              const nsRect& aFillArea,
-                              PRBool aRepeat)
-{
-  gfxContext *ctx = aRenderingContext.ThebesContext();
-  nscoord appUnitsPerPixel = aPresContext->AppUnitsPerDevPixel();
-
-  gfxRect dirtyRect = RectToGfxRect(aDirtyRect, appUnitsPerPixel);
-  gfxRect areaToFill = RectToGfxRect(aFillArea, appUnitsPerPixel);
-  gfxRect oneCellArea = RectToGfxRect(aOneCellArea, appUnitsPerPixel);
-  gfxPoint fillOrigin = oneCellArea.TopLeft();
-
-  areaToFill = areaToFill.Intersect(dirtyRect);
-  if (areaToFill.IsEmpty())
-    return;
-
-  gfxFloat gradX0 = ConvertGradientValueToPixels(aGradient->mStartX,
-                        aOneCellArea.width, appUnitsPerPixel);
-  gfxFloat gradY0 = ConvertGradientValueToPixels(aGradient->mStartY,
-                        aOneCellArea.height, appUnitsPerPixel);
-  gfxFloat gradX1 = ConvertGradientValueToPixels(aGradient->mEndX,
-                        aOneCellArea.width, appUnitsPerPixel);
-  gfxFloat gradY1 = ConvertGradientValueToPixels(aGradient->mEndY,
-                        aOneCellArea.height, appUnitsPerPixel);
-
-  nsRefPtr<gfxPattern> gradientPattern;
-  if (aGradient->mIsRadial) {
-    gfxFloat gradRadius0 = double(aGradient->mStartRadius) / appUnitsPerPixel;
-    gfxFloat gradRadius1 = double(aGradient->mEndRadius) / appUnitsPerPixel;
-    gradientPattern = new gfxPattern(gradX0, gradY0, gradRadius0,
-                                     gradX1, gradY1, gradRadius1);
-  } else {
-    gradientPattern = new gfxPattern(gradX0, gradY0, gradX1, gradY1);
-  }
-
-  if (!gradientPattern || gradientPattern->CairoStatus())
-    return;
-
-  for (PRUint32 i = 0; i < aGradient->mStops.Length(); i++) {
-    gradientPattern->AddColorStop(aGradient->mStops[i].mPosition,
-                                  gfxRGBA(aGradient->mStops[i].mColor));
-  }
-
-  if (aRepeat)
-    gradientPattern->SetExtend(gfxPattern::EXTEND_REPEAT);
-
-  ctx->Save();
-  ctx->NewPath();
-  // The fill origin is part of the translate call so the pattern starts at
-  // the desired point, rather than (0,0).
-  ctx->Translate(fillOrigin);
-  ctx->SetPattern(gradientPattern);
-  ctx->Rectangle(areaToFill - fillOrigin, PR_TRUE);
-  ctx->Fill();
-  ctx->Restore();
-}
-
 void
 nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
                                       nsIRenderingContext& aRenderingContext,
@@ -1892,6 +1811,26 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
    *   background-repeat
    */
 
+  // Lookup the image
+  imgIRequest *req = aLayer.mImage;
+  if (!HaveCompleteBackgroundImage(req))
+    return;
+
+  nsCOMPtr<imgIContainer> image;
+  req->GetImage(getter_AddRefs(image));
+  req = nsnull;
+
+  nsIntSize imageIntSize;
+  image->GetWidth(&imageIntSize.width);
+  image->GetHeight(&imageIntSize.height);
+
+  nsSize imageSize;
+  imageSize.width = nsPresContext::CSSPixelsToAppUnits(imageIntSize.width);
+  imageSize.height = nsPresContext::CSSPixelsToAppUnits(imageIntSize.height);
+
+  if (imageSize.width == 0 || imageSize.height == 0)
+    return;
+
   // relative to aBorderArea
   nsRect bgPositioningArea(0, 0, 0, 0);
 
@@ -1946,32 +1885,6 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
     }
   }
 
-  nsSize imageSize;
-  nsCOMPtr<imgIContainer> image;
-  if (aLayer.mImage.GetType() == eBackgroundImage_Image) {
-    // Lookup the image
-    imgIRequest *req = aLayer.mImage.GetImageData();
-    if (!HaveCompleteBackgroundImage(req))
-      return;
-
-    req->GetImage(getter_AddRefs(image));
-    req = nsnull;
-
-    nsIntSize imageIntSize;
-    image->GetWidth(&imageIntSize.width);
-    image->GetHeight(&imageIntSize.height);
-
-    imageSize.width = nsPresContext::CSSPixelsToAppUnits(imageIntSize.width);
-    imageSize.height = nsPresContext::CSSPixelsToAppUnits(imageIntSize.height);
-  } else if (aLayer.mImage.GetType() == eBackgroundImage_Gradient) {
-    imageSize = bgPositioningArea.Size();
-  } else {
-    return;
-  }
-
-  if (imageSize.width == 0 || imageSize.height == 0)
-    return;
-
   // Compute the anchor point.
   //
   // relative to aBorderArea.TopLeft() (which is where the top-left
@@ -2081,16 +1994,9 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
   }
   fillArea.IntersectRect(fillArea, aBGClipRect);
 
-  if (aLayer.mImage.GetType() == eBackgroundImage_Image) {
-    nsLayoutUtils::DrawImage(&aRenderingContext, image,
-        nsLayoutUtils::GetGraphicsFilterForFrame(aForFrame),
-        destArea, fillArea, anchor + aBorderArea.TopLeft(), aDirtyRect);
-  } else {
-    nsCSSRendering::PaintGradient(aPresContext, aRenderingContext,
-                  aLayer.mImage.GetGradientData(),
-                  aDirtyRect, destArea, fillArea,
-                  (repeat != NS_STYLE_BG_REPEAT_OFF));
-  }
+  nsLayoutUtils::DrawImage(&aRenderingContext, image,
+      nsLayoutUtils::GetGraphicsFilterForFrame(aForFrame),
+      destArea, fillArea, anchor + aBorderArea.TopLeft(), aDirtyRect);
 }
 
 static void
diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index ac3e9e1c885..a672f26e26e 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -127,17 +127,6 @@ struct nsCSSRendering {
                          const nsRect& aFocusRect,
                          nscolor aColor);
 
-  /**
-   * Render a gradient for an element.
-   */
-  static void PaintGradient(nsPresContext* aPresContext,
-                            nsIRenderingContext& aRenderingContext,
-                            nsStyleGradient* aGradient,
-                            const nsRect& aDirtyRect,
-                            const nsRect& aOneCellArea,
-                            const nsRect& aFillArea,
-                            PRBool aRepeat);
-
   /**
    * Gets the root frame for the frame
    */
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 24081535f5c..a6c82474f82 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -562,9 +562,9 @@ nsDisplayBackground::IsOpaque(nsDisplayListBuilder* aBuilder) {
     return PR_TRUE;
 
   if (bottomLayer.mRepeat == NS_STYLE_BG_REPEAT_XY) {
-    if (bottomLayer.mImage.GetType() == eBackgroundImage_Image) {
+    if (bottomLayer.mImage) {
       nsCOMPtr<imgIContainer> container;
-      bottomLayer.mImage.GetImageData()->GetImage(getter_AddRefs(container));
+      bottomLayer.mImage->GetImage(getter_AddRefs(container));
       if (container) {
         PRBool animated;
         container->GetAnimated(&animated);
@@ -591,7 +591,7 @@ nsDisplayBackground::IsUniform(nsDisplayListBuilder* aBuilder) {
     nsCSSRendering::FindBackground(mFrame->PresContext(), mFrame, &bg);
   if (!hasBG)
     return PR_TRUE;
-  if (bg->BottomLayer().mImage.GetType() == eBackgroundImage_Null &&
+  if (!bg->BottomLayer().mImage &&
       bg->mImageCount == 1 &&
       !nsLayoutUtils::HasNonZeroCorner(mFrame->GetStyleBorder()->mBorderRadius) &&
       bg->BottomLayer().mClip == NS_STYLE_BG_CLIP_BORDER)
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 04762d35f0e..a1ba13754e7 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1268,10 +1268,8 @@ nsPresContext::SetupBackgroundImageLoaders(nsIFrame* aFrame,
 {
   nsRefPtr<nsImageLoader> loaders;
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, aStyleBackground) {
-    if (aStyleBackground->mLayers[i].mImage.GetType() == eBackgroundImage_Image) {
-      imgIRequest *image = aStyleBackground->mLayers[i].mImage.GetImageData();
-      loaders = nsImageLoader::Create(aFrame, image, PR_FALSE, loaders);
-    }
+    imgIRequest *image = aStyleBackground->mLayers[i].mImage;
+    loaders = nsImageLoader::Create(aFrame, image, PR_FALSE, loaders);
   }
   SetImageLoaders(aFrame, BACKGROUND_IMAGE, loaders);
 }
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 285d934cea5..7a6f377008f 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -532,8 +532,11 @@ nsFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
     const nsStyleBackground *oldBG = aOldStyleContext->GetStyleBackground();
     const nsStyleBackground *newBG = GetStyleBackground();
     NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, oldBG) {
-      if (i >= newBG->mImageCount ||
-          oldBG->mLayers[i].mImage != newBG->mLayers[i].mImage) {
+      imgIRequest *oldImage = oldBG->mLayers[i].mImage;
+      imgIRequest *newImage = i < newBG->mImageCount
+                                ? newBG->mLayers[i].mImage.get()
+                                : nsnull;
+      if (oldImage && !EqualImages(oldImage, newImage)) {
         // stop the image loading for the frame, the image has changed
         PresContext()->SetImageLoaders(this,
           nsPresContext::BACKGROUND_IMAGE, nsnull);
@@ -4089,7 +4092,7 @@ nsIFrame::CheckInvalidateSizeChange(const nsRect& aOldRect,
   const nsStyleBackground *bg = GetStyleBackground();
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, bg) {
     const nsStyleBackground::Layer &layer = bg->mLayers[i];
-    if (layer.mImage.GetType() != eBackgroundImage_Null &&
+    if (layer.mImage &&
         (layer.mPosition.mXIsPercent || layer.mPosition.mYIsPercent)) {
       Invalidate(nsRect(0, 0, aOldRect.width, aOldRect.height));
       return;
diff --git a/layout/reftests/css-gradients/linear-keywords-ref.html b/layout/reftests/css-gradients/linear-keywords-ref.html
deleted file mode 100644
index 867e42675f4..00000000000
--- a/layout/reftests/css-gradients/linear-keywords-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      class="reftest-wait">
-<head>
-<script>
-function doDraw() {
-  var ctx = document.getElementById('canvas').getContext('2d');
-
-  var grad = ctx.createLinearGradient(0,0,150,300);
-  grad.addColorStop(0, '#0000ff');
-  grad.addColorStop(1, '#000000');
-
-  ctx.fillStyle = grad;
-  ctx.fillRect(0,0,300,300);
-
-  document.documentElement.removeAttribute('class');
-}
-</script>
-</head>
-<body onload="doDraw();">
-<canvas id="canvas" width="300" height="300"/>
-</body>
-</html>
-
diff --git a/layout/reftests/css-gradients/linear-keywords.html b/layout/reftests/css-gradients/linear-keywords.html
deleted file mode 100644
index 2f1223fdcbd..00000000000
--- a/layout/reftests/css-gradients/linear-keywords.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="background: -moz-linear-gradient(left top, center bottom, from(#0000ff), to(#000000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/linear-mix-ref.html b/layout/reftests/css-gradients/linear-mix-ref.html
deleted file mode 100644
index cab59addfa0..00000000000
--- a/layout/reftests/css-gradients/linear-mix-ref.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      class="reftest-wait">
-<head>
-<script>
-function doDraw() {
-  var ctx = document.getElementById('canvas').getContext('2d');
-
-  var grad = ctx.createLinearGradient(150,20,270,130);
-  grad.addColorStop(0, '#0000ff');
-  grad.addColorStop(1, '#000000');
-
-  ctx.fillStyle = grad;
-  ctx.fillRect(0,0,300,300);
-
-  ctx = document.getElementById('canvas2').getContext('2d');
-
-  grad = ctx.createLinearGradient(30,300,300,50);
-  grad.addColorStop(0, '#00ff00');
-  grad.addColorStop(1, '#000000');
-
-  ctx.fillStyle = grad;
-  ctx.fillRect(0,0,300,300);
-
-  document.documentElement.removeAttribute('class');
-}
-</script>
-</head>
-<body onload="doDraw();">
-<canvas id="canvas" width="300" height="300"></canvas>
-<br/><br/>
-<canvas id="canvas2" width="300" height="300"></canvas>
-</body>
-</html>
-
diff --git a/layout/reftests/css-gradients/linear-mix.html b/layout/reftests/css-gradients/linear-mix.html
deleted file mode 100644
index 1bce8ba993f..00000000000
--- a/layout/reftests/css-gradients/linear-mix.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div style="background: -moz-linear-gradient(center 20px, 90% 130px, from(#0000ff), to(#000000)) no-repeat; width: 300px; height: 300px;"><br></div>
-<br>
-<div style="background: -moz-linear-gradient(10% bottom, right 50px, from(#00ff00), to(#000000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/linear-percent-ref.html b/layout/reftests/css-gradients/linear-percent-ref.html
deleted file mode 100644
index b1bf73d897f..00000000000
--- a/layout/reftests/css-gradients/linear-percent-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      class="reftest-wait">
-<head>
-<script>
-function doDraw() {
-  var ctx = document.getElementById('canvas').getContext('2d');
-
-  var grad = ctx.createLinearGradient(30,60,240,270);
-  grad.addColorStop(0, '#0000ff');
-  grad.addColorStop(1, '#000000');
-
-  ctx.fillStyle = grad;
-  ctx.fillRect(0,0,300,300);
-
-  document.documentElement.removeAttribute('class');
-}
-</script>
-</head>
-<body onload="doDraw();">
-<canvas id="canvas" width="300" height="300"/>
-</body>
-</html>
-
diff --git a/layout/reftests/css-gradients/linear-percent.html b/layout/reftests/css-gradients/linear-percent.html
deleted file mode 100644
index d2f6eb1eee8..00000000000
--- a/layout/reftests/css-gradients/linear-percent.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="background: -moz-linear-gradient(10% 20%, 80% 90%, from(#0000ff), to(#000000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/linear-ref.html b/layout/reftests/css-gradients/linear-ref.html
deleted file mode 100644
index fe1d6fdd922..00000000000
--- a/layout/reftests/css-gradients/linear-ref.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      class="reftest-wait">
-<head>
-<script>
-function doDraw() {
-  var ctx = document.getElementById('canvas').getContext('2d');
-
-  var grad = ctx.createLinearGradient(10,20,50,100);
-  grad.addColorStop(0, 'red');
-  grad.addColorStop(1, 'rgb(100, 200, 0)');
-  grad.addColorStop(0.5, '#7777FF');
-
-  ctx.fillStyle = grad;
-  ctx.fillRect(0,0,300,300);
-
-  document.documentElement.removeAttribute('class');
-}
-</script>
-</head>
-<body onload="doDraw();">
-<canvas id="canvas" width="300" height="300"/>
-</body>
-</html>
-
diff --git a/layout/reftests/css-gradients/linear.html b/layout/reftests/css-gradients/linear.html
deleted file mode 100644
index 83dd41238e7..00000000000
--- a/layout/reftests/css-gradients/linear.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="background: -moz-linear-gradient(10px 20px, 50px 100px, from(red), to(rgb(100, 200, 0)), color-stop(0.5, #7777FF)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/nostops-ref.html b/layout/reftests/css-gradients/nostops-ref.html
deleted file mode 100644
index 4aa8b1e704c..00000000000
--- a/layout/reftests/css-gradients/nostops-ref.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      class="reftest-wait">
-<head>
-<script>
-function doDraw() {
-  var ctx = document.getElementById('canvas').getContext('2d');
-
-  var grad = ctx.createLinearGradient(0,0,150,300);
-
-  ctx.fillStyle = grad;
-  ctx.fillRect(0,0,300,300);
-
-  document.documentElement.removeAttribute('class');
-}
-</script>
-</head>
-<body onload="doDraw();">
-<canvas id="canvas" width="300" height="300"/>
-</body>
-</html>
-
diff --git a/layout/reftests/css-gradients/nostops.html b/layout/reftests/css-gradients/nostops.html
deleted file mode 100644
index d0a78e66202..00000000000
--- a/layout/reftests/css-gradients/nostops.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="background: -moz-linear-gradient(left top, center bottom) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/onestop-ref.html b/layout/reftests/css-gradients/onestop-ref.html
deleted file mode 100644
index 99c384ffce4..00000000000
--- a/layout/reftests/css-gradients/onestop-ref.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      class="reftest-wait">
-<head>
-<script>
-function doDraw() {
-  var ctx = document.getElementById('canvas').getContext('2d');
-
-  var grad = ctx.createLinearGradient(0,0,150,300);
-  grad.addColorStop(0.5, '#0000ff');
-
-  ctx.fillStyle = grad;
-  ctx.fillRect(0,0,300,300);
-
-  document.documentElement.removeAttribute('class');
-}
-</script>
-</head>
-<body onload="doDraw();">
-<canvas id="canvas" width="300" height="300"/>
-</body>
-</html>
-
diff --git a/layout/reftests/css-gradients/onestop.html b/layout/reftests/css-gradients/onestop.html
deleted file mode 100644
index 498ba5cde06..00000000000
--- a/layout/reftests/css-gradients/onestop.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="background: -moz-linear-gradient(left top, center bottom, color-stop(0.5, #0000ff)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/radial-ref.html b/layout/reftests/css-gradients/radial-ref.html
deleted file mode 100644
index 10473c7aa79..00000000000
--- a/layout/reftests/css-gradients/radial-ref.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      class="reftest-wait">
-<head>
-<script>
-function doDraw() {
-  var ctx = document.getElementById('canvas').getContext('2d');
-
-  var radgrad = ctx.createRadialGradient(45,45,10,52,50,30);
-  radgrad.addColorStop(0, '#A7D30C');
-  radgrad.addColorStop(0.9, '#019F62');
-  radgrad.addColorStop(1, 'rgba(1,159,98,0)');
-
-  ctx.fillStyle = radgrad;
-  ctx.fillRect(0,0,150,150);
-
-  document.documentElement.removeAttribute('class');
-}
-</script>
-</head>
-<body onload="doDraw();">
-<canvas id="canvas" width="300" height="300"/>
-</body>
-</html>
-
diff --git a/layout/reftests/css-gradients/radial.html b/layout/reftests/css-gradients/radial.html
deleted file mode 100644
index 019196d1933..00000000000
--- a/layout/reftests/css-gradients/radial.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="background: -moz-radial-gradient(45px 45px, 10px, 52px 50px, 30px, from(#a7d30c), color-stop(90%, #019f62), to(rgba(1, 159, 98, 0))) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list
deleted file mode 100644
index 30c30917aa4..00000000000
--- a/layout/reftests/css-gradients/reftest.list
+++ /dev/null
@@ -1,8 +0,0 @@
-== linear.html linear-ref.html
-== radial.html radial-ref.html
-== linear-keywords.html linear-keywords-ref.html
-== linear-percent.html linear-percent-ref.html
-== linear-mix.html linear-mix-ref.html
-== nostops.html nostops-ref.html
-== onestop.html onestop-ref.html
-== twostops.html twostops-ref.html
diff --git a/layout/reftests/css-gradients/twostops-ref.html b/layout/reftests/css-gradients/twostops-ref.html
deleted file mode 100644
index 9a4624728a2..00000000000
--- a/layout/reftests/css-gradients/twostops-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      class="reftest-wait">
-<head>
-<script>
-function doDraw() {
-  var ctx = document.getElementById('canvas').getContext('2d');
-
-  var grad = ctx.createLinearGradient(0,0,150,300);
-  grad.addColorStop(0.5, '#0000ff');
-  grad.addColorStop(0.5, '#ff0000');
-
-  ctx.fillStyle = grad;
-  ctx.fillRect(0,0,300,300);
-
-  document.documentElement.removeAttribute('class');
-}
-</script>
-</head>
-<body onload="doDraw();">
-<canvas id="canvas" width="300" height="300"/>
-</body>
-</html>
-
diff --git a/layout/reftests/css-gradients/twostops.html b/layout/reftests/css-gradients/twostops.html
deleted file mode 100644
index f4f51727b43..00000000000
--- a/layout/reftests/css-gradients/twostops.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style="background: -moz-linear-gradient(left top, center bottom, color-stop(0.5, #0000ff), color-stop(0.5, #ff0000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index 6f21e928c67..dcd15fc36ef 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -41,9 +41,6 @@ include css-import/reftest.list
 # css character encoding tests
 include css-charset/reftest.list
 
-# css gradients
-include css-gradients/reftest.list
-
 # css media queries (tests for print mode)
 include css-mediaqueries/reftest.list
 
diff --git a/layout/style/nsCSSDeclaration.cpp b/layout/style/nsCSSDeclaration.cpp
index 870076f0351..4eebd5bf336 100644
--- a/layout/style/nsCSSDeclaration.cpp
+++ b/layout/style/nsCSSDeclaration.cpp
@@ -413,49 +413,6 @@ nsCSSDeclaration::AppendCSSValueToString(nsCSSProperty aProperty,
     tmpStr.AppendFloat(aValue.GetFloatValue());
     aResult.Append(tmpStr);
   }
-  else if (eCSSUnit_Gradient == unit) {
-    nsCSSValueGradient* gradient = aValue.GetGradientValue();
-
-    if (gradient->mIsRadial)
-      aResult.AppendLiteral("-moz-radial-gradient(");
-    else
-      aResult.AppendLiteral("-moz-linear-gradient(");
-
-    AppendCSSValueToString(eCSSProperty_background_position,
-                           gradient->mStartX, aResult);
-    aResult.AppendLiteral(" ");
-
-    AppendCSSValueToString(eCSSProperty_background_position,
-                           gradient->mStartY, aResult);
-    aResult.AppendLiteral(", ");
-
-    if (gradient->mIsRadial) {
-      AppendCSSValueToString(aProperty, gradient->mStartRadius, aResult);
-      aResult.AppendLiteral(", ");
-    }
-
-    AppendCSSValueToString(eCSSProperty_background_position,
-                           gradient->mEndX, aResult);
-    aResult.AppendLiteral(" ");
-
-    AppendCSSValueToString(eCSSProperty_background_position,
-                           gradient->mEndY, aResult);
-
-    if (gradient->mIsRadial) {
-      aResult.AppendLiteral(", ");
-      AppendCSSValueToString(aProperty, gradient->mEndRadius, aResult);
-    }
-
-    for (PRUint32 i = 0; i < gradient->mStops.Length(); i++) {
-      aResult.AppendLiteral(", color-stop(");
-      AppendCSSValueToString(aProperty, gradient->mStops[i].mLocation, aResult);
-      aResult.AppendLiteral(", ");
-      AppendCSSValueToString(aProperty, gradient->mStops[i].mColor, aResult);
-      aResult.AppendLiteral(")");
-    }
-
-    aResult.AppendLiteral(")");
-  }
 
   switch (unit) {
     case eCSSUnit_Null:         break;
@@ -489,7 +446,6 @@ nsCSSDeclaration::AppendCSSValueToString(nsCSSProperty aProperty,
     case eCSSUnit_Color:        break;
     case eCSSUnit_Percent:      aResult.Append(PRUnichar('%'));    break;
     case eCSSUnit_Number:       break;
-    case eCSSUnit_Gradient:     break;
 
     case eCSSUnit_Inch:         aResult.AppendLiteral("in");   break;
     case eCSSUnit_Millimeter:   aResult.AppendLiteral("mm");   break;
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 6ca629c2fc5..ea13346b31f 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -66,6 +66,7 @@
 #include "nsIAtom.h"
 #include "nsCOMArray.h"
 #include "nsColor.h"
+#include "nsStyleConsts.h"
 #include "nsCSSPseudoClasses.h"
 #include "nsCSSPseudoElements.h"
 #include "nsCSSAnonBoxes.h"
@@ -106,7 +107,6 @@
 #define VARIANT_NONE            0x040000  // O
 #define VARIANT_NORMAL          0x080000  // M
 #define VARIANT_SYSFONT         0x100000  // eCSSUnit_System_Font
-#define VARIANT_GRADIENT        0x200000  // eCSSUnit_Gradient
 
 // Common combinations of variants
 #define VARIANT_AL   (VARIANT_AUTO | VARIANT_LENGTH)
@@ -422,7 +422,7 @@ protected:
 
   PRBool ParseBackgroundList(nsCSSProperty aPropID); // a single value prop-id
   PRBool ParseBackgroundPosition();
-  PRBool ParseBoxPositionValues(nsCSSValuePair& aOut, PRBool aAcceptsInherit);
+  PRBool ParseBoxPositionValues(nsCSSValuePair& aOut);
   PRBool ParseBackgroundSize();
   PRBool ParseBackgroundSizeValues(nsCSSValuePair& aOut);
   PRBool ParseBorderColor();
@@ -510,8 +510,6 @@ protected:
   PRBool ParseURL(nsCSSValue& aValue);
   PRBool TranslateDimension(nsCSSValue& aValue, PRInt32 aVariantMask,
                             float aNumber, const nsString& aUnit);
-  PRBool ParseGradientStop(nsCSSValueGradient* aGradient);
-  PRBool ParseGradient(nsCSSValue& aValue, PRBool aIsRadial);
 
   void SetParsingCompoundProperty(PRBool aBool) {
     NS_ASSERTION(aBool == PR_TRUE || aBool == PR_FALSE, "bad PRBool value");
@@ -4515,15 +4513,6 @@ CSSParserImpl::ParseVariant(nsCSSValue& aValue,
     }
     return PR_FALSE;
   }
-  if ((aVariantMask & VARIANT_GRADIENT) != 0 &&
-      eCSSToken_Function == tk->mType) {
-    // a generated gradient
-    if (tk->mIdent.LowerCaseEqualsLiteral("-moz-linear-gradient"))
-      return ParseGradient(aValue, PR_FALSE);
-
-    if (tk->mIdent.LowerCaseEqualsLiteral("-moz-radial-gradient"))
-      return ParseGradient(aValue, PR_TRUE);
-  }
   if ((aVariantMask & VARIANT_COLOR) != 0) {
     if ((mNavQuirkMode && !IsParsingCompoundProperty()) || // NONSTANDARD: Nav interprets 'xxyyzz' values even without '#' prefix
         (eCSSToken_ID == tk->mType) ||
@@ -4773,181 +4762,6 @@ CSSParserImpl::ParseURL(nsCSSValue& aValue)
   return PR_TRUE;
 }
 
-PRBool
-CSSParserImpl::ParseGradientStop(nsCSSValueGradient* aGradient)
-{
-  if (!GetToken(PR_TRUE))
-    return PR_FALSE;
-
-  if (eCSSToken_Function != mToken.mType) {
-    UngetToken();
-    return PR_FALSE;
-  }
-
-  if (mToken.mIdent.LowerCaseEqualsLiteral("from")) {
-    // Start of the gradient
-    if (!ExpectSymbol('(', PR_FALSE)) {
-      NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
-    }
-
-    nsCSSValue fromFloat(0.0f, eCSSUnit_Percent);
-    nsCSSValue fromColor;
-    if (!ParseVariant(fromColor, VARIANT_COLOR, nsnull)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-
-    if (!ExpectSymbol(')', PR_TRUE)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-
-    aGradient->mStops.AppendElement(nsCSSValueGradientStop(fromFloat, fromColor));
-    return PR_TRUE;
-  }
-
-  if (mToken.mIdent.LowerCaseEqualsLiteral("to")) {
-    // End of the gradient
-    if (!ExpectSymbol('(', PR_FALSE)) {
-      NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
-    }
-
-    nsCSSValue toFloat(1.0f, eCSSUnit_Percent);
-    nsCSSValue toColor;
-    if (!ParseVariant(toColor, VARIANT_COLOR, nsnull)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-
-    if (!ExpectSymbol(')', PR_TRUE)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-
-    aGradient->mStops.AppendElement(nsCSSValueGradientStop(toFloat, toColor));
-    return PR_TRUE;
-  }
-
-  if (mToken.mIdent.LowerCaseEqualsLiteral("color-stop")) {
-    // Some kind of gradient stop, somewhere...
-    if (!ExpectSymbol('(', PR_FALSE)) {
-      NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
-    }
-
-    nsCSSValue stopFloat;
-    if (!ParseVariant(stopFloat, VARIANT_PERCENT | VARIANT_NUMBER, nsnull)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-
-    // Check for a sane position value, and clamp it if it isn't
-    if (stopFloat.GetUnit() == eCSSUnit_Percent) {
-      if (stopFloat.GetPercentValue() > 1.0)
-        stopFloat.SetPercentValue(1.0);
-      else if (stopFloat.GetPercentValue() < 0.0)
-        stopFloat.SetPercentValue(0.0);
-    } else {
-      if (stopFloat.GetFloatValue() > 1.0)
-        stopFloat.SetFloatValue(1.0, eCSSUnit_Number);
-      else if (stopFloat.GetFloatValue() < 0.0)
-        stopFloat.SetFloatValue(0.0, eCSSUnit_Number);
-    }
-
-    if (!ExpectSymbol(',', PR_TRUE)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-
-    nsCSSValue stopColor;
-    if (!ParseVariant(stopColor, VARIANT_COLOR, nsnull)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-
-    if (!ExpectSymbol(')', PR_TRUE)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-
-    aGradient->mStops.AppendElement(nsCSSValueGradientStop(stopFloat, stopColor));
-    return PR_TRUE;
-  }
-
-  // No idea what this is
-  return PR_FALSE;
-}
-
-PRBool
-CSSParserImpl::ParseGradient(nsCSSValue& aValue,
-                             PRBool aIsRadial)
-{
-  if (!ExpectSymbol('(', PR_FALSE)) {
-    NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
-  }
-
-  nsCSSValuePair startPos;
-  if (!ParseBoxPositionValues(startPos, PR_FALSE))
-    return PR_FALSE;
-
-  if (!ExpectSymbol(',', PR_TRUE)) {
-    SkipUntil(')');
-    return PR_FALSE;
-  }
-
-  nsCSSValue startRadius;
-  if (aIsRadial) {
-    if (!ParseNonNegativeVariant(startRadius, VARIANT_LENGTH, nsnull)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-
-    if (!ExpectSymbol(',', PR_TRUE)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-  }
-
-  nsCSSValuePair endPos;
-  if (!ParseBoxPositionValues(endPos, PR_FALSE)) {
-    SkipUntil(')');
-    return PR_FALSE;
-  }
-
-  nsCSSValue endRadius;
-  if (aIsRadial) {
-    if (!ExpectSymbol(',', PR_TRUE)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-
-    if (!ParseNonNegativeVariant(endRadius, VARIANT_LENGTH, nsnull)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-  }
-
-  nsRefPtr<nsCSSValueGradient> cssGradient =
-    new nsCSSValueGradient(aIsRadial, startPos.mXValue, startPos.mYValue,
-                           startRadius, endPos.mXValue, endPos.mYValue,
-                           endRadius);
-
-  // Do optional stop functions
-  while (ExpectSymbol(',', PR_TRUE)) {
-    if (!ParseGradientStop(cssGradient)) {
-      SkipUntil(')');
-      return PR_FALSE;
-    }
-  }
-
-  if (!ExpectSymbol(')', PR_TRUE)) {
-    SkipUntil(')');
-    return PR_FALSE;
-  }
-
-  aValue.SetGradientValue(cssGradient);
-  return PR_TRUE;
-}
-
 PRInt32
 CSSParserImpl::ParseChoice(nsCSSValue aValues[],
                            const nsCSSProperty aPropIDs[], PRInt32 aNumIDs)
@@ -5607,7 +5421,7 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
     return ParseVariant(aValue, VARIANT_HC, nsnull);
   case eCSSProperty_background_image:
     // Used only internally.
-    return ParseVariant(aValue, VARIANT_HUO | VARIANT_GRADIENT, nsnull);
+    return ParseVariant(aValue, VARIANT_HUO, nsnull);
   case eCSSProperty__moz_background_inline_policy:
     return ParseVariant(aValue, VARIANT_HK,
                         nsCSSProps::kBackgroundInlinePolicyKTable);
@@ -6341,7 +6155,7 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
         if (havePosition)
           return PR_FALSE;
         havePosition = PR_TRUE;
-        if (!ParseBoxPositionValues(aItem.mPosition, PR_FALSE)) {
+        if (!ParseBoxPositionValues(aItem.mPosition)) {
           return PR_FALSE;
         }
 #if 0
@@ -6388,9 +6202,7 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
         aItem.mLastItem = PR_TRUE;
       }
     } else if (eCSSToken_Function == tt &&
-               (mToken.mIdent.LowerCaseEqualsLiteral("url") ||
-                mToken.mIdent.LowerCaseEqualsLiteral("-moz-linear-gradient") ||
-                mToken.mIdent.LowerCaseEqualsLiteral("-moz-radial-gradient"))) {
+               mToken.mIdent.LowerCaseEqualsLiteral("url")) {
       if (haveImage)
         return PR_FALSE;
       haveImage = PR_TRUE;
@@ -6402,7 +6214,7 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
       if (havePosition)
         return PR_FALSE;
       havePosition = PR_TRUE;
-      if (!ParseBoxPositionValues(aItem.mPosition, PR_FALSE)) {
+      if (!ParseBoxPositionValues(aItem.mPosition)) {
         return PR_FALSE;
       }
     } else {
@@ -6473,11 +6285,15 @@ CSSParserImpl::ParseBackgroundPosition()
   nsCSSValuePair valuePair;
   nsCSSValuePairList *head = nsnull, **tail = &head;
   for (;;) {
-    if (!ParseBoxPositionValues(valuePair, !head)) {
+    if (!ParseBoxPositionValues(valuePair)) {
       break;
     }
     PRBool inheritOrInitial = valuePair.mXValue.GetUnit() == eCSSUnit_Inherit ||
                               valuePair.mXValue.GetUnit() == eCSSUnit_Initial;
+    if (inheritOrInitial && head) {
+      // inherit and initial are only allowed on their own
+      break;
+    }
     nsCSSValuePairList *item = new nsCSSValuePairList;
     if (!item) {
       mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
@@ -6507,17 +6323,14 @@ CSSParserImpl::ParseBackgroundPosition()
  * like "top," "left center," etc.
  *
  * @param aOut The nsCSSValuePair in which to place the result.
- * @param aAcceptsInherit If true, 'inherit' and 'initial' are legal values
  * @return Whether or not the operation succeeded.
  */
-PRBool CSSParserImpl::ParseBoxPositionValues(nsCSSValuePair &aOut,
-                                             PRBool aAcceptsInherit)
+PRBool CSSParserImpl::ParseBoxPositionValues(nsCSSValuePair &aOut)
 {
   // First try a percentage or a length value
   nsCSSValue &xValue = aOut.mXValue,
              &yValue = aOut.mYValue;
-  PRInt32 variantMask = aAcceptsInherit ? VARIANT_HLP : VARIANT_LP;
-  if (ParseVariant(xValue, variantMask, nsnull)) {
+  if (ParseVariant(xValue, VARIANT_HLP, nsnull)) {
     if (eCSSUnit_Inherit == xValue.GetUnit() ||
         eCSSUnit_Initial == xValue.GetUnit()) {  // both are inherited or both are set to initial
       yValue = xValue;
@@ -7772,7 +7585,7 @@ PRBool CSSParserImpl::ParseMozTransform()
 PRBool CSSParserImpl::ParseMozTransformOrigin()
 {
   /* Read in a box position, fail if we can't. */
-  if (!ParseBoxPositionValues(mTempData.mDisplay.mTransformOrigin, PR_TRUE) ||
+  if (!ParseBoxPositionValues(mTempData.mDisplay.mTransformOrigin) ||
       !ExpectEndProperty())
     return PR_FALSE;
 
diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp
index cfcfc6edc96..5257821a18f 100644
--- a/layout/style/nsCSSValue.cpp
+++ b/layout/style/nsCSSValue.cpp
@@ -124,13 +124,6 @@ nsCSSValue::nsCSSValue(nsCSSValue::Image* aValue)
   mValue.mImage->AddRef();
 }
 
-nsCSSValue::nsCSSValue(nsCSSValueGradient* aValue)
-  : mUnit(eCSSUnit_Gradient)
-{
-  mValue.mGradient = aValue;
-  mValue.mGradient->AddRef();
-}
-
 nsCSSValue::nsCSSValue(const nsCSSValue& aCopy)
   : mUnit(aCopy.mUnit)
 {
@@ -162,10 +155,6 @@ nsCSSValue::nsCSSValue(const nsCSSValue& aCopy)
     mValue.mImage = aCopy.mValue.mImage;
     mValue.mImage->AddRef();
   }
-  else if (eCSSUnit_Gradient == mUnit) {
-    mValue.mGradient = aCopy.mValue.mGradient;
-    mValue.mGradient->AddRef();
-  }
   else {
     NS_NOTREACHED("unknown unit");
   }
@@ -205,9 +194,6 @@ PRBool nsCSSValue::operator==(const nsCSSValue& aOther) const
     else if (eCSSUnit_Image == mUnit) {
       return *mValue.mImage == *aOther.mValue.mImage;
     }
-    else if (eCSSUnit_Gradient == mUnit) {
-      return *mValue.mGradient == *aOther.mValue.mGradient;
-    }
     else {
       return mValue.mFloat == aOther.mValue.mFloat;
     }
@@ -257,8 +243,6 @@ void nsCSSValue::DoReset()
     mValue.mURL->Release();
   } else if (eCSSUnit_Image == mUnit) {
     mValue.mImage->Release();
-  } else if (eCSSUnit_Gradient == mUnit) {
-    mValue.mGradient->Release();
   }
   mUnit = eCSSUnit_Null;
 }
@@ -342,14 +326,6 @@ void nsCSSValue::SetImageValue(nsCSSValue::Image* aValue)
   mValue.mImage->AddRef();
 }
 
-void nsCSSValue::SetGradientValue(nsCSSValueGradient* aValue)
-{
-  Reset();
-  mUnit = eCSSUnit_Gradient;
-  mValue.mGradient = aValue;
-  mValue.mGradient->AddRef();
-}
-
 void nsCSSValue::SetAutoValue()
 {
   Reset();
@@ -463,12 +439,15 @@ nsCSSValue::URL::URL(nsIURI* aURI, nsStringBuffer* aString, nsIURI* aReferrer,
     mRefCnt(0)
 {
   NS_PRECONDITION(aOriginPrincipal, "Must have an origin principal");
+  
   mString->AddRef();
+  MOZ_COUNT_CTOR(nsCSSValue::URL);
 }
 
 nsCSSValue::URL::~URL()
 {
   mString->Release();
+  MOZ_COUNT_DTOR(nsCSSValue::URL);
 }
 
 PRBool
@@ -506,6 +485,8 @@ nsCSSValue::Image::Image(nsIURI* aURI, nsStringBuffer* aString,
                          nsIDocument* aDocument)
   : URL(aURI, aString, aReferrer, aOriginPrincipal)
 {
+  MOZ_COUNT_CTOR(nsCSSValue::Image);
+
   if (mURI &&
       nsContentUtils::CanLoadImage(mURI, aDocument, aDocument,
                                    aOriginPrincipal)) {
@@ -517,38 +498,5 @@ nsCSSValue::Image::Image(nsIURI* aURI, nsStringBuffer* aString,
 
 nsCSSValue::Image::~Image()
 {
-}
-
-nsCSSValueGradientStop::nsCSSValueGradientStop(const nsCSSValue& aLocation,
-                                               const nsCSSValue& aColor)
-  : mLocation(aLocation),
-    mColor(aColor)
-{ 
-  MOZ_COUNT_CTOR(nsCSSValueGradientStop);
-}
-
-nsCSSValueGradientStop::nsCSSValueGradientStop(const nsCSSValueGradientStop& aOther)
-  : mLocation(aOther.mLocation),
-    mColor(aOther.mColor)
-{ 
-  MOZ_COUNT_CTOR(nsCSSValueGradientStop);
-}
-
-nsCSSValueGradientStop::~nsCSSValueGradientStop()
-{
-  MOZ_COUNT_DTOR(nsCSSValueGradientStop);
-}
-
-nsCSSValueGradient::nsCSSValueGradient(PRBool aIsRadial, const nsCSSValue& aStartX,
-           const nsCSSValue& aStartY, const nsCSSValue& aStartRadius, const nsCSSValue& aEndX,
-           const nsCSSValue& aEndY, const nsCSSValue& aEndRadius)
-  : mIsRadial(aIsRadial),
-    mStartX(aStartX),
-    mStartY(aStartY),
-    mEndX(aEndX),
-    mEndY(aEndY),
-    mStartRadius(aStartRadius),
-    mEndRadius(aEndRadius),
-    mRefCnt(0)
-{ 
+  MOZ_COUNT_DTOR(nsCSSValue::Image);
 }
diff --git a/layout/style/nsCSSValue.h b/layout/style/nsCSSValue.h
index 06728267e9e..2c7673eb8cd 100644
--- a/layout/style/nsCSSValue.h
+++ b/layout/style/nsCSSValue.h
@@ -49,7 +49,6 @@
 #include "nsAutoPtr.h"
 #include "nsCRTGlue.h"
 #include "nsStringBuffer.h"
-#include "nsTArray.h"
 
 class imgIRequest;
 class nsIDocument;
@@ -113,7 +112,6 @@ enum nsCSSUnit {
 
   eCSSUnit_URL          = 30,     // (nsCSSValue::URL*) value
   eCSSUnit_Image        = 31,     // (nsCSSValue::Image*) value
-  eCSSUnit_Gradient     = 32,     // (nsCSSValueGradient*) value
   eCSSUnit_Integer      = 50,     // (int) simple value
   eCSSUnit_Enumerated   = 51,     // (int) value has enumerated meaning
   eCSSUnit_EnumColor    = 80,     // (int) enumerated color (kColorKTable)
@@ -157,8 +155,6 @@ enum nsCSSUnit {
   eCSSUnit_Milliseconds = 3001     // (float) 1/1000 second
 };
 
-struct nsCSSValueGradient;
-
 class nsCSSValue {
 public:
   struct Array;
@@ -184,7 +180,6 @@ public:
   nsCSSValue(Array* aArray, nsCSSUnit aUnit) NS_HIDDEN;
   explicit nsCSSValue(URL* aValue) NS_HIDDEN;
   explicit nsCSSValue(Image* aValue) NS_HIDDEN;
-  explicit nsCSSValue(nsCSSValueGradient* aValue) NS_HIDDEN;
   nsCSSValue(const nsCSSValue& aCopy) NS_HIDDEN;
   ~nsCSSValue() { Reset(); }
 
@@ -271,12 +266,6 @@ public:
       mValue.mURL->mURI : mValue.mImage->mURI;
   }
 
-  nsCSSValueGradient* GetGradientValue() const
-  {
-    NS_ASSERTION(mUnit == eCSSUnit_Gradient, "not a gradient value");
-    return mValue.mGradient;
-  }
-
   URL* GetURLStructValue() const
   {
     // Not allowing this for Image values, because if the caller takes
@@ -318,7 +307,6 @@ public:
   NS_HIDDEN_(void)  SetArrayValue(nsCSSValue::Array* aArray, nsCSSUnit aUnit);
   NS_HIDDEN_(void)  SetURLValue(nsCSSValue::URL* aURI);
   NS_HIDDEN_(void)  SetImageValue(nsCSSValue::Image* aImage);
-  NS_HIDDEN_(void)  SetGradientValue(nsCSSValueGradient* aGradient);
   NS_HIDDEN_(void)  SetAutoValue();
   NS_HIDDEN_(void)  SetInheritValue();
   NS_HIDDEN_(void)  SetInitialValue();
@@ -367,24 +355,17 @@ public:
         return;
       }
       ++mRefCnt;
-      NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::URL", sizeof(*this));
     }
     void Release() {
       if (mRefCnt == PR_UINT32_MAX) {
         NS_WARNING("refcount overflow, leaking nsCSSValue::URL");
         return;
       }
-      --mRefCnt;
-      NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::URL");
-      if (mRefCnt == 0)
+      if (--mRefCnt == 0)
         delete this;
     }
   protected:
     nsrefcnt mRefCnt;
-
-    // not to be implemented
-    URL(const URL& aOther);
-    URL& operator=(const URL& aOther);
   };
 
   struct Image : public URL {
@@ -400,25 +381,13 @@ public:
 
     nsCOMPtr<imgIRequest> mRequest; // null == image load blocked or somehow failed
 
-    // Override AddRef and Release to not only log ourselves correctly, but
-    // also so that we delete correctly without a virtual destructor
-    void AddRef() {
-      if (mRefCnt == PR_UINT32_MAX) {
-        NS_WARNING("refcount overflow, leaking nsCSSValue::Image");
-        return;
-      }
-      ++mRefCnt;
-      NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Image", sizeof(*this));
-    }
-
+    // Override Release so we delete correctly without a virtual destructor
     void Release() {
       if (mRefCnt == PR_UINT32_MAX) {
         NS_WARNING("refcount overflow, leaking nsCSSValue::Image");
         return;
       }
-      --mRefCnt;
-      NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Image");
-      if (mRefCnt == 0)
+      if (--mRefCnt == 0)
         delete this;
     }
   };
@@ -440,105 +409,9 @@ protected:
     Array*     mArray;
     URL*       mURL;
     Image*     mImage;
-    nsCSSValueGradient* mGradient;
   }         mValue;
 };
 
-struct nsCSSValueGradientStop {
-public:
-  nsCSSValueGradientStop(const nsCSSValue& aLocation, const nsCSSValue& aColor) NS_HIDDEN;
-  // needed to keep bloat logs happy when we use the nsTArray in nsCSSValueGradient
-  nsCSSValueGradientStop(const nsCSSValueGradientStop& aOther) NS_HIDDEN;
-  ~nsCSSValueGradientStop() NS_HIDDEN;
-
-  nsCSSValue mLocation;
-  nsCSSValue mColor;
-
-  PRBool operator==(const nsCSSValueGradientStop& aOther) const
-  {
-    return (mLocation == aOther.mLocation &&
-            mColor == aOther.mColor);
-  }
-
-  PRBool operator!=(const nsCSSValueGradientStop& aOther) const
-  {
-    return !(*this == aOther);
-  }
-};
-
-struct nsCSSValueGradient {
-  nsCSSValueGradient(PRBool aIsRadial, const nsCSSValue& aStartX, const nsCSSValue& aStartY,
-           const nsCSSValue& aStartRadius, const nsCSSValue& aEndX, const nsCSSValue& aEndY,
-           const nsCSSValue& aEndRadius) NS_HIDDEN;
-
-  // true if gradient is radial, false if it is linear
-  PRPackedBool mIsRadial;
-  nsCSSValue mStartX;
-  nsCSSValue mStartY;
-
-  nsCSSValue mEndX;
-  nsCSSValue mEndY;
-
-  // Only meaningful if mIsRadial is true
-  nsCSSValue mStartRadius;
-  nsCSSValue mEndRadius;
-
-  nsTArray<nsCSSValueGradientStop> mStops;
-
-  PRBool operator==(const nsCSSValueGradient& aOther) const
-  {
-    if (mIsRadial != aOther.mIsRadial ||
-        mStartX != aOther.mStartX ||
-        mStartY != aOther.mStartY ||
-        mStartRadius != aOther.mStartRadius ||
-        mEndX != aOther.mEndX ||
-        mEndY != aOther.mEndY ||
-        mEndRadius != aOther.mEndRadius)
-      return PR_FALSE;
-
-    if (mStops.Length() != aOther.mStops.Length())
-      return PR_FALSE;
-
-    for (PRUint32 i = 0; i < mStops.Length(); i++) {
-      if (mStops[i] != aOther.mStops[i])
-        return PR_FALSE;
-    }
-
-    return PR_TRUE;
-  }
-
-  PRBool operator!=(const nsCSSValueGradient& aOther) const
-  {
-    return !(*this == aOther);
-  }
-
-  void AddRef() {
-    if (mRefCnt == PR_UINT32_MAX) {
-      NS_WARNING("refcount overflow, leaking nsCSSValue::Gradient");
-      return;
-    }
-    ++mRefCnt;
-    NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Gradient", sizeof(*this));
-  }
-  void Release() {
-    if (mRefCnt == PR_UINT32_MAX) {
-      NS_WARNING("refcount overflow, leaking nsCSSValue::Gradient");
-      return;
-    }
-    --mRefCnt;
-    NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Gradient");
-    if (mRefCnt == 0)
-      delete this;
-  }
-
-private:
-  nsrefcnt mRefCnt;
-
-  // not to be implemented
-  nsCSSValueGradient(const nsCSSValueGradient& aOther);
-  nsCSSValueGradient& operator=(const nsCSSValueGradient& aOther);
-};
-
 struct nsCSSValue::Array {
 
   // return |Array| with reference count of zero
@@ -635,9 +508,7 @@ private:
 #undef CSSVALUE_LIST_FOR_EXTRA_VALUES
 
 private:
-  // not to be implemented
-  Array(const Array& aOther);
-  Array& operator=(const Array& aOther);
+  Array(const Array& aOther); // not to be implemented
 };
 
 #endif /* nsCSSValue_h___ */
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index aa765b863e1..c299ffa80d5 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -1250,97 +1250,6 @@ nsComputedDOMStyle::GetBackgroundColor(nsIDOMCSSValue** aValue)
   return CallQueryInterface(val, aValue);
 }
 
-static void
-AppendCSSGradientLength(const nsStyleCoord& aValue,
-                        nsROCSSPrimitiveValue* aPrimitive,
-                        nsAString& aString)
-{
-  nsAutoString tokenString;
-  if (aValue.GetUnit() == eStyleUnit_Coord)
-    aPrimitive->SetAppUnits(aValue.GetCoordValue());
-  else
-    aPrimitive->SetPercent(aValue.GetPercentValue());
-  aPrimitive->GetCssText(tokenString);
-  aString.Append(tokenString);
-}
-
-static void
-AppendCSSGradientRadius(const nscoord aValue,
-                        nsROCSSPrimitiveValue* aPrimitive,
-                        nsAString& aString)
-{
-  nsAutoString tokenString;
-  aPrimitive->SetAppUnits(aValue);
-  aPrimitive->GetCssText(tokenString);
-  aString.Append(tokenString);
-}
-
-nsresult
-nsComputedDOMStyle::GetCSSGradientString(const nsStyleGradient* aGradient,
-                                         nsAString& aString)
-{
-  if (aGradient->mIsRadial)
-    aString.AssignLiteral("-moz-radial-gradient(");
-  else
-    aString.AssignLiteral("-moz-linear-gradient(");
-
-  nsROCSSPrimitiveValue *tmpVal = GetROCSSPrimitiveValue();
-  if (!tmpVal)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  // starting X position
-  AppendCSSGradientLength(aGradient->mStartX, tmpVal, aString);
-  aString.AppendLiteral(" ");
-
-  // starting Y position
-  AppendCSSGradientLength(aGradient->mStartY, tmpVal, aString);
-  aString.AppendLiteral(", ");
-
-  // starting radius
-  if (aGradient->mIsRadial) {
-    AppendCSSGradientRadius(aGradient->mStartRadius, tmpVal, aString);
-    aString.AppendLiteral(", ");
-  }
-
-  // ending X position
-  AppendCSSGradientLength(aGradient->mEndX, tmpVal, aString);
-  aString.AppendLiteral(" ");
-
-  // ending Y position
-  AppendCSSGradientLength(aGradient->mEndY, tmpVal, aString);
-
-  // ending radius
-  if (aGradient->mIsRadial) {
-    aString.AppendLiteral(", ");
-    AppendCSSGradientRadius(aGradient->mStartRadius, tmpVal, aString);
-  }
-
-  // color stops
-  for (PRUint32 i = 0; i < aGradient->mStops.Length(); ++i) {
-    nsAutoString tokenString;
-    aString.AppendLiteral(", color-stop(");
-
-    tmpVal->SetPercent(aGradient->mStops[i].mPosition);
-    tmpVal->GetCssText(tokenString);
-    aString.Append(tokenString);
-    aString.AppendLiteral(", ");
-
-    nsresult rv = SetToRGBAColor(tmpVal, aGradient->mStops[i].mColor);
-    if (NS_FAILED(rv)) {
-      delete tmpVal;
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    tmpVal->GetCssText(tokenString);
-    aString.Append(tokenString);
-    aString.AppendLiteral(")");
-  }
-
-  delete tmpVal;
-  aString.AppendLiteral(")");
-  return NS_OK;
-}
-
 nsresult
 nsComputedDOMStyle::GetBackgroundImage(nsIDOMCSSValue** aValue)
 {
@@ -1357,27 +1266,13 @@ nsComputedDOMStyle::GetBackgroundImage(nsIDOMCSSValue** aValue)
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    const nsStyleBackground::Image &image = bg->mLayers[i].mImage;
-    if (image.GetType() == eBackgroundImage_Image) {
-      imgIRequest *req = image.GetImageData();
-      if (!req) {
-        val->SetIdent(eCSSKeyword_none);
-      } else {
-        nsCOMPtr<nsIURI> uri;
-        req->GetURI(getter_AddRefs(uri));
-        val->SetURI(uri);
-      }
-    } else if (image.GetType() == eBackgroundImage_Gradient) {
-      nsAutoString gradientString;
-      nsresult rv = GetCSSGradientString(image.GetGradientData(),
-                                         gradientString);
-      if (NS_FAILED(rv)) {
-        delete valueList;
-        return rv;
-      }
-      val->SetString(gradientString);
-    } else {
+    imgIRequest *image = bg->mLayers[i].mImage;
+    if (!image) {
       val->SetIdent(eCSSKeyword_none);
+    } else {
+      nsCOMPtr<nsIURI> uri;
+      image->GetURI(getter_AddRefs(uri));
+      val->SetURI(uri);
     }
   }
 
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 5ecc5ce249a..7e8bf8fc710 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -131,9 +131,6 @@ private:
                              const PRInt32 aTable[],
                              nsIDOMCSSValue** aResult);
 
-  nsresult GetCSSGradientString(const nsStyleGradient* aGradient,
-                                nsAString& aString);
-
   /* Properties Queryable as CSSValues */
 
   nsresult GetAppearance(nsIDOMCSSValue** aValue);
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 8cc514fc93b..47625d13eab 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -471,81 +471,6 @@ static PRBool SetColor(const nsCSSValue& aValue, const nscolor aParentColor,
   return result;
 }
 
-static void SetGradientCoord(const nsCSSValue& aValue, nsPresContext* aPresContext,
-                             nsStyleContext* aContext, nsStyleCoord& aResult,
-                             PRBool& aCanStoreInRuleTree)
-{
-  // If coordinate is an enumerated type, handle it explicitly.
-  if (aValue.GetUnit() == eCSSUnit_Enumerated) {
-    aResult.SetPercentValue(GetFloatFromBoxPosition(aValue.GetIntValue()));
-    return;
-  }
-
-  // OK to pass bad aParentCoord since we're not passing SETCOORD_INHERIT
-  PRBool result = SetCoord(aValue, aResult, nsStyleCoord(), SETCOORD_LP,
-                           aContext, aPresContext, aCanStoreInRuleTree);
-  NS_ABORT_IF_FALSE(result, "Incorrect data structure created by parsing code");
-}
-
-static void SetGradient(const nsCSSValue& aValue, nsPresContext* aPresContext,
-                        nsStyleContext* aContext, nsStyleGradient& aResult,
-                        PRBool& aCanStoreInRuleTree)
-{
-  NS_ABORT_IF_FALSE(aValue.GetUnit() == eCSSUnit_Gradient,
-                    "The given data is not a gradient");
-
-  nsCSSValueGradient* gradient = aValue.GetGradientValue();
-  aResult.mIsRadial = gradient->mIsRadial;
-
-  // start values
-  SetGradientCoord(gradient->mStartX, aPresContext, aContext,
-                   aResult.mStartX, aCanStoreInRuleTree);
-
-  SetGradientCoord(gradient->mStartY, aPresContext, aContext,
-                   aResult.mStartY, aCanStoreInRuleTree);
-
-  if (gradient->mIsRadial) {
-    NS_ABORT_IF_FALSE(gradient->mStartRadius.IsLengthUnit(),
-                      "Incorrect data structure created by parsing code");
-    aResult.mStartRadius = CalcLength(gradient->mStartRadius, aContext,
-                                      aPresContext, aCanStoreInRuleTree);
-  }
-
-  // end values
-  SetGradientCoord(gradient->mEndX, aPresContext, aContext,
-                   aResult.mEndX, aCanStoreInRuleTree);
-
-  SetGradientCoord(gradient->mEndY, aPresContext, aContext,
-                   aResult.mEndY, aCanStoreInRuleTree);
-
-  if (gradient->mIsRadial) {
-    NS_ABORT_IF_FALSE(gradient->mEndRadius.IsLengthUnit(),
-                      "Incorrect data structure created by parsing code");
-    aResult.mEndRadius = CalcLength(gradient->mEndRadius, aContext,
-                                    aPresContext, aCanStoreInRuleTree);
-  }
-
-  // stops
-  for (PRUint32 i = 0; i < gradient->mStops.Length(); i++) {
-    nsStyleGradientStop stop;
-    nsCSSValueGradientStop &valueStop = gradient->mStops[i];
-
-    if (valueStop.mLocation.GetUnit() == eCSSUnit_Percent)
-      stop.mPosition = valueStop.mLocation.GetPercentValue();
-    else
-      stop.mPosition = valueStop.mLocation.GetFloatValue();
-
-    // inherit is not a valid color for stops, so we pass in a dummy
-    // parent color
-    NS_ASSERTION(valueStop.mColor.GetUnit() != eCSSUnit_Inherit,
-                 "inherit is not a valid color for gradient stops");
-    SetColor(valueStop.mColor, NS_RGB(0, 0, 0), aPresContext,
-             aContext, stop.mColor, aCanStoreInRuleTree);
-
-    aResult.mStops.AppendElement(stop);
-  }
-}
-
 // flags for SetDiscrete - align values with SETCOORD_* constants
 // where possible
 
@@ -3878,30 +3803,20 @@ struct BackgroundItemComputer<nsCSSValueList, PRUint8>
 };
 
 NS_SPECIALIZE_TEMPLATE
-struct BackgroundItemComputer<nsCSSValueList, nsStyleBackground::Image>
+struct BackgroundItemComputer<nsCSSValueList, nsCOMPtr<imgIRequest> >
 {
   static void ComputeValue(nsStyleContext* aStyleContext,
                            const nsCSSValueList* aSpecifiedValue,
-                           nsStyleBackground::Image& aComputedValue,
+                           nsCOMPtr<imgIRequest>& aComputedValue,
                            PRBool& aCanStoreInRuleTree)
   {
     const nsCSSValue &value = aSpecifiedValue->mValue;
     if (eCSSUnit_Image == value.GetUnit()) {
-      aComputedValue.SetImageData(value.GetImageValue());
-    }
-    else if (eCSSUnit_Gradient == value.GetUnit()) {
-      nsStyleGradient* gradient = new nsStyleGradient();
-      if (gradient) {
-        SetGradient(value, aStyleContext->PresContext(), aStyleContext,
-                    *gradient, aCanStoreInRuleTree);
-        aComputedValue.SetGradientData(gradient);
-      } else {
-        aComputedValue.SetNull();
-      }
+      aComputedValue = value.GetImageValue();
     }
     else {
       NS_ASSERTION(eCSSUnit_None == value.GetUnit(), "unexpected unit");
-      aComputedValue.SetNull();
+      aComputedValue = nsnull;
     }
   }
 };
@@ -4141,11 +4056,10 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct,
   PRBool rebuild = PR_FALSE;
 
   // background-image: url (stored as image), none, inherit [list]
-  nsStyleBackground::Image initialImage;
   SetBackgroundList(aContext, colorData.mBackImage, bg->mLayers,
                     parentBG->mLayers, &nsStyleBackground::Layer::mImage,
-                    initialImage, parentBG->mImageCount, bg->mImageCount,
-                    maxItemCount, rebuild, canStoreInRuleTree);
+                    nsCOMPtr<imgIRequest>(nsnull), parentBG->mImageCount,
+                    bg->mImageCount, maxItemCount, rebuild, canStoreInRuleTree);
 
   // background-repeat: enum, inherit, initial [list]
   SetBackgroundList(aContext, colorData.mBackRepeat, bg->mLayers,
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index e936354b76a..55e97e4dfd7 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1206,51 +1206,6 @@ nsChangeHint nsStyleColor::MaxDifference()
 }
 #endif
 
-// --------------------
-// nsStyleGradient
-//
-PRBool
-nsStyleGradient::operator==(const nsStyleGradient& aOther) const
-{
-  NS_ABORT_IF_FALSE(mIsRadial || (mStartRadius == 0 && mEndRadius == 0),
-                    "incorrect unused radius values");
-  NS_ABORT_IF_FALSE(aOther.mIsRadial ||
-                    (aOther.mStartRadius == 0 && aOther.mEndRadius == 0),
-                    "incorrect unused radius values");
-
-  if (mIsRadial != aOther.mIsRadial ||
-      mStartX != aOther.mStartX ||
-      mStartY != aOther.mStartY ||
-      mStartRadius != aOther.mStartRadius ||
-      mEndX != aOther.mEndX ||
-      mEndY != aOther.mEndY ||
-      mEndRadius != aOther.mEndRadius)
-    return PR_FALSE;
-
-  if (mStops.Length() != aOther.mStops.Length())
-    return PR_FALSE;
-
-  for (PRUint32 i = 0; i < mStops.Length(); i++) {
-    if (mStops[i].mPosition != aOther.mStops[i].mPosition ||
-        mStops[i].mColor != aOther.mStops[i].mColor)
-      return PR_FALSE;
-  }
-
-  return PR_TRUE;
-}
-
-nsStyleGradient::nsStyleGradient(void)
-  : mIsRadial(PR_FALSE)
-  , mStartRadius(0)
-  , mEndRadius(0)
-  , mRefCnt(0)
-{
-  mStartX.SetCoordValue(0);
-  mStartY.SetCoordValue(0);
-  mEndX.SetCoordValue(0);
-  mEndY.SetCoordValue(0);
-}
-
 // --------------------
 // nsStyleBackground
 //
@@ -1329,8 +1284,7 @@ PRBool nsStyleBackground::HasFixedBackground() const
 {
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, this) {
     const Layer &layer = mLayers[i];
-    if (layer.mAttachment == NS_STYLE_BG_ATTACHMENT_FIXED &&
-        layer.mImage.GetType() != eBackgroundImage_Null) {
+    if (layer.mAttachment == NS_STYLE_BG_ATTACHMENT_FIXED && layer.mImage) {
       return PR_TRUE;
     }
   }
@@ -1339,8 +1293,7 @@ PRBool nsStyleBackground::HasFixedBackground() const
 
 PRBool nsStyleBackground::IsTransparent() const
 {
-  return BottomLayer().mImage.GetType() == eBackgroundImage_Null &&
-         mImageCount == 1 &&
+  return !BottomLayer().mImage && mImageCount == 1 &&
          NS_GET_A(mBackgroundColor) == 0;
 }
 
@@ -1410,7 +1363,7 @@ nsStyleBackground::Layer::SetInitialValues()
   mRepeat = NS_STYLE_BG_REPEAT_XY;
   mPosition.SetInitialValues();
   mSize.SetInitialValues();
-  mImage.SetNull();
+  mImage = nsnull;
 }
 
 PRBool nsStyleBackground::Layer::operator==(const Layer& aOther) const
@@ -1421,99 +1374,7 @@ PRBool nsStyleBackground::Layer::operator==(const Layer& aOther) const
          mRepeat == aOther.mRepeat &&
          mPosition == aOther.mPosition &&
          mSize == aOther.mSize &&
-         mImage == aOther.mImage;
-}
-
-nsStyleBackground::Image::Image()
-{
-  MOZ_COUNT_CTOR(nsStyleBackground::Image);
-  mType = eBackgroundImage_Null;
-}
-
-nsStyleBackground::Image::~Image()
-{
-  MOZ_COUNT_DTOR(nsStyleBackground::Image);
-  if (mType != eBackgroundImage_Null)
-    SetNull();
-}
-
-nsStyleBackground::Image::Image(const nsStyleBackground::Image& aOther)
-{
-  // We need our own copy constructor because we don't want
-  // to copy the reference count
-  MOZ_COUNT_CTOR(nsStyleBackground::Image);
-  DoCopy(aOther);
-}
-
-nsStyleBackground::Image&
-nsStyleBackground::Image::operator=(const nsStyleBackground::Image& aOther)
-{
-  DoCopy(aOther);
-  return *this;
-}
-
-void nsStyleBackground::Image::DoCopy(const nsStyleBackground::Image& aOther)
-{
-  if (this == &aOther)
-    return;
-
-  SetNull();
-
-  if (aOther.mType == eBackgroundImage_Image)
-    SetImageData(aOther.mImage);
-  else if (aOther.mType == eBackgroundImage_Gradient)
-    SetGradientData(aOther.mGradient);
-}
-
-void nsStyleBackground::Image::SetImageData(imgIRequest* aImage)
-{
-  NS_IF_ADDREF(aImage);
-
-  if (mType != eBackgroundImage_Null)
-    SetNull();
-
-  if (aImage) {
-    mImage = aImage;
-    mType = eBackgroundImage_Image;
-  }
-}
-
-void nsStyleBackground::Image::SetGradientData(nsStyleGradient* aGradient)
-{
-  if (aGradient)
-    aGradient->AddRef();
-
-  if (mType != eBackgroundImage_Null)
-    SetNull();
-
-  if (aGradient) {
-    mGradient = aGradient;
-    mType = eBackgroundImage_Gradient;
-  }
-}
-
-void nsStyleBackground::Image::SetNull()
-{
-  if (mType == eBackgroundImage_Gradient)
-    mGradient->Release();
-  else if (mType == eBackgroundImage_Image)
-    NS_RELEASE(mImage);
-
-  mType = eBackgroundImage_Null;
-}
-
-PRBool nsStyleBackground::Image::operator==(const Image& aOther) const
-{
-  if (mType != aOther.mType)
-    return PR_FALSE;
-
-  if (mType == eBackgroundImage_Image)
-    return EqualImages(mImage, aOther.mImage);
-
-  if (mType == eBackgroundImage_Gradient)
-    return *mGradient == *aOther.mGradient;
-
-  return PR_TRUE;
+         EqualImages(mImage, aOther.mImage);
 }
 
 // --------------------
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index e1189bb5379..c8fff5e98ee 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -124,68 +124,6 @@ struct nsStyleFont {
 #endif
 };
 
-struct nsStyleGradientStop {
-  nscolor mColor;
-  float mPosition; // 0.0 - 1.0
-};
-
-class nsStyleGradient {
-public:
-  nsStyleGradient();
-
-  PRPackedBool mIsRadial;
-
-  nsStyleCoord mStartX; // percent or coord
-  nsStyleCoord mStartY; // percent or coord
-
-  nsStyleCoord mEndX; // percent or coord
-  nsStyleCoord mEndY; // percent or coord
-
-  nscoord mStartRadius;
-  nscoord mEndRadius;
-
-  // stops are in the order specified in the stylesheet
-  nsTArray<nsStyleGradientStop> mStops;
-
-  nsrefcnt AddRef() {
-    if (mRefCnt == PR_UINT32_MAX) {
-      NS_WARNING("refcount overflow, leaking nsStyleGradient");
-      return mRefCnt;
-    }
-    ++mRefCnt;
-    NS_LOG_ADDREF(this, mRefCnt, "nsStyleGradient", sizeof(*this));
-    return mRefCnt;
-  }
-
-  nsrefcnt Release() {
-    if (mRefCnt == PR_UINT32_MAX) {
-      NS_WARNING("refcount overflow, leaking nsStyleGradient");
-      return mRefCnt;
-    }
-    --mRefCnt;
-    NS_LOG_RELEASE(this, mRefCnt, "nsStyleGradient");
-    if (mRefCnt == 0) {
-      delete this;
-      return 0;
-    }
-    return mRefCnt;
-  }
-
-  PRBool operator==(const nsStyleGradient& aOther) const;
-  PRBool operator!=(const nsStyleGradient& aOther) const {
-    return !(*this == aOther);
-  };
-
-private:
-  nsrefcnt mRefCnt;
-
-  ~nsStyleGradient() {}
-
-  // Not to be implemented
-  nsStyleGradient(const nsStyleGradient& aOther);
-  nsStyleGradient& operator=(const nsStyleGradient& aOther);
-};
-
 struct nsStyleColor {
   nsStyleColor(nsPresContext* aPresContext);
   nsStyleColor(const nsStyleColor& aOther);
@@ -209,12 +147,6 @@ struct nsStyleColor {
   nscolor mColor;                 // [inherited]
 };
 
-enum nsStyleBackgroundImageType {
-  eBackgroundImage_Null,
-  eBackgroundImage_Image,
-  eBackgroundImage_Gradient
-};
-
 struct nsStyleBackground {
   nsStyleBackground();
   nsStyleBackground(const nsStyleBackground& aOther);
@@ -296,46 +228,6 @@ struct nsStyleBackground {
     }
   };
 
-  struct Image;
-  friend struct Image;
-  struct Image {
-  public:
-    Image();
-    ~Image();
-    Image(const Image& aOther);
-    Image& operator=(const Image& aOther);
-
-    void SetImageData(imgIRequest* aImage);
-    void SetGradientData(nsStyleGradient* aGradient);
-    void SetNull();
-
-    nsStyleBackgroundImageType GetType() const {
-      return mType;
-    };
-    imgIRequest* GetImageData() const {
-      NS_ASSERTION(mType == eBackgroundImage_Image, "Data is not an image!");
-      return mImage;
-    };
-    nsStyleGradient* GetGradientData() const {
-      NS_ASSERTION(mType == eBackgroundImage_Gradient, "Data is not a gradient!");
-      return mGradient;
-    };
-
-    PRBool operator==(const Image& aOther) const;
-    PRBool operator!=(const Image& aOther) const {
-      return !(*this == aOther);
-    }
-
-  private:
-    void DoCopy(const Image& aOther);
-
-    nsStyleBackgroundImageType mType;
-    union {
-      imgIRequest* mImage;
-      nsStyleGradient* mGradient;
-    };
-  };
-
   struct Layer;
   friend struct Layer;
   struct Layer {
@@ -344,7 +236,7 @@ struct nsStyleBackground {
     PRUint8 mOrigin;                    // [reset] See nsStyleConsts.h
     PRUint8 mRepeat;                    // [reset] See nsStyleConsts.h
     Position mPosition;                 // [reset]
-    Image mImage;                       // [reset]
+    nsCOMPtr<imgIRequest> mImage;       // [reset]
     Size mSize;                         // [reset]
 
     // Initializes only mImage
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index a9fe6599e84..420b0955676 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -625,7 +625,7 @@ var gCSSProperties = {
 		initial_values: [ "transparent", "none", "repeat", "scroll", "0% 0%", "top left", "left top", "transparent none", "top left none", "left top none", "none left top", "none top left", "none 0% 0%", "transparent none repeat scroll top left", "left top repeat none scroll transparent" ],
 		other_values: [
 		        /* without multiple backgrounds */
-		        "green", "none green repeat scroll left top", "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)", "repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') transparent left top scroll", "repeat-x", "repeat-y", "no-repeat", "none repeat-y transparent scroll 0% 0%", "fixed", "0% top transparent fixed repeat none", "top", "left", "50% 50%", "center", "bottom right scroll none transparent repeat", "50% transparent", "transparent 50%", "50%", "-moz-radial-gradient(10% bottom, 30px, 20px 20px, 10px, from(#ffffff), to(black)) scroll no-repeat", "-moz-linear-gradient(10px 10px, 20px 20px, from(red), to(blue)) repeat",
+		        "green", "none green repeat scroll left top", "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)", "repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') transparent left top scroll", "repeat-x", "repeat-y", "no-repeat", "none repeat-y transparent scroll 0% 0%", "fixed", "0% top transparent fixed repeat none", "top", "left", "50% 50%", "center", "bottom right scroll none transparent repeat", "50% transparent", "transparent 50%", "50%",
 		        /* multiple backgrounds */
 		        "url(404.png), url(404.png)",
 		        "url(404.png), url(404.png) transparent",
@@ -633,7 +633,6 @@ var gCSSProperties = {
 		        "repeat-x, fixed, none",
 		        "0% top url(404.png), url(404.png) 0% top",
 		        "fixed repeat-y top left url(404.png), repeat-x green",
-		        "url(404.png), -moz-linear-gradient(20px 20px, 30px 30px, from(blue), to(green)) black",
 		        /* test cases with clip+origin in the shorthand */
     // This is commented out for now until we change
     // -moz-background-clip to background-clip, -moz-background-origin
@@ -689,30 +688,9 @@ var gCSSProperties = {
 			"none, none, none, none, none",
 			"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), none",
 			"none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), none",
-			"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)",
-
-            "-moz-radial-gradient(45px 60px, 10px, 52px 50px, 30px, from(red), color-stop(90%, #019f62), to(rgba(1, 159, 98, 0)))",
-            "-moz-linear-gradient(20% center, left bottom, color-stop(0, #ffff00), to(green))",
-            "-moz-radial-gradient(50% 50%, 60px, 10% 20%, 20px, to(red), from(pink), color-stop(0.94, goldenrod))",
-            "-moz-linear-gradient(20px 10px, 100px top, from(rgb(10, 100, 0)), color-stop(1, rgba(10, 20, 30, 0.4)))",
-            "-moz-radial-gradient(center top, 10px, right bottom, 20px, color-stop(0.7, green), color-stop(20%, #ccddee), from(rgb(1, 2, 3)), color-stop(0.95, #aa0012))",
-            "-moz-linear-gradient(10px 20%, -50px -10%, from(green))",
-            "-moz-linear-gradient(10px 10px, 20px 20px)",
-            "-moz-linear-gradient(10px 10px, 20px 20px, color-stop(314%, blue))",
-            "-moz-linear-gradient(10px 10px, 20px 20px, color-stop(-0.2, green))",
-            "-moz-linear-gradient( 10px  10px  , 40px 20px ,  from(blue)  )"
+			"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)"
 		],
-		invalid_values: [ "-moz-linear-gradient(10px 10px, 20px, 30px 30px, 40px, from(blue), to(red))",
-                          "-moz-radial-gradient(20px 20px, 10px 10px, from(green), to(#ff00ff))",
-                          "-moz-radial-gradient(10px 10px, 20%, 40px 40px, 10px, from(green), to(#ff00ff))",
-                          "-moz-linear-gradient(10px, 20px, 30px, 40px, color-stop(0.5, #00ccff))",
-                          "-moz-linear-gradient(20px 20px, from(blue), to(red))",
-                          "-moz-linear-gradient(40px 40px, 10px 10px, from(blue) to(red) color-stop(10%, fuchsia))",
-                          "-moz-linear-gradient(20px 20px 30px, 10px 10px, from(red), to(#ff0000))",
-                          "-moz-radial-gradient(left top, center, 20px 20px, 10px, from(blue), to(red))",
-                          "-moz-linear-gradient(left left, top top, from(blue))",
-                          "-moz-linear-gradient(inherit, 10px 10px, from(blue))",
-                          "-moz-linear-gradient()" ]
+		invalid_values: []
 	},
 	"background-position": {
 		domProp: "backgroundPosition",
diff --git a/layout/tables/nsTablePainter.cpp b/layout/tables/nsTablePainter.cpp
index b9d6b477110..8b1a4c2016f 100644
--- a/layout/tables/nsTablePainter.cpp
+++ b/layout/tables/nsTablePainter.cpp
@@ -202,7 +202,7 @@ TableBackgroundPainter::TableBackgroundData::ShouldSetBCBorder()
   }
 
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, mBackground) {
-    if (mBackground->mLayers[i].mImage.GetType() != eBackgroundImage_Null)
+    if (mBackground->mLayers[i].mImage)
       return PR_TRUE;
   }
   return PR_FALSE;
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 6e96ada345d..102e8a9c6c6 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -4118,7 +4118,7 @@ nsTreeBodyFrame::ScrollInternal(const ScrollParts& aParts, PRInt32 aRow)
   // See if we have a transparent background or a background image.  
   // If we do, then we cannot blit.
   const nsStyleBackground* background = GetStyleBackground();
-  if (background->BottomLayer().mImage.GetType() != eBackgroundImage_Null ||
+  if (background->BottomLayer().mImage ||
       background->mImageCount > 1 ||
       NS_GET_A(background->mBackgroundColor) < 255 ||
       PR_ABS(delta)*mRowHeight >= mRect.height) {
@@ -4175,7 +4175,7 @@ nsTreeBodyFrame::ScrollHorzInternal(const ScrollParts& aParts, PRInt32 aPosition
   // See if we have a transparent background or a background image.  
   // If we do, then we cannot blit.
   const nsStyleBackground* background = GetStyleBackground();
-  if (background->BottomLayer().mImage.GetType() != eBackgroundImage_Null ||
+  if (background->BottomLayer().mImage ||
       background->mImageCount > 1 ||
       NS_GET_A(background->mBackgroundColor) < 255 ||
       PR_ABS(delta) >= mRect.width) {

From 97940144b95a6c42ab80cb3e83e2e874a8e5970d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 31 Jul 2009 14:39:22 +0200
Subject: [PATCH 120/175] Bug 507587 - Warning: reference to undefined property
 jscookies[cookie.host]. r=zeniko

---
 browser/components/sessionstore/src/nsSessionStore.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js
index bfec2661bfa..958a8838d00 100644
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -1617,14 +1617,9 @@ SessionStoreService.prototype = {
           if (cookie.isSession && _this._checkPrivacyLevel(cookie.isSecure)) {
             // use the cookie's host, path, and name as keys into a hash,
             // to make sure we serialize each cookie only once
-            var isInHash = false;
-            try {
-              if (jscookies[cookie.host][cookie.path][cookie.name])
-                isInHash = true;
-            } catch (e) {
-              // not in hash yet
-            }
-            if (!isInHash) {
+            if (!(cookie.host in jscookies &&
+                  cookie.path in jscookies[cookie.host] &&
+                  cookie.name in jscookies[cookie.host][cookie.path])) {
               var jscookie = { "host": cookie.host, "value": cookie.value };
               // only add attributes with non-default values (saving a few bits)
               if (cookie.path) jscookie.path = cookie.path;

From 01fb92e05813ba9a26a809b4e3de15bfa29fdd13 Mon Sep 17 00:00:00 2001
From: Tyler Downer <tyler.downer@gmail.com>
Date: Fri, 31 Jul 2009 14:49:58 +0200
Subject: [PATCH 121/175] Bug 503457 - Change "Reset bookmarks to Firefox
 defaults" to "Delete all bookmarks except for backups". r=rstrong,
 ui-r=boriss

---
 browser/base/content/safeMode.js                  | 4 ++--
 browser/base/content/safeMode.xul                 | 2 +-
 browser/locales/en-US/chrome/browser/safeMode.dtd | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/safeMode.js b/browser/base/content/safeMode.js
index 46e94b0663a..2b7d2fe2a9a 100644
--- a/browser/base/content/safeMode.js
+++ b/browser/base/content/safeMode.js
@@ -111,7 +111,7 @@ function onOK() {
   try {
     if (document.getElementById("resetUserPrefs").checked)
       clearAllPrefs();
-    if (document.getElementById("resetBookmarks").checked)
+    if (document.getElementById("deleteBookmarks").checked)
       restoreDefaultBookmarks();
     if (document.getElementById("resetToolbars").checked)
       deleteLocalstore();
@@ -139,7 +139,7 @@ function onLoad() {
 function UpdateOKButtonState() {
   document.documentElement.getButton("accept").disabled = 
     !document.getElementById("resetUserPrefs").checked &&
-    !document.getElementById("resetBookmarks").checked &&
+    !document.getElementById("deleteBookmarks").checked &&
     !document.getElementById("resetToolbars").checked &&
     !document.getElementById("disableAddons").checked &&
     !document.getElementById("restoreSearch").checked;
diff --git a/browser/base/content/safeMode.xul b/browser/base/content/safeMode.xul
index cba734a7137..552f28a25e4 100644
--- a/browser/base/content/safeMode.xul
+++ b/browser/base/content/safeMode.xul
@@ -79,7 +79,7 @@
   <vbox id="tasks">
     <checkbox id="disableAddons"  label="&disableAddons.label;"  accesskey="&disableAddons.accesskey;"/>
     <checkbox id="resetToolbars"  label="&resetToolbars.label;"  accesskey="&resetToolbars.accesskey;"/>
-    <checkbox id="resetBookmarks" label="&resetBookmarks.label;" accesskey="&resetBookmarks.accesskey;"/>
+    <checkbox id="deleteBookmarks" label="&deleteBookmarks.label;" accesskey="&deleteBookmarks.accesskey;"/>
     <checkbox id="resetUserPrefs" label="&resetUserPrefs.label;" accesskey="&resetUserPrefs.accesskey;"/>
     <checkbox id="restoreSearch"  label="&restoreSearch.label;"  accesskey="&restoreSearch.accesskey;"/>
   </vbox>
diff --git a/browser/locales/en-US/chrome/browser/safeMode.dtd b/browser/locales/en-US/chrome/browser/safeMode.dtd
index 0b33bd2c392..21c5931e094 100644
--- a/browser/locales/en-US/chrome/browser/safeMode.dtd
+++ b/browser/locales/en-US/chrome/browser/safeMode.dtd
@@ -48,8 +48,8 @@
 <!ENTITY resetToolbars.label          "Reset toolbars and controls">
 <!ENTITY resetToolbars.accesskey      "R">
 
-<!ENTITY resetBookmarks.label         "Reset bookmarks to &brandShortName; defaults">
-<!ENTITY resetBookmarks.accesskey     "b">
+<!ENTITY deleteBookmarks.label        "Delete all bookmarks except for backups">
+<!ENTITY deleteBookmarks.accesskey    "b">
 
 <!ENTITY resetUserPrefs.label         "Reset all user preferences to &brandShortName; defaults">
 <!ENTITY resetUserPrefs.accesskey     "p">

From c02bf12fa16ff6111782cc0d11bf66bd6ff0014d Mon Sep 17 00:00:00 2001
From: Josh Aas <joshmoz@gmail.com>
Date: Fri, 31 Jul 2009 11:17:42 -0400
Subject: [PATCH 122/175] Faster directory enum code for Mac OS X, don't use
 slow FSRefs. b=506812 r=vlad

---
 xpcom/io/nsLocalFileOSX.h  |   4 -
 xpcom/io/nsLocalFileOSX.mm | 280 ++++++++++++++++---------------------
 2 files changed, 120 insertions(+), 164 deletions(-)

diff --git a/xpcom/io/nsLocalFileOSX.h b/xpcom/io/nsLocalFileOSX.h
index 957e2d3abfa..e29502980d0 100644
--- a/xpcom/io/nsLocalFileOSX.h
+++ b/xpcom/io/nsLocalFileOSX.h
@@ -43,8 +43,6 @@
 #include "nsString.h"
 #include "nsIHashable.h"
 
-class nsDirEnumerator;
-
 // Mac OS X 10.4 does not have stat64/lstat64
 #if defined(HAVE_STAT64) && defined(HAVE_LSTAT64) && (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4)
 #define STAT stat64
@@ -71,8 +69,6 @@ class nsDirEnumerator;
 class NS_COM nsLocalFile : public nsILocalFileMac,
                            public nsIHashable
 {
-  friend class nsDirEnumerator;
-    
 public:
   NS_DEFINE_STATIC_CID_ACCESSOR(NS_LOCAL_FILE_CID)
 
diff --git a/xpcom/io/nsLocalFileOSX.mm b/xpcom/io/nsLocalFileOSX.mm
index 14e13d89b58..e620891e2f9 100644
--- a/xpcom/io/nsLocalFileOSX.mm
+++ b/xpcom/io/nsLocalFileOSX.mm
@@ -67,6 +67,7 @@
 #include <sys/statvfs.h>
 #include <stdlib.h>
 #include <utime.h>
+#include <dirent.h>
 
 #define CHECK_INIT()                            \
     PR_BEGIN_MACRO                              \
@@ -78,17 +79,7 @@ static nsresult MacErrorMapper(OSErr inErr);
 static void CopyUTF8toUTF16NFC(const nsACString& aSrc, nsAString& aResult);
 static nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr);
 
-#pragma mark -
-#pragma mark [FSRef operator==]
-
-bool operator==(const FSRef& lhs, const FSRef& rhs)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  return (::FSCompareFSRefs(&lhs, &rhs) == noErr);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
+const char kPathSepChar = '/';
 
 #pragma mark -
 #pragma mark [StFollowLinksState]
@@ -122,167 +113,136 @@ class StFollowLinksState
 #pragma mark -
 #pragma mark [nsDirEnumerator]
 
-class nsDirEnumerator : public nsISimpleEnumerator,
-                        public nsIDirectoryEnumerator
+class NS_COM
+nsDirEnumerator : public nsISimpleEnumerator,
+                  public nsIDirectoryEnumerator
 {
-    public:
+public:
+  nsDirEnumerator();
 
-        NS_DECL_ISUPPORTS
+  // nsISupports interface
+  NS_DECL_ISUPPORTS
 
-        nsDirEnumerator() :
-          mIterator(nsnull),
-          mFSRefsArray(nsnull),
-          mArrayCnt(0), mArrayIndex(0)
-        {
-        }
+  // nsISimpleEnumerator interface
+  NS_DECL_NSISIMPLEENUMERATOR
 
-        nsresult Init(nsILocalFileMac* parent) 
-        {
-          NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
+  // nsIDirectoryEnumerator interface
+  NS_DECL_NSIDIRECTORYENUMERATOR
 
-          NS_ENSURE_ARG(parent);
-          
-          OSErr err;
-          nsresult rv;
-          FSRef parentRef;
-          
-          rv = parent->GetFSRef(&parentRef);
-          if (NS_FAILED(rv))
-            return rv;
-          
-          mFSRefsArray = (FSRef *)nsMemory::Alloc(sizeof(FSRef)
-                                                  * kRequestCountPerIteration);
-          if (!mFSRefsArray)
-            return NS_ERROR_OUT_OF_MEMORY;
-          
-          err = ::FSOpenIterator(&parentRef, kFSIterateFlat, &mIterator);
-          if (err != noErr)
-            return MacErrorMapper(err);
-                              
-          return NS_OK;
+  NS_IMETHOD Init(nsLocalFile *parent);
 
-          NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-        }
+private:
+  ~nsDirEnumerator();
 
-        NS_IMETHOD HasMoreElements(PRBool *result) 
-        {
-          NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
+protected:
+  NS_IMETHOD GetNextEntry();
 
-          if (!mIterator || !mFSRefsArray) {
-            *result = PR_FALSE;
-            return NS_OK;
-          }
-
-          if (mNext == nsnull) {
-            if (mArrayIndex >= mArrayCnt) {
-              ItemCount actualCnt;
-              OSErr err = ::FSGetCatalogInfoBulk(mIterator,
-                                           kRequestCountPerIteration,
-                                           &actualCnt,
-                                           nsnull,
-                                           kFSCatInfoNone,
-                                           nsnull,
-                                           mFSRefsArray,
-                                           nsnull,
-                                           nsnull);
-            
-              if (err == noErr || err == errFSNoMoreItems) {
-                mArrayCnt = actualCnt;
-                mArrayIndex = 0;
-              }
-            }
-
-            if (mArrayIndex < mArrayCnt) {
-              nsRefPtr<nsLocalFile> newFile = new nsLocalFile;
-              if (!newFile)
-                return NS_ERROR_OUT_OF_MEMORY;
-              FSRef fsRef = mFSRefsArray[mArrayIndex];
-              if (NS_FAILED(newFile->InitWithFSRef(&fsRef)))
-                return NS_ERROR_FAILURE;
-              mArrayIndex++;
-              mNext = newFile;
-            } 
-          }
-
-          *result = mNext != nsnull;
-          if (!*result)
-            Close();
-
-          return NS_OK;
-
-          NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-        }
-
-        NS_IMETHOD GetNext(nsISupports **result) 
-        {
-            NS_ENSURE_ARG_POINTER(result);
-            *result = nsnull;
-
-            nsresult rv;
-            PRBool hasMore;
-            rv = HasMoreElements(&hasMore);
-            if (NS_FAILED(rv)) return rv;
-
-            *result = mNext; // might return nsnull
-            NS_IF_ADDREF(*result);
-
-            mNext = nsnull;
-            return NS_OK;
-        }
-
-        NS_IMETHOD GetNextFile(nsIFile **result)
-        {
-            *result = nsnull;
-            PRBool hasMore = PR_FALSE;
-            nsresult rv = HasMoreElements(&hasMore);
-            if (NS_FAILED(rv) || !hasMore)
-                return rv;
-            *result = mNext;
-            NS_IF_ADDREF(*result);
-            mNext = nsnull;
-            return NS_OK;
-        }
-
-        NS_IMETHOD Close()
-        {
-          NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-          if (mIterator) {
-            ::FSCloseIterator(mIterator);
-            mIterator = nsnull;
-          }
-          if (mFSRefsArray) {
-            nsMemory::Free(mFSRefsArray);
-            mFSRefsArray = nsnull;
-          }
-          return NS_OK;
-
-          NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-        }
-
-    private:
-        ~nsDirEnumerator() 
-        {
-          Close();
-        }
-
-    protected:
-        // According to Apple doc, request the number of objects
-        // per call that will fit in 4 VM pages.
-        enum {
-          kRequestCountPerIteration = ((4096 * 4) / sizeof(FSRef))
-        };
-        
-        nsCOMPtr<nsILocalFileMac>   mNext;
-        
-        FSIterator              mIterator;
-        FSRef                   *mFSRefsArray;
-        PRInt32                 mArrayCnt, mArrayIndex;
+  DIR           *mDir;
+  struct dirent *mEntry;
+  nsCString      mParentPath;
 };
 
+nsDirEnumerator::nsDirEnumerator() :
+mDir(nsnull), 
+mEntry(nsnull)
+{
+}
+
+nsDirEnumerator::~nsDirEnumerator()
+{
+  Close();
+}
+
 NS_IMPL_ISUPPORTS2(nsDirEnumerator, nsISimpleEnumerator, nsIDirectoryEnumerator)
 
-const char kPathSepChar = '/';
+NS_IMETHODIMP
+nsDirEnumerator::Init(nsLocalFile *parent)
+{
+  nsCAutoString dirPath;
+  if (NS_FAILED(parent->GetNativePath(dirPath)) ||
+      dirPath.IsEmpty()) {
+    return NS_ERROR_FILE_INVALID_PATH;
+  }
+
+  if (NS_FAILED(parent->GetNativePath(mParentPath)))
+    return NS_ERROR_FAILURE;
+
+  mDir = opendir(dirPath.get());
+  if (!mDir)
+    return NSRESULT_FOR_ERRNO();
+  return GetNextEntry();
+}
+
+NS_IMETHODIMP
+nsDirEnumerator::HasMoreElements(PRBool *result)
+{
+  *result = mDir && mEntry;
+  if (!*result)
+    Close();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDirEnumerator::GetNext(nsISupports **_retval)
+{
+  nsCOMPtr<nsIFile> file;
+  nsresult rv = GetNextFile(getter_AddRefs(file));
+  if (NS_FAILED(rv))
+    return rv;
+  NS_IF_ADDREF(*_retval = file);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDirEnumerator::GetNextEntry()
+{
+  do {
+    errno = 0;
+    mEntry = readdir(mDir);
+
+    // end of dir or error
+    if (!mEntry)
+      return NSRESULT_FOR_ERRNO();
+
+    // keep going past "." and ".."
+  } while (mEntry->d_name[0] == '.'     &&
+           (mEntry->d_name[1] == '\0'    ||   // .\0
+            (mEntry->d_name[1] == '.'     &&
+             mEntry->d_name[2] == '\0')));      // ..\0
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDirEnumerator::GetNextFile(nsIFile **_retval)
+{
+  nsresult rv;
+  if (!mDir || !mEntry) {
+    *_retval = nsnull;
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsILocalFile> file = new nsLocalFile();
+  if (!file)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  if (NS_FAILED(rv = file->InitWithNativePath(mParentPath)) ||
+      NS_FAILED(rv = file->AppendNative(nsDependentCString(mEntry->d_name))))
+    return rv;
+
+  *_retval = file;
+  NS_ADDREF(*_retval);
+  return GetNextEntry();
+}
+
+NS_IMETHODIMP 
+nsDirEnumerator::Close()
+{
+  if (mDir) {
+    closedir(mDir);
+    mDir = nsnull;
+  }
+  return NS_OK;
+}
 
 #pragma mark -
 #pragma mark [CTORs/DTOR]

From b58a1f0fe727ed48f105087f1500591746b26253 Mon Sep 17 00:00:00 2001
From: Walter Meinl <wuno@lsvw.de>
Date: Fri, 31 Jul 2009 17:31:09 +0200
Subject: [PATCH 123/175] [OS/2] Bug 507256: stop copying unused OS/2 icons for
 XULRunner, r=pweilbacher

---
 xulrunner/app/Makefile.in      |   2 --
 xulrunner/app/document-os2.ico | Bin 7824 -> 0 bytes
 2 files changed, 2 deletions(-)
 delete mode 100644 xulrunner/app/document-os2.ico

diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in
index 101ea71d70e..bac419405af 100644
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -270,8 +270,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 endif
 ifeq ($(OS_ARCH),OS2)
 	cp $(srcdir)/xulrunner-os2.ico   $(DIST)/branding/xulrunner.ico
-	cp $(srcdir)/xulrunner-os2.ico   $(DIST)/branding/app.ico
-	cp $(srcdir)/document-os2.ico  $(DIST)/branding/document.ico
 endif
 
 libs::
diff --git a/xulrunner/app/document-os2.ico b/xulrunner/app/document-os2.ico
deleted file mode 100644
index 214e92cef45cc11f13a54015977afbc0d8321f29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7824
zcmeHMdpuO>8-HgsGhHSo#wAuRrO>^!ZEYk)x$GiSX)FDZElO=D$`omo+={}m+0-z(
zPPvw0a!W<JAksxim(_hx#LSp|&zK3Pe!sKrAN%?IJ|EBVoM+DSe$Vs1?|D4W_b_Hl
z^Z@`X<lqU)QcHDsrouyeEC6KqSs&N|96X?i#o~eSBn8>HJ{%p1jE@3f8~~bloGt*<
z05AezAs$Rq95+)<b&iIH@iap-Iba2V`6ysR24-W)b^xpgz>W-7D&p5FgZ1jTHELuh
zEqOON;4uO?j{@!^!Ok(jnF2g1z(o^yP5?fNV6O`B*92}lz+*DlZV2{G0$x+WetqCO
z7x)>0eG9>knM&JqHGSq$=_bl%vuD^YobPC4<Y8vA-@<6miUl?{HXF>%9j#YvUB2AY
z#=?j8(<Vm;@3pj@PHSCUT=u!U(sy|?^g!@*aBv<7H3C7#;DCt^V+lUO3V&!BIn;XW
zF>`R-3LkF`POQY8bil<p$e&z84z-{}SSlY`rV(PTk>IFtdKHfCL`-y6IO|N{Y{F%2
z1!q0UIa@)l7rwv`a05V&H#u+5sKWj7tY1~rcc`#jHBz>zrF*L7cvJENsM&kJ<L=cA
z|9Mj42Ayb^Mak|489sUi{*$x3=jQm&4c_Q@+|?{<n`5k(W0L2JVDGJo0h<|gdKBG<
z#~>Cls276Nd56^V4@}}7oX9(3Sa@(@W$1{SSYm0YVrkg;>Nu6UWc7+j-KsFX%h3~S
z67?#NPraU~Ul%{EEMi{O?<O~sbna$OY08{j%bwntIira)<K`KYTK235ta*)Dvzs`x
z?{bVE<QhFJSoHYfk59P9g$&cP!S1}s&8cBtT;|@22<xkHE2`ohZnKs?$hE3Zr8Qr0
zY%R2S%3F6ic6(E{>z};c&r8k!tX$n$x4!M_mJbbEIvRXp!VaDY4q-)wXEMVs{SlIK
zA|^GKnVIl=&hfaySY~$OskEfui&&>}P9>H6k;F+(%0GRkh?P>rIaAC|<(*F}&O3kQ
z?1?K`N#*Go<rgyRFJ_f-a!L!b@9=Wl%7b54Gpoz;?v>^?lyMttN*-P-eqERG=59g5
z)yg|nmG`T!Jh)NaTz9#-_Qr#|jZf~}djF`ZwXy!${rcC<^{o%@zkPiF{gdnb)|+oz
z?!0Tg-~Ozg|NP;Hmk;?bT0XvQ{nYVNDCjkl)X^~_QV6m-q5ukLQSPr3ZD9IE9ZAMj
zWaHYybu?T@!*wL7qbA5D19dbSj0P=`m=HdqLPkRK5i%aAAseU4>PVL`Vio`k0GLTt
zG#;;PiU$_N5jJCi(`c|-3DA^*yF75!0v;2<ZVj+&Ht<=xXeZ5b=em^vuB*JA9sM?M
zq;Gc%H^m*bBShQFG3`JcO(Do!@vN&lH$W-MbA7nC>!|=YrvKKEJ->1Mw_gfYyU3VO
zd|+ltsA2JuMP&@R^23zc(-X?0^cynf-a9`h_7FWOcyn6h?lWP2`9WSqA-i%z_N7Jn
zR56!V9RIoE#G009)5a{jZuZirm&{vv8{0}8%a8847DIoPyZc?O&&9~Ff~c_k#HhkE
z5hcmt1<5hDP6n369={wPbLC`g)gN)?DMuU59BgDU9;O|Blo3*MI=(JBuAa?oOij3#
zl~`4nUUw<|9WUj5N$SVkbbeU|zv3MK2B-Hnr|lNEy)wJwTET}ZZf6a*^9HZ0HoK=T
zyQe<Cv!Ph<=(4z>rt5KypyitI$#r3Cjqus6t``l$=e5EYcZ6+C!q?5BcP%3R3sL7Q
z(TCTf&NrfuZ~MCVeV^L<dOwN<pTr^oe0S*2=<xa9c>?`>B%7=My=^3XPorq|*9iq6
zd^7aD4jDi8d7Ls_N5gd_`vn@d!%yHJJptJGC9Pj#zjopSpn&*W{);V@`U9mFt^&dL
zp{!7PEwi7b*WYSo_scAL9)!ju>n)YqmI13J-G|IBmR<))En?t4aZ)QMu^1;f-T#d&
z`QfXw1hs){O-)Vp^|iIPZ{NOA4dqI8C6sbAH15IMwuW2RZ#BGX?}gIQ-7Wd)C`aSU
zmM$DKYUJoSCZ#RiJw1Y+o-QcwJ1SAQz|nX-9*2V`xw)mU5f}u%??U4i$l*z3!U#FS
zSTd17G<_<I*F7|z5yX&41Oib*Q(awAiM;r=pi6*E+<j&6ygw?AhaduxKvL3}sH>??
zChdnXWQpC?gK_GbT4W-rUvv!hl?Vh%9kP|4q48$wPMScHheD+)=~*l{mxrMjwIjHm
z-of!E>YG#Ll@t^d3~Yb4wX;wm6NyC1Jplq7Jnx=m%M1;uR24m|l`B_nSZAvuPbLvb
z2LuRkaJ=tzs8nqgJw1CD7dJOgPtR4Vs&J{s5GNQC&r(}OTTf@o6supu!y_VsgSX96
zQzet;Auz$<cxw#wrWj0{ZuQglqw(?aG113%%vPgP=Ogh1-M0sx%T8NsgXvcG4({;@
z2`m;XDJI%+hRrW~MF_5U5YBspv%S6jdiO)D6m~wF%}$8f<?iN0{{k1_ylGQVIO9+f
zJ3pW4=a<YraV&DPQ-uhMKu|j{FL2%z8g?{+#pV{BJL2neiXCz|GJH$B1ShN?g!2gt
z3y)7p<rWp?oj>B6?Ynx_!LW2u9}-VA7zaZC6A>N9Eh^@f@HlBquhpv}ceM8*I8pBq
zTqbR;uU}3cucQS2Q^U{0!#(J39~6ia4qhJs{%d{HIOi`yTrShkcZ)-XxKE4#`-C?K
ztq-X@kF;~S2riEq_nTK!KMVptpmAW|q1?Pnmx}XacW1UEFnGYNbbNv9ZEMWnaL!-2
z+bQW?5ZC_Z<+CSMs4@rLsMgjeZp=R&8<md6^$x|scuyWbD$GK|015~1YJUFs@)t0G
z{IM}a`kuXL{1OI4LqL#H#LYEdfq@?Q@P)m-?Vas>{+m~AZLivzz6KlieeDS#e2H+V
zOc7p1I2qDDXpw3uw1@`&4@JfiZILQ+KN3qC7Y8k(a!^T76`*QCT?`=-!Qdt=PQv0M
z3=YEJ9t_UG;2JEB!Qd7wPQl<3EDpiq4lK^V;tDK|z~Tl>PQc;<Ob)>6{g^!;yVqm(
zc&y%z)zh(hIjT2*(Zf;Wu=5V>-B>*vt5^SPJz6a0BVUAxg+L5@Sim<Zf`^KON)k(A
zp!nx+T&gNdMO6mY`(>@;n$>o;wm&VmkU8ghd2RQ!G_v&YaNVFR1%B`4wMl6NjzD$s
zaFY4Ve1989#LJOKDGvCS`mInHIfkM(8gK6=!`b+0%a2u`Hd&K2@w3liudc@U$+Kq8
z_-^j6G91l+-PGxejSUU7)(`mT^f~&b<_jkLuxra_96g9`{o|5_mcG7QRHW;p1qB8M
z(&=<R_%bu;voDAa-9bBcY@9FKFO3lt1abZ*CW~ed_!!Vjr_+|{$XsGtzc|o7d;Z=B
z8DIQU%ZJ~jmg2ra5j>(Ks9KUQS;a%MjLtARyXefKvx?3rI-BTBqO(XtWsru-9y)V0
Sn2Nz!LuZV}7@Do2nfePRiFVKc


From b87dee610cb5b942cb549d3ff5a5cab9b8189820 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 31 Jul 2009 09:39:53 -0700
Subject: [PATCH 124/175] Backed out changeset 358af1196dc2 (bug 499655) until
 we get bug 507487 sorted out.

---
 layout/style/nsCSSParser.cpp                  | 43 +++++++++++----
 layout/style/nsCSSRuleProcessor.cpp           | 32 +++--------
 layout/style/nsCSSStyleRule.cpp               | 55 +++++++++----------
 layout/style/nsICSSStyleRule.h                | 17 +-----
 layout/style/test/Makefile.in                 |  2 -
 layout/style/test/test_bug499655.html         | 46 ----------------
 layout/style/test/test_bug499655.xhtml        | 49 -----------------
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp | 33 ++++++-----
 8 files changed, 87 insertions(+), 190 deletions(-)
 delete mode 100644 layout/style/test/test_bug499655.html
 delete mode 100644 layout/style/test/test_bug499655.xhtml

diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index ea13346b31f..6ac64e3691d 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -2452,7 +2452,7 @@ CSSParserImpl::ParseSelectorList(nsCSSSelectorList*& aListHead,
 static PRBool IsSinglePseudoClass(const nsCSSSelector& aSelector)
 {
   return PRBool((aSelector.mNameSpace == kNameSpaceID_Unknown) &&
-                (aSelector.mLowercaseTag == nsnull) &&
+                (aSelector.mTag == nsnull) &&
                 (aSelector.mIDList == nsnull) &&
                 (aSelector.mClassList == nsnull) &&
                 (aSelector.mAttrList == nsnull) &&
@@ -2527,7 +2527,7 @@ CSSParserImpl::ParseSelectorGroup(nsCSSSelectorList*& aList)
             list->AddSelector(empty); // leave a blank (universal) selector in the middle
             listSel = list->mSelectors; // use the new one for the pseudo
           }
-          listSel->mLowercaseTag = pseudoElement;
+          listSel->mTag = pseudoElement;
         }
         else {  // append new pseudo element selector
           nsAutoPtr<nsCSSSelector> pseudoTagSelector(new nsCSSSelector());
@@ -2535,9 +2535,9 @@ CSSParserImpl::ParseSelectorGroup(nsCSSSelectorList*& aList)
             mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
             return PR_FALSE;
           }
-          pseudoTagSelector->mLowercaseTag = pseudoClassList->mAtom; // steal ref count
+          pseudoTagSelector->mTag = pseudoClassList->mAtom; // steal ref count
 #ifdef MOZ_XUL
-          if (IsTreePseudoElement(pseudoTagSelector->mLowercaseTag)) {
+          if (IsTreePseudoElement(pseudoTagSelector->mTag)) {
             // Take the remaining "pseudoclasses" that we parsed
             // inside the tree pseudoelement's ()-list, and
             // make our new selector have these pseudoclasses
@@ -2684,8 +2684,13 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
       }
       if (eCSSToken_Ident == mToken.mType) {  // element name
         aDataMask |= SEL_MASK_ELEM;
-
-        aSelector.SetTag(mToken.mIdent, mCaseSensitive);
+        if (mCaseSensitive) {
+          aSelector.SetTag(mToken.mIdent);
+        }
+        else {
+          ToLowerCase(mToken.mIdent, buffer);
+          aSelector.SetTag(buffer);
+        }
       }
       else if (mToken.IsSymbol('*')) {  // universal selector
         aDataMask |= SEL_MASK_ELEM;
@@ -2723,8 +2728,13 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
       }
       if (eCSSToken_Ident == mToken.mType) {  // element name
         aDataMask |= SEL_MASK_ELEM;
-       
-        aSelector.SetTag(mToken.mIdent, mCaseSensitive);
+        if (mCaseSensitive) {
+          aSelector.SetTag(mToken.mIdent);
+        }
+        else {
+          ToLowerCase(mToken.mIdent, buffer);
+          aSelector.SetTag(buffer);
+        }
       }
       else if (mToken.IsSymbol('*')) {  // universal selector
         aDataMask |= SEL_MASK_ELEM;
@@ -2738,8 +2748,13 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
     }
     else {  // was element name
       SetDefaultNamespaceOnSelector(aSelector);
-      aSelector.SetTag(buffer, mCaseSensitive);
-
+      if (mCaseSensitive) {
+        aSelector.SetTag(buffer);
+      }
+      else {
+        ToLowerCase(buffer);
+        aSelector.SetTag(buffer);
+      }
       aDataMask |= SEL_MASK_ELEM;
     }
     if (! GetToken(PR_FALSE)) {   // premature eof is ok (here!)
@@ -2757,7 +2772,13 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
     }
     if (eCSSToken_Ident == mToken.mType) {  // element name
       aDataMask |= SEL_MASK_ELEM;
-      aSelector.SetTag(mToken.mIdent, mCaseSensitive);
+      if (mCaseSensitive) {
+        aSelector.SetTag(mToken.mIdent);
+      }
+      else {
+        ToLowerCase(mToken.mIdent, buffer);
+        aSelector.SetTag(buffer);
+      }
     }
     else if (mToken.IsSymbol('*')) {  // universal selector
       aDataMask |= SEL_MASK_ELEM;
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index cb560f70753..a25fcafc9e7 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -210,7 +210,7 @@ RuleHash_TagTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr)
 {
   const RuleHashTableEntry *entry =
     static_cast<const RuleHashTableEntry*>(hdr);
-  return entry->mRules->mSelector->mLowercaseTag;
+  return entry->mRules->mSelector->mTag;
 }
 
 static nsIAtom*
@@ -513,8 +513,8 @@ void RuleHash::PrependRule(RuleValue *aRuleInfo)
     PrependRuleToTable(&mClassTable, selector->mClassList->mAtom, aRuleInfo);
     RULE_HASH_STAT_INCREMENT(mClassSelectors);
   }
-  else if (nsnull != selector->mLowercaseTag) {
-    PrependRuleToTable(&mTagTable, selector->mLowercaseTag, aRuleInfo);
+  else if (nsnull != selector->mTag) {
+    PrependRuleToTable(&mTagTable, selector->mTag, aRuleInfo);
     RULE_HASH_STAT_INCREMENT(mTagSelectors);
   }
   else if (kNameSpaceID_Unknown != selector->mNameSpace) {
@@ -1191,23 +1191,11 @@ static PRBool SelectorMatches(RuleProcessorData &data,
 
 {
   // namespace/tag match
-  // optimization : bail out early if we can
   if ((kNameSpaceID_Unknown != aSelector->mNameSpace &&
-       data.mNameSpaceID != aSelector->mNameSpace))
+       data.mNameSpaceID != aSelector->mNameSpace) ||
+      (aSelector->mTag && aSelector->mTag != data.mContentTag)) {
+    // optimization : bail out early if we can
     return PR_FALSE;
-
-  if (aSelector->mLowercaseTag) {
-    //If we tested that this is an HTML node in a text/html document and
-    //had some tweaks in RuleHash, we could remove case-sensitivity from
-    //style sheets.
-    if (data.mIsHTMLContent) {
-      if (data.mContentTag != aSelector->mLowercaseTag)
-        return PR_FALSE;
-    }
-    else {
-      if (data.mContentTag != aSelector->mCasedTag)
-        return PR_FALSE;
-    }
   }
 
   PRBool result = PR_TRUE;
@@ -1605,8 +1593,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
       if ((stateToCheck & (NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE)) &&
           data.mCompatMode == eCompatibility_NavQuirks &&
           // global selector (but don't check .class):
-          !aSelector->HasTagSelector() && !aSelector->mIDList && 
-          !aSelector->mAttrList &&
+          !aSelector->mTag && !aSelector->mIDList && !aSelector->mAttrList &&
           // This (or the other way around) both make :not() asymmetric
           // in quirks mode (and it's hard to work around since we're
           // testing the current mNegations, not the first
@@ -1942,10 +1929,7 @@ static void PseudoEnumFunc(nsICSSStyleRule* aRule, nsCSSSelector* aSelector,
 {
   PseudoRuleProcessorData* data = (PseudoRuleProcessorData*)aData;
 
-  if (!aSelector->IsPseudoElement())
-    return;
-
-  NS_ASSERTION(aSelector->mLowercaseTag == data->mPseudoTag, "RuleHash failure");
+  NS_ASSERTION(aSelector->mTag == data->mPseudoTag, "RuleHash failure");
   PRBool matches = PR_TRUE;
   if (data->mComparator)
     data->mComparator->PseudoMatches(data->mPseudoTag, aSelector, &matches);
diff --git a/layout/style/nsCSSStyleRule.cpp b/layout/style/nsCSSStyleRule.cpp
index fc3bab8ece7..9f73064c36c 100644
--- a/layout/style/nsCSSStyleRule.cpp
+++ b/layout/style/nsCSSStyleRule.cpp
@@ -258,8 +258,7 @@ nsAttrSelector::~nsAttrSelector(void)
 // -- nsCSSSelector -------------------------------
 
 nsCSSSelector::nsCSSSelector(void)
-  : mLowercaseTag(nsnull),
-    mCasedTag(nsnull),
+  : mTag(nsnull),
     mIDList(nsnull),
     mClassList(nsnull),
     mPseudoClassList(nsnull),
@@ -280,8 +279,7 @@ nsCSSSelector::Clone(PRBool aDeepNext, PRBool aDeepNegations) const
     return nsnull;
 
   result->mNameSpace = mNameSpace;
-  result->mLowercaseTag = mLowercaseTag;
-  result->mCasedTag = mCasedTag;
+  result->mTag = mTag;
   result->mOperator = mOperator;
   
   NS_IF_CLONE(mIDList);
@@ -318,8 +316,7 @@ nsCSSSelector::~nsCSSSelector(void)
 void nsCSSSelector::Reset(void)
 {
   mNameSpace = kNameSpaceID_Unknown;
-  mLowercaseTag = nsnull;
-  mCasedTag = nsnull;
+  mTag = nsnull;
   NS_IF_DELETE(mIDList);
   NS_IF_DELETE(mClassList);
   NS_IF_DELETE(mPseudoClassList);
@@ -337,23 +334,12 @@ void nsCSSSelector::SetNameSpace(PRInt32 aNameSpace)
   mNameSpace = aNameSpace;
 }
 
-void nsCSSSelector::SetTag(const nsString& aTag, PRBool aCaseMatters)
+void nsCSSSelector::SetTag(const nsString& aTag)
 {
-  if (aTag.IsEmpty()) {
-    mLowercaseTag = mCasedTag =  nsnull;
-    return;
-  }
-
-  mCasedTag = do_GetAtom(aTag);
- 
-  if (aCaseMatters) {
-    mLowercaseTag = mCasedTag;
-  } 
-  else {
-    nsAutoString lowercase(aTag);
-    ToLowerCase(lowercase);
-    mLowercaseTag = do_GetAtom(lowercase);
-  }
+  if (aTag.IsEmpty())
+    mTag = nsnull;
+  else
+    mTag = do_GetAtom(aTag);
 }
 
 void nsCSSSelector::AddID(const nsString& aID)
@@ -436,7 +422,7 @@ PRInt32 nsCSSSelector::CalcWeightWithoutNegations() const
 {
   PRInt32 weight = 0;
 
-  if (nsnull != mLowercaseTag) {
+  if (nsnull != mTag) {
     weight += 0x000001;
   }
   nsAtomList* list = mIDList;
@@ -472,6 +458,19 @@ PRInt32 nsCSSSelector::CalcWeight() const
   return weight;
 }
 
+// pseudo-elements are stored in the selectors' chain using fictional elements;
+// these fictional elements have mTag starting with a colon
+static PRBool IsPseudoElement(nsIAtom* aAtom)
+{
+  if (aAtom) {
+    const char* str;
+    aAtom->GetUTF8String(&str);
+    return str && (*str == ':');
+  }
+
+  return PR_FALSE;
+}
+
 //
 // Builds the textual representation of a selector. Called by DOM 2 CSS 
 // StyleRule:selectorText
@@ -500,7 +499,7 @@ nsCSSSelector::ToString(nsAString& aString, nsICSSStyleSheet* aSheet,
     // Append the combinator, if needed.
     if (!stack.IsEmpty()) {
       const nsCSSSelector *next = stack.ElementAt(index - 1);
-      if (!next->IsPseudoElement()) {
+      if (!IsPseudoElement(next->mTag)) {
         aString.Append(PRUnichar(' '));
         PRUnichar oper = s->mOperator;
         if (oper != PRUnichar(0)) {
@@ -533,7 +532,7 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
                    PRBool aIsNegated) const
 {
   nsAutoString temp;
-  PRBool isPseudoElement = IsPseudoElement();
+  PRBool isPseudoElement = IsPseudoElement(mTag);
 
   // For non-pseudo-element selectors or for lone pseudo-elements, deal with
   // namespace prefixes.
@@ -589,7 +588,7 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
     }
   }
       
-  if (!mLowercaseTag) {
+  if (!mTag) {
     // Universal selector:  avoid writing the universal selector when we
     // can avoid it, especially since we're required to avoid it for the
     // inside of :not()
@@ -606,12 +605,12 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
         // XXXldb Why?
         aString.Append(PRUnichar('*'));
       }
-      if (!nsCSSPseudoElements::IsCSS2PseudoElement(mLowercaseTag)) {
+      if (!nsCSSPseudoElements::IsCSS2PseudoElement(mTag)) {
         aString.Append(PRUnichar(':'));
       }
     }
     nsAutoString prefix;
-    mLowercaseTag->ToString(prefix);
+    mTag->ToString(prefix);
     aString.Append(prefix);
   }
 
diff --git a/layout/style/nsICSSStyleRule.h b/layout/style/nsICSSStyleRule.h
index d6a94d48d5f..067ff505060 100644
--- a/layout/style/nsICSSStyleRule.h
+++ b/layout/style/nsICSSStyleRule.h
@@ -152,7 +152,7 @@ public:
 
   void Reset(void);
   void SetNameSpace(PRInt32 aNameSpace);
-  void SetTag(const nsString& aTag, PRBool aCaseSensitive);
+  void SetTag(const nsString& aTag);
   void AddID(const nsString& aID);
   void AddClass(const nsString& aClass);
   void AddPseudoClass(nsIAtom* aPseudoClass);
@@ -163,14 +163,6 @@ public:
                     const nsString& aValue, PRBool aCaseSensitive);
   void SetOperator(PRUnichar aOperator);
 
-  inline PRBool HasTagSelector() const {
-    return !!mCasedTag;
-  }
-
-  inline PRBool IsPseudoElement() const {
-    return mLowercaseTag && !mCasedTag;
-  }
-
   // Calculate the specificity of this selector (not including its mNext!).
   PRInt32 CalcWeight() const;
 
@@ -196,12 +188,7 @@ private:
   PRInt32 CalcWeightWithoutNegations() const;
 
 public:
-  // For case-sensitive documents, mLowercaseTag is the same as mCasedTag,
-  // but in case-insensitive documents (HTML) mLowercaseTag is lowercase.
-  // Also, for pseudo-elements mCasedTag will be null but mLowercaseTag
-  // contains their name.
-  nsCOMPtr<nsIAtom> mLowercaseTag;
-  nsCOMPtr<nsIAtom> mCasedTag;
+  nsCOMPtr<nsIAtom> mTag;
   nsAtomList*     mIDList;
   nsAtomList*     mClassList;
   nsPseudoClassList* mPseudoClassList; // atom for the pseudo, string for
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index a4f88fa7fae..ac5c876d5f2 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -101,8 +101,6 @@ _TEST_FILES =	test_acid3_test46.html \
 		test_bug450191.html \
 		test_bug453896_deck.html \
 		test_bug470769.html \
-		test_bug499655.html \
-		test_bug499655.xhtml \
 		test_cascade.html \
 		test_compute_data_with_start_struct.html \
 		test_css_eof_handling.html \
diff --git a/layout/style/test/test_bug499655.html b/layout/style/test/test_bug499655.html
deleted file mode 100644
index 05ee443152a..00000000000
--- a/layout/style/test/test_bug499655.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=499655
--->
-<head>
-  <title>Test for Bug 499655</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=499655">Mozilla Bug 499655</a>
-<p id="display"></p>
-<div id="content">
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 499655 **/
-
-test1 = document.createElementNS("http://www.w3.org/1999/xhtml","test");
-test2 = document.createElementNS("http://www.w3.org/1999/xhtml","TEst");
-test3 = document.createElementNS("test","test");
-test4 = document.createElementNS("test","TEst");
-
-content = document.getElementById("content");
-
-content.appendChild(test1);
-content.appendChild(test2);
-content.appendChild(test3);
-content.appendChild(test4);
-
-list = document.querySelectorAll('test');
-is(list.length, 2, "Number of elements found");
-is(list[0], test1, "First element didn't match");
-is(list[1], test3, "Third element didn't match");
-
-list = document.querySelectorAll('TEst');
-is(list.length, 2, "Wrong number of elements found");
-is(list[0], test1, "First element didn't match");
-is(list[1], test4, "Fourth element didn't match");
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/style/test/test_bug499655.xhtml b/layout/style/test/test_bug499655.xhtml
deleted file mode 100644
index 45d756c9139..00000000000
--- a/layout/style/test/test_bug499655.xhtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=499655
--->
-<head>
-  <title>Test for Bug 499655</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/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=499655">Mozilla Bug 499655</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script type="application/javascript">
-<![CDATA[
-
-test1 = document.createElementNS("http://www.w3.org/1999/xhtml","test");
-test2 = document.createElementNS("http://www.w3.org/1999/xhtml","TEst");
-test3 = document.createElementNS("test","test");
-test4 = document.createElementNS("test","TEst");
-
-content = document.getElementById("content");
-
-content.appendChild(test1);
-content.appendChild(test2);
-content.appendChild(test3);
-content.appendChild(test4);
-
-
-list = document.querySelectorAll('test');
-is(list.length, 2, "Number of elements found");
-is(list[0], test1, "First element didn't match");
-is(list[1] , test3, "Third element didn't match");
-
-list = document.querySelectorAll('TEst');
-is(list.length, 2, "Number of elements found");
-is(list[0], test2, "Second element didn't match");
-is(list[1], test4, "Fourth element didn't match");
-
-
-]]>
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 102e8a9c6c6..b9847fb3c2f 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -4267,23 +4267,26 @@ nsTreeBodyFrame::GetPseudoStyleContext(nsIAtom* aPseudoElement)
 NS_IMETHODIMP
 nsTreeBodyFrame::PseudoMatches(nsIAtom* aTag, nsCSSSelector* aSelector, PRBool* aResult)
 {
-  NS_ABORT_IF_FALSE(aSelector->mLowercaseTag == aTag,
-                   "should not have been called");
-  // Iterate the pseudoclass list.  For each item in the list, see if
-  // it is contained in our scratch array.  If we have a miss, then
-  // we aren't a match.  If all items in the pseudoclass list are
-  // present in the scratch array, then we have a match.
-  nsPseudoClassList* curr = aSelector->mPseudoClassList;
-  while (curr) {
-    PRInt32 index;
-    mScratchArray->GetIndexOf(curr->mAtom, &index);
-    if (index == -1) {
-      *aResult = PR_FALSE;
-      return NS_OK;
+  if (aSelector->mTag == aTag) {
+    // Iterate the pseudoclass list.  For each item in the list, see if
+    // it is contained in our scratch array.  If we have a miss, then
+    // we aren't a match.  If all items in the pseudoclass list are
+    // present in the scratch array, then we have a match.
+    nsPseudoClassList* curr = aSelector->mPseudoClassList;
+    while (curr) {
+      PRInt32 index;
+      mScratchArray->GetIndexOf(curr->mAtom, &index);
+      if (index == -1) {
+        *aResult = PR_FALSE;
+        return NS_OK;
+      }
+      curr = curr->mNext;
     }
-    curr = curr->mNext;
+    *aResult = PR_TRUE;
   }
-  *aResult = PR_TRUE;
+  else 
+    *aResult = PR_FALSE;
+
   return NS_OK;
 }
 

From ee8f00d51cd4835200ffe1c5c0850b3feb80c9b1 Mon Sep 17 00:00:00 2001
From: Steffen Wilberg <steffen.wilberg@web.de>
Date: Fri, 31 Jul 2009 19:58:17 +0200
Subject: [PATCH 125/175] Bug 206544: Add 'Full Screen' toolbar button. Based
 on a patch by Georges-Etienne Legendre. r=dao, ui-r=boriss

---
 browser/base/content/browser-menubar.inc      |  2 +-
 browser/base/content/browser.js               |  2 +-
 browser/base/content/browser.xul              |  8 +++++-
 .../locales/en-US/chrome/browser/browser.dtd  |  1 +
 .../themes/gnomestripe/browser/browser.css    |  8 ++++++
 browser/themes/winstripe/browser/browser.css  | 27 +++++++++++++++++++
 6 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 485c041c639..f6f3be160db 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -439,7 +439,7 @@
                           label="&fullScreenCmd.label;"
                           key="key_fullScreen"
                           type="checkbox"
-                          command="View:FullScreen"/>
+                          observes="View:FullScreen"/>
 #endif
                 <menuitem id="menu_showAllTabs"
                           hidden="true"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 2575b63af85..a07ce65feba 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3472,7 +3472,7 @@ var FullScreen =
     // show/hide all menubars, toolbars, and statusbars (except the full screen toolbar)
     this.showXULChrome("toolbar", window.fullScreen);
     this.showXULChrome("statusbar", window.fullScreen);
-    document.getElementById("fullScreenItem").setAttribute("checked", !window.fullScreen);
+    document.getElementById("View:FullScreen").setAttribute("checked", !window.fullScreen);
 
     var fullScrToggler = document.getElementById("fullscr-toggler");
     if (!window.fullScreen) {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 9d7515a561a..f22370f9217 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -511,7 +511,13 @@
                        label="&pasteCmd.label;"
                        command="cmd_paste"
                        tooltiptext="&pasteButton.tooltip;"/>
-
+#ifndef XP_MACOSX
+        <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                       observes="View:FullScreen"
+                       type="checkbox"
+                       label="&fullScreenCmd.label;"
+                       tooltiptext="&fullScreenButton.tooltip;"/>
+#ifndef XP_MACOSX
     </toolbarpalette>
 
     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 4cc6633ecab..a891b6beb6b 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -370,6 +370,7 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY cutButton.tooltip              "Cut">
 <!ENTITY copyButton.tooltip             "Copy">
 <!ENTITY pasteButton.tooltip            "Paste">
+<!ENTITY fullScreenButton.tooltip       "Display the window in full screen">
 
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "x">
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index 5669fb879a3..96a3a129b7d 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -627,6 +627,10 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
   list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
 }
 
+#fullscreen-button {
+  list-style-image: url("moz-icon://stock/gtk-fullscreen?size=toolbar");
+}
+
 /* 16px primary toolbar buttons */
 toolbar[iconsize="small"] .toolbarbutton-1 {
   -moz-box-orient: vertical;
@@ -764,6 +768,10 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled");
 }
 
+toolbar[iconsize="small"] #fullscreen-button {
+  list-style-image: url("moz-icon://stock/gtk-fullscreen?size=menu");
+}
+
 /* Fullscreen window controls */
 #window-controls {
   -moz-box-align: start;
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index 1b0af9a5a71..3abedde333b 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -696,6 +696,18 @@ toolbar:not([iconsize="small"]) #new-window-button > .toolbarbutton-icon {
   -moz-image-region: rect(96px 336px 120px 312px);
 }
 
+/* fullscreen button */
+
+#fullscreen-button {
+  -moz-image-region: rect(0px 360px 24px 336px);
+}
+#fullscreen-button:hover {
+  -moz-image-region: rect(24px 360px 48px 336px);
+}
+#fullscreen-button:hover:active {
+  -moz-image-region: rect(96px 360px 120px 336px);
+}
+
 /* ::::: 16px primary toolbar buttons ::::: */
 
 toolbar[iconsize="small"] .toolbarbutton-1 {
@@ -1008,6 +1020,21 @@ toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 224px 80px 208px);
 }
 
+/* fullscreen button */
+
+toolbar[iconsize="small"] #fullscreen-button > .toolbarbutton-icon {
+  padding-left: 1px;
+}
+toolbar[iconsize="small"] #fullscreen-button {
+  -moz-image-region: rect(0px 240px 16px 224px);
+}
+toolbar[iconsize="small"] #fullscreen-button:hover {
+  -moz-image-region: rect(16px 240px 32px 224px);
+}
+toolbar[iconsize="small"] #fullscreen-button:hover:active {
+  -moz-image-region: rect(64px 240px 80px 224px);
+}
+
 /* ::::: fullscreen window controls ::::: */
 
 #minimize-button,

From 4032320e0584d65c1cd812d0736125cd10f38441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 31 Jul 2009 20:39:55 +0200
Subject: [PATCH 126/175] OS X bustage fix

---
 browser/base/content/browser.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index f22370f9217..ae8f55a7067 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -517,7 +517,7 @@
                        type="checkbox"
                        label="&fullScreenCmd.label;"
                        tooltiptext="&fullScreenButton.tooltip;"/>
-#ifndef XP_MACOSX
+#endif
     </toolbarpalette>
 
     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"

From ce757475abe0158a5ac87ae37c4c0821ee302ca1 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Fri, 31 Jul 2009 21:58:42 +0200
Subject: [PATCH 127/175] Bug 491784 - runxpcshelltests.py should generate a
 count summary, as reftest and mochitest do; (Av1a) Just do it, plus followup
 fix for bug 485736; r=ted.mielczarek

---
 config/rules.mk                      |  4 ++--
 js/src/config/rules.mk               |  4 ++--
 testing/testsuite-targets.mk         |  2 +-
 testing/xpcshell/runxpcshelltests.py | 17 ++++++++++++++---
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index 86004325f3d..5172c2e747d 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -179,7 +179,7 @@ check-interactive:
           -I$(topsrcdir)/build \
           $(testxpcsrcdir)/runxpcshelltests.py \
           --symbols-path=$(DIST)/crashreporter-symbols \
-          --test=$(SOLO_FILE) \
+          --test-path=$(SOLO_FILE) \
           --interactive \
           $(DIST)/bin/xpcshell \
           $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
@@ -190,7 +190,7 @@ check-one:
           -I$(topsrcdir)/build \
           $(testxpcsrcdir)/runxpcshelltests.py \
           --symbols-path=$(DIST)/crashreporter-symbols \
-          --test=$(SOLO_FILE) \
+          --test-path=$(SOLO_FILE) \
           $(DIST)/bin/xpcshell \
           $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
 
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 86004325f3d..5172c2e747d 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -179,7 +179,7 @@ check-interactive:
           -I$(topsrcdir)/build \
           $(testxpcsrcdir)/runxpcshelltests.py \
           --symbols-path=$(DIST)/crashreporter-symbols \
-          --test=$(SOLO_FILE) \
+          --test-path=$(SOLO_FILE) \
           --interactive \
           $(DIST)/bin/xpcshell \
           $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
@@ -190,7 +190,7 @@ check-one:
           -I$(topsrcdir)/build \
           $(testxpcsrcdir)/runxpcshelltests.py \
           --symbols-path=$(DIST)/crashreporter-symbols \
-          --test=$(SOLO_FILE) \
+          --test-path=$(SOLO_FILE) \
           $(DIST)/bin/xpcshell \
           $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
 
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 587831ccaf8..d8247ac0a5c 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -98,7 +98,7 @@ crashtest:
 # Usage: |make [TEST_PATH=...] [EXTRA_TEST_ARGS=...] xpcshell-tests|.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
-          -I$(topsrcdir)/build \
+	  -I$(topsrcdir)/build \
 	  $(topsrcdir)/testing/xpcshell/runxpcshelltests.py \
 	  --manifest=$(DEPTH)/_tests/xpcshell/all-test-dirs.list \
 	  $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS) \
diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
index ea1edab4048..b0a78305da9 100644
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -87,6 +87,9 @@ def runTests(xpcshell, testdirs=[], xrePath=None, testPath=None,
     print >>sys.stderr, "Error: No test dirs or test manifest specified!"
     return False
 
+  passCount = 0
+  failCount = 0
+
   testharnessdir = os.path.dirname(os.path.abspath(__file__))
   xpcshell = os.path.abspath(xpcshell)
   # we assume that httpd.js lives in components/ relative to xpcshell
@@ -181,7 +184,6 @@ def runTests(xpcshell, testdirs=[], xrePath=None, testPath=None,
     testdirs = readManifest(os.path.abspath(manifest))
 
   # Process each test directory individually.
-  success = True
   for testdir in testdirs:
     if testPath and not testdir.endswith(testPath):
       continue
@@ -236,9 +238,10 @@ def runTests(xpcshell, testdirs=[], xrePath=None, testPath=None,
   %s
   <<<<<<<""" % (test, proc.returncode, stdout)
         checkForCrashes(testdir, symbolsPath, testName=test)
-        success = False
+        failCount += 1
       else:
         print "TEST-PASS | %s | test passed" % test
+        passCount += 1
 
       leakReport = processLeakLog(leakLogFile)
 
@@ -257,7 +260,15 @@ def runTests(xpcshell, testdirs=[], xrePath=None, testPath=None,
       if os.path.exists(leakLogFile):
         os.remove(leakLogFile)
 
-  return success
+  if passCount == 0 and failCount == 0:
+    print "TEST-UNEXPECTED-FAIL | runxpcshelltests.py | No tests run. Did you pass an invalid --test-path?"
+    failCount = 1
+
+  print """INFO | Result summary:
+INFO | Passed: %d
+INFO | Failed: %d""" % (passCount, failCount)
+
+  return failCount == 0
 
 def main():
   """Process command line arguments and call runTests() to do the real work."""

From 1c431113cba25f7c0fea92f1f670d4a5f8ffb693 Mon Sep 17 00:00:00 2001
From: Takanori MATSUURA <t.matsuu@gmail.com>
Date: Fri, 31 Jul 2009 22:01:46 +0200
Subject: [PATCH 128/175] Bug 505367 - Improve python compatibility in
 extensions/python/xpcom/__init__.py; r=mhammond

---
 extensions/python/xpcom/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/python/xpcom/__init__.py b/extensions/python/xpcom/__init__.py
index cbfd59e61ed..15ae60eb7ac 100644
--- a/extensions/python/xpcom/__init__.py
+++ b/extensions/python/xpcom/__init__.py
@@ -51,7 +51,7 @@ class Exception(exceptions.Exception):
     def __init__(self, errno, message = None):
         assert int(errno) == errno, "The errno param must be an integer"
         self.errno = errno
-        self.message = message
+        self.msg = message
         exceptions.Exception.__init__(self, errno)
     def __str__(self):
         if not hr_map:
@@ -59,7 +59,7 @@ class Exception(exceptions.Exception):
             for name, val in nsError.__dict__.items():
                 if type(val)==type(0):
                     hr_map[val] = name
-        message = self.message
+        message = self.msg
         if message is None:
             message = hr_map.get(self.errno)
             if message is None:

From 599bcae2355244f25454cc8001cdff3a62a107ab Mon Sep 17 00:00:00 2001
From: Josh Aas <joshmoz@gmail.com>
Date: Fri, 31 Jul 2009 16:49:48 -0400
Subject: [PATCH 129/175] Backed out changeset ad9a4a3a5409, bug 506812. CLOSED
 TREE

---
 xpcom/io/nsLocalFileOSX.h  |   4 +
 xpcom/io/nsLocalFileOSX.mm | 280 +++++++++++++++++++++----------------
 2 files changed, 164 insertions(+), 120 deletions(-)

diff --git a/xpcom/io/nsLocalFileOSX.h b/xpcom/io/nsLocalFileOSX.h
index e29502980d0..957e2d3abfa 100644
--- a/xpcom/io/nsLocalFileOSX.h
+++ b/xpcom/io/nsLocalFileOSX.h
@@ -43,6 +43,8 @@
 #include "nsString.h"
 #include "nsIHashable.h"
 
+class nsDirEnumerator;
+
 // Mac OS X 10.4 does not have stat64/lstat64
 #if defined(HAVE_STAT64) && defined(HAVE_LSTAT64) && (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4)
 #define STAT stat64
@@ -69,6 +71,8 @@
 class NS_COM nsLocalFile : public nsILocalFileMac,
                            public nsIHashable
 {
+  friend class nsDirEnumerator;
+    
 public:
   NS_DEFINE_STATIC_CID_ACCESSOR(NS_LOCAL_FILE_CID)
 
diff --git a/xpcom/io/nsLocalFileOSX.mm b/xpcom/io/nsLocalFileOSX.mm
index e620891e2f9..14e13d89b58 100644
--- a/xpcom/io/nsLocalFileOSX.mm
+++ b/xpcom/io/nsLocalFileOSX.mm
@@ -67,7 +67,6 @@
 #include <sys/statvfs.h>
 #include <stdlib.h>
 #include <utime.h>
-#include <dirent.h>
 
 #define CHECK_INIT()                            \
     PR_BEGIN_MACRO                              \
@@ -79,7 +78,17 @@ static nsresult MacErrorMapper(OSErr inErr);
 static void CopyUTF8toUTF16NFC(const nsACString& aSrc, nsAString& aResult);
 static nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr);
 
-const char kPathSepChar = '/';
+#pragma mark -
+#pragma mark [FSRef operator==]
+
+bool operator==(const FSRef& lhs, const FSRef& rhs)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
+
+  return (::FSCompareFSRefs(&lhs, &rhs) == noErr);
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
+}
 
 #pragma mark -
 #pragma mark [StFollowLinksState]
@@ -113,136 +122,167 @@ class StFollowLinksState
 #pragma mark -
 #pragma mark [nsDirEnumerator]
 
-class NS_COM
-nsDirEnumerator : public nsISimpleEnumerator,
-                  public nsIDirectoryEnumerator
+class nsDirEnumerator : public nsISimpleEnumerator,
+                        public nsIDirectoryEnumerator
 {
-public:
-  nsDirEnumerator();
+    public:
 
-  // nsISupports interface
-  NS_DECL_ISUPPORTS
+        NS_DECL_ISUPPORTS
 
-  // nsISimpleEnumerator interface
-  NS_DECL_NSISIMPLEENUMERATOR
+        nsDirEnumerator() :
+          mIterator(nsnull),
+          mFSRefsArray(nsnull),
+          mArrayCnt(0), mArrayIndex(0)
+        {
+        }
 
-  // nsIDirectoryEnumerator interface
-  NS_DECL_NSIDIRECTORYENUMERATOR
+        nsresult Init(nsILocalFileMac* parent) 
+        {
+          NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  NS_IMETHOD Init(nsLocalFile *parent);
+          NS_ENSURE_ARG(parent);
+          
+          OSErr err;
+          nsresult rv;
+          FSRef parentRef;
+          
+          rv = parent->GetFSRef(&parentRef);
+          if (NS_FAILED(rv))
+            return rv;
+          
+          mFSRefsArray = (FSRef *)nsMemory::Alloc(sizeof(FSRef)
+                                                  * kRequestCountPerIteration);
+          if (!mFSRefsArray)
+            return NS_ERROR_OUT_OF_MEMORY;
+          
+          err = ::FSOpenIterator(&parentRef, kFSIterateFlat, &mIterator);
+          if (err != noErr)
+            return MacErrorMapper(err);
+                              
+          return NS_OK;
 
-private:
-  ~nsDirEnumerator();
+          NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
+        }
 
-protected:
-  NS_IMETHOD GetNextEntry();
+        NS_IMETHOD HasMoreElements(PRBool *result) 
+        {
+          NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  DIR           *mDir;
-  struct dirent *mEntry;
-  nsCString      mParentPath;
+          if (!mIterator || !mFSRefsArray) {
+            *result = PR_FALSE;
+            return NS_OK;
+          }
+
+          if (mNext == nsnull) {
+            if (mArrayIndex >= mArrayCnt) {
+              ItemCount actualCnt;
+              OSErr err = ::FSGetCatalogInfoBulk(mIterator,
+                                           kRequestCountPerIteration,
+                                           &actualCnt,
+                                           nsnull,
+                                           kFSCatInfoNone,
+                                           nsnull,
+                                           mFSRefsArray,
+                                           nsnull,
+                                           nsnull);
+            
+              if (err == noErr || err == errFSNoMoreItems) {
+                mArrayCnt = actualCnt;
+                mArrayIndex = 0;
+              }
+            }
+
+            if (mArrayIndex < mArrayCnt) {
+              nsRefPtr<nsLocalFile> newFile = new nsLocalFile;
+              if (!newFile)
+                return NS_ERROR_OUT_OF_MEMORY;
+              FSRef fsRef = mFSRefsArray[mArrayIndex];
+              if (NS_FAILED(newFile->InitWithFSRef(&fsRef)))
+                return NS_ERROR_FAILURE;
+              mArrayIndex++;
+              mNext = newFile;
+            } 
+          }
+
+          *result = mNext != nsnull;
+          if (!*result)
+            Close();
+
+          return NS_OK;
+
+          NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
+        }
+
+        NS_IMETHOD GetNext(nsISupports **result) 
+        {
+            NS_ENSURE_ARG_POINTER(result);
+            *result = nsnull;
+
+            nsresult rv;
+            PRBool hasMore;
+            rv = HasMoreElements(&hasMore);
+            if (NS_FAILED(rv)) return rv;
+
+            *result = mNext; // might return nsnull
+            NS_IF_ADDREF(*result);
+
+            mNext = nsnull;
+            return NS_OK;
+        }
+
+        NS_IMETHOD GetNextFile(nsIFile **result)
+        {
+            *result = nsnull;
+            PRBool hasMore = PR_FALSE;
+            nsresult rv = HasMoreElements(&hasMore);
+            if (NS_FAILED(rv) || !hasMore)
+                return rv;
+            *result = mNext;
+            NS_IF_ADDREF(*result);
+            mNext = nsnull;
+            return NS_OK;
+        }
+
+        NS_IMETHOD Close()
+        {
+          NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
+
+          if (mIterator) {
+            ::FSCloseIterator(mIterator);
+            mIterator = nsnull;
+          }
+          if (mFSRefsArray) {
+            nsMemory::Free(mFSRefsArray);
+            mFSRefsArray = nsnull;
+          }
+          return NS_OK;
+
+          NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
+        }
+
+    private:
+        ~nsDirEnumerator() 
+        {
+          Close();
+        }
+
+    protected:
+        // According to Apple doc, request the number of objects
+        // per call that will fit in 4 VM pages.
+        enum {
+          kRequestCountPerIteration = ((4096 * 4) / sizeof(FSRef))
+        };
+        
+        nsCOMPtr<nsILocalFileMac>   mNext;
+        
+        FSIterator              mIterator;
+        FSRef                   *mFSRefsArray;
+        PRInt32                 mArrayCnt, mArrayIndex;
 };
 
-nsDirEnumerator::nsDirEnumerator() :
-mDir(nsnull), 
-mEntry(nsnull)
-{
-}
-
-nsDirEnumerator::~nsDirEnumerator()
-{
-  Close();
-}
-
 NS_IMPL_ISUPPORTS2(nsDirEnumerator, nsISimpleEnumerator, nsIDirectoryEnumerator)
 
-NS_IMETHODIMP
-nsDirEnumerator::Init(nsLocalFile *parent)
-{
-  nsCAutoString dirPath;
-  if (NS_FAILED(parent->GetNativePath(dirPath)) ||
-      dirPath.IsEmpty()) {
-    return NS_ERROR_FILE_INVALID_PATH;
-  }
-
-  if (NS_FAILED(parent->GetNativePath(mParentPath)))
-    return NS_ERROR_FAILURE;
-
-  mDir = opendir(dirPath.get());
-  if (!mDir)
-    return NSRESULT_FOR_ERRNO();
-  return GetNextEntry();
-}
-
-NS_IMETHODIMP
-nsDirEnumerator::HasMoreElements(PRBool *result)
-{
-  *result = mDir && mEntry;
-  if (!*result)
-    Close();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDirEnumerator::GetNext(nsISupports **_retval)
-{
-  nsCOMPtr<nsIFile> file;
-  nsresult rv = GetNextFile(getter_AddRefs(file));
-  if (NS_FAILED(rv))
-    return rv;
-  NS_IF_ADDREF(*_retval = file);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDirEnumerator::GetNextEntry()
-{
-  do {
-    errno = 0;
-    mEntry = readdir(mDir);
-
-    // end of dir or error
-    if (!mEntry)
-      return NSRESULT_FOR_ERRNO();
-
-    // keep going past "." and ".."
-  } while (mEntry->d_name[0] == '.'     &&
-           (mEntry->d_name[1] == '\0'    ||   // .\0
-            (mEntry->d_name[1] == '.'     &&
-             mEntry->d_name[2] == '\0')));      // ..\0
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDirEnumerator::GetNextFile(nsIFile **_retval)
-{
-  nsresult rv;
-  if (!mDir || !mEntry) {
-    *_retval = nsnull;
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsILocalFile> file = new nsLocalFile();
-  if (!file)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  if (NS_FAILED(rv = file->InitWithNativePath(mParentPath)) ||
-      NS_FAILED(rv = file->AppendNative(nsDependentCString(mEntry->d_name))))
-    return rv;
-
-  *_retval = file;
-  NS_ADDREF(*_retval);
-  return GetNextEntry();
-}
-
-NS_IMETHODIMP 
-nsDirEnumerator::Close()
-{
-  if (mDir) {
-    closedir(mDir);
-    mDir = nsnull;
-  }
-  return NS_OK;
-}
+const char kPathSepChar = '/';
 
 #pragma mark -
 #pragma mark [CTORs/DTOR]

From 257c42b2d3b1da0dab1f7e84d06859a3776afd4b Mon Sep 17 00:00:00 2001
From: Josh Aas <joshmoz@gmail.com>
Date: Fri, 31 Jul 2009 16:53:51 -0400
Subject: [PATCH 130/175] Backed out changeset 4318f781ab87 to investigate Ts
 changes, b=506812 CLOSED TREE

---
 toolkit/xre/nsAppRunner.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 14c5f22108e..1c5870399ae 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1439,7 +1439,13 @@ XRE_GetBinaryPath(const char* argv0, nsILocalFile* *aResult)
   if (!bundleURL)
     return NS_ERROR_FAILURE;
 
-  rv = lfm->InitWithCFURL(bundleURL);
+  FSRef fileRef;
+  if (!CFURLGetFSRef(bundleURL, &fileRef)) {
+    CFRelease(bundleURL);
+    return NS_ERROR_FAILURE;
+  }
+
+  rv = lfm->InitWithFSRef(&fileRef);
   CFRelease(bundleURL);
 
   if (NS_FAILED(rv))

From 1645df09eac277f29e5ef8e7b6980a3dcedd743e Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 31 Jul 2009 14:36:57 -0700
Subject: [PATCH 131/175] Backed out changeset 8cd49a8cbb88 (bug 501608) on
 suspicion of causing lots of mochitest-browser-chrome timeouts and leaks (bug
 507698).

---
 toolkit/content/tests/browser/Makefile.in     |   6 -
 .../browser_keyevents_during_autoscrolling.js | 118 ------------------
 toolkit/content/widgets/browser.xml           |  24 +---
 3 files changed, 1 insertion(+), 147 deletions(-)
 delete mode 100644 toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js

diff --git a/toolkit/content/tests/browser/Makefile.in b/toolkit/content/tests/browser/Makefile.in
index f01914c6d6e..20da998b2a8 100644
--- a/toolkit/content/tests/browser/Makefile.in
+++ b/toolkit/content/tests/browser/Makefile.in
@@ -50,11 +50,5 @@ _BROWSER_FILES = \
   browser_bug471962.js \
   $(NULL)
 
-# browser_keyevents_during_autoscrolling.js cannot start the autoscrolling by
-# synthesizeMouse with middle button on linux, therefore, disable it temporarily
-ifneq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-_BROWSER_FILES += browser_keyevents_during_autoscrolling.js
-endif
-
 libs:: $(_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
diff --git a/toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js b/toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js
deleted file mode 100644
index c94ef68e07d..00000000000
--- a/toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js
+++ /dev/null
@@ -1,118 +0,0 @@
-function test()
-{
-  const kPrefName_AutoScroll = "general.autoScroll";
-  const kPrefName_ContentLoadURL = "middlemouse.contentLoadURL";
-  var prefSvc = Components.classes["@mozilla.org/preferences-service;1"]
-                          .getService(Components.interfaces.nsIPrefBranch2);
-  var kAutoScrollingEnabled = prefSvc.getBoolPref(kPrefName_AutoScroll);
-  prefSvc.setBoolPref(kPrefName_AutoScroll, true);
-
-  const kNoKeyEvents   = 0;
-  const kKeyDownEvent  = 1;
-  const kKeyPressEvent = 2;
-  const kKeyUpEvent    = 4;
-  const kAllKeyEvents  = 7;
-
-  var expectedKeyEvents;
-  var dispatchedKeyEvents;
-  var key;
-  var root;
-
-  function sendKey(aKey)
-  {
-    key = aKey;
-    dispatchedKeyEvents = kNoKeyEvents;
-    EventUtils.synthesizeKey(key, {}, gBrowser.contentWindow);
-    is(dispatchedKeyEvents, expectedKeyEvents,
-       "unexpected key events were dispatched or not dispatched: " + key);
-  }
-
-  function onKey(aEvent)
-  {
-    if (aEvent.target != root) {
-      ok(false, "unknown target: " + aEvent.target.tagName);
-      return;
-    }
-
-    var keyFlag;
-    switch (aEvent.type) {
-      case "keydown":
-        keyFlag = kKeyDownEvent;
-        break;
-      case "keypress":
-        keyFlag = kKeyPressEvent;
-        break;
-      case "keyup":
-        keyFlag = kKeyUpEvent;
-        break;
-      default:
-        ok(false, "Unknown events: " + aEvent.type);
-        return;
-    }
-    dispatchedKeyEvents |= keyFlag;
-    is(keyFlag, expectedKeyEvents & keyFlag, aEvent.type + " fired: " + key);
-  }
-
-  function startTest() {
-    waitForExplicitFinish();
-    gBrowser.addEventListener("load", onLoad, false);
-    var dataUri = 'data:text/html,<body style="height:10000px;"></body>';
-    gBrowser.loadURI(dataUri);
-  }
-
-  function onLoad() {
-    gBrowser.removeEventListener("load", onLoad, false);
-
-    gBrowser.contentWindow.focus();
-
-    var doc = gBrowser.contentDocument;
-
-    root = doc.documentElement;
-    root.addEventListener("keydown", onKey, true);
-    root.addEventListener("keypress", onKey, true);
-    root.addEventListener("keyup", onKey, true);
-
-    // Test whether the key events are handled correctly under normal condition
-    expectedKeyEvents = kAllKeyEvents;
-    sendKey("A");
-
-    // Start autoscrolling by middle button lick on the page
-    EventUtils.synthesizeMouse(root, 10, 10, { button: 1 },
-                               gBrowser.contentWindow);
-
-    // Most key events should be eaten by the browser.
-    expectedKeyEvents = kNoKeyEvents;
-    sendKey("A");
-    sendKey("VK_DOWN");
-    sendKey("VK_RETURN");
-    sendKey("VK_ENTER");
-    sendKey("VK_HOME");
-    sendKey("VK_END");
-    sendKey("VK_TAB");
-    sendKey("VK_ENTER");
-
-    // Finish autoscrolling by ESC key.  Note that only keydown and keypress
-    // events are eaten because keyup event is fired *after* the autoscrolling
-    // is finished.
-    expectedKeyEvents = kKeyUpEvent;
-    sendKey("VK_ESCAPE");
-
-    // Test whether the key events are handled correctly under normal condition
-    expectedKeyEvents = kAllKeyEvents;
-    sendKey("A");
-
-    root.removeEventListener("keydown", onKey, true);
-    root.removeEventListener("keypress", onKey, true);
-    root.removeEventListener("keyup", onKey, true);
-
-    // restore the changed prefs
-    prefSvc.setBoolPref(kPrefName_AutoScroll, kAutoScrollingEnabled);
-
-    // cleaning-up
-    gBrowser.loadURI("about:blank");
-
-    finish();
-  }
-
-  startTest();
-}
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index fdd6cd78ef7..12a73b2b84c 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -757,9 +757,6 @@
               window.removeEventListener("mousedown", this, true);
               window.removeEventListener("mouseup", this, true);
               window.removeEventListener("contextmenu", this, true);
-              window.removeEventListener("keydown", this, true);
-              window.removeEventListener("keypress", this, true);
-              window.removeEventListener("keyup", this, true);
               clearInterval(this._autoScrollTimer);
             }
          ]]>
@@ -770,7 +767,7 @@
         <body>
           <![CDATA[
             const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-            var popup = document.createElementNS(XUL_NS, "panel");
+            var popup = document.createElementNS(XUL_NS, "popup");
             popup.className = "autoscroller";
             return popup;
           ]]>
@@ -831,9 +828,6 @@
             window.addEventListener("mousedown", this, true);
             window.addEventListener("mouseup", this, true);
             window.addEventListener("contextmenu", this, true);
-            window.addEventListener("keydown", this, true);
-            window.addEventListener("keypress", this, true);
-            window.addEventListener("keyup", this, true);
 
             this._scrollErrorX = 0;
             this._scrollErrorY = 0;
@@ -957,22 +951,6 @@
                 this.stopScroll();
                 break;
               }
-              case "keypress": {
-                if (aEvent.keyCode == aEvent.DOM_VK_ESCAPE) {
-                  // the escape key will be processed by
-                  // nsXULPopupManager::KeyPress and the panel will be closed.
-                  // So, nothing to do here.
-                  break;
-                }
-                // don't break here. we need to eat keypress events.
-              }
-              case "keydown":
-              case "keyup": {
-                // All keyevents should be eaten here during autoscrolling.
-                aEvent.stopPropagation();
-                aEvent.preventDefault();
-                break;
-              }
             }
           }
         ]]>

From eb22677e8070eed16bb9d782480586cc3b4d4df8 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 31 Jul 2009 19:37:14 -0700
Subject: [PATCH 132/175] Backed out changeset 6a5f22ccbe0e (no bug) to see if
 it is the cause of the mozilla-browser-chrome orange (bug 507605 and bug
 507698)

---
 .../components/sessionstore/test/browser/browser_483330.js    | 4 ++--
 .../components/sessionstore/test/browser/browser_491168.js    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/components/sessionstore/test/browser/browser_483330.js b/browser/components/sessionstore/test/browser/browser_483330.js
index 993c94c8c1e..c060e7ab5fb 100644
--- a/browser/components/sessionstore/test/browser/browser_483330.js
+++ b/browser/components/sessionstore/test/browser/browser_483330.js
@@ -10,7 +10,7 @@ function test() {
 
   let browser = tab.linkedBrowser;
   browser.addEventListener("load", function loadListener(e) {
-    browser.removeEventListener("load", arguments.callee, true);
+    browser.removeEventListener("load", arguments.callee, false);
 
     // Scroll the content document
     browser.contentWindow.scrollTo(1100, 1200);
@@ -21,7 +21,7 @@ function test() {
 
     let newTab = ss.undoCloseTab(window, 0);
     newTab.addEventListener("SSTabRestored", function tabRestored(e) {
-      newTab.removeEventListener("SSTabRestored", arguments.callee, true);
+      newTab.removeEventListener("SSTabRestored", arguments.callee, false);
 
       let newBrowser = newTab.linkedBrowser;
 
diff --git a/browser/components/sessionstore/test/browser/browser_491168.js b/browser/components/sessionstore/test/browser/browser_491168.js
index b6bbd6a3adc..09b7820290c 100644
--- a/browser/components/sessionstore/test/browser/browser_491168.js
+++ b/browser/components/sessionstore/test/browser/browser_491168.js
@@ -61,13 +61,13 @@ function test() {
     ss.setTabState(tab, JSON.stringify(tabState));
 
     tab.addEventListener("SSTabRestored", function() {
-      tab.removeEventListener("SSTabRestored", arguments.callee, true);
+      tab.removeEventListener("SSTabRestored", arguments.callee, false);
       is(window.content.document.referrer, REFERRER2, "document.referrer matches referrer set via setTabState.");
 
       gBrowser.removeTab(tab);
       let newTab = ss.undoCloseTab(window, 0);
       newTab.addEventListener("SSTabRestored", function() {
-        newTab.removeEventListener("SSTabRestored", arguments.callee, true);
+        newTab.removeEventListener("SSTabRestored", arguments.callee, false);
 
         is(window.content.document.referrer, REFERRER2, "document.referrer is still correct after closing and reopening the tab.");
         gBrowser.removeTab(newTab);

From 2e17ebbc0a9219c682ee8a98eeb7ad2b8b39611e Mon Sep 17 00:00:00 2001
From: Mark Banner <bugzilla@standard8.plus.com>
Date: Sat, 1 Aug 2009 08:49:57 +0100
Subject: [PATCH 133/175] Bug 487857 Add some extra checks to
 test_bug_401582.js to try and determine the cause of its frequent timeouts
 which seem to have got worse over the last day or two. Test-only change.
 r=sdwilsh CLOSED TREE

---
 toolkit/components/downloads/test/unit/test_bug_406857.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/toolkit/components/downloads/test/unit/test_bug_406857.js b/toolkit/components/downloads/test/unit/test_bug_406857.js
index 9d9ff76d152..88df501eeff 100644
--- a/toolkit/components/downloads/test/unit/test_bug_406857.js
+++ b/toolkit/components/downloads/test/unit/test_bug_406857.js
@@ -85,6 +85,11 @@ function run_test()
           try { file.remove(false); } catch(e) { /* stupid windows box */ }
           do_test_finished();
           break;
+        case dm.DOWNLOAD_FAILED:
+        case dm.DOWNLOAD_CANCELED:
+          do_throw("Unexpected download state change received, state: " +
+                   aDownload.state);
+          break;
       }
     }
   };

From d363a6f201b685c64679636e072e8db1c5db2c7a Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Sat, 1 Aug 2009 10:03:13 +0200
Subject: [PATCH 134/175] Bug 507172 - random failure in
 browser_ui_bookmarks_sidebar.js, disable test for now while CLOSED TREE

---
 .../components/places/tests/perf/Makefile.in  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/browser/components/places/tests/perf/Makefile.in b/browser/components/places/tests/perf/Makefile.in
index 83e564dd43d..eee9c99fc4f 100644
--- a/browser/components/places/tests/perf/Makefile.in
+++ b/browser/components/places/tests/perf/Makefile.in
@@ -45,17 +45,18 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _CHROME_FILES = \
-  perf_large_delete.xul \
-  $(NULL)
+	perf_large_delete.xul \
+	$(NULL)
 
-_BROWSER_TEST_FILES = \
-  browser_ui_000_data.js\
-  browser_ui_bookmarks_sidebar.js\
-  browser_ui_history_sidebar.js\
-  $(NULL)
 # XXX disabled tests, not working properly yet
-#  browser_ui_history_menu.js\
-#  browser_ui_locationbar.js\
+#  browser_ui_history_menu.js
+#  browser_ui_locationbar.js
+# XXX disabled tests, random failures
+#  browser_ui_bookmarks_sidebar.js
+_BROWSER_TEST_FILES = \
+	browser_ui_000_data.js \
+	browser_ui_history_sidebar.js \
+	$(NULL)
 
 libs:: $(_CHROME_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)

From 13eae77f94f6a5910fc6fe962dac37f37a2eb87c Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Sat, 1 Aug 2009 07:31:18 -0700
Subject: [PATCH 135/175] Bug 501608 - menu popup sounds are played when
 showing the autoscrolling popup. r=enn

---
 toolkit/content/tests/browser/Makefile.in     |   6 +
 .../browser_keyevents_during_autoscrolling.js | 118 ++++++++++++++++++
 toolkit/content/widgets/browser.xml           |  24 +++-
 3 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js

diff --git a/toolkit/content/tests/browser/Makefile.in b/toolkit/content/tests/browser/Makefile.in
index 20da998b2a8..f01914c6d6e 100644
--- a/toolkit/content/tests/browser/Makefile.in
+++ b/toolkit/content/tests/browser/Makefile.in
@@ -50,5 +50,11 @@ _BROWSER_FILES = \
   browser_bug471962.js \
   $(NULL)
 
+# browser_keyevents_during_autoscrolling.js cannot start the autoscrolling by
+# synthesizeMouse with middle button on linux, therefore, disable it temporarily
+ifneq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+_BROWSER_FILES += browser_keyevents_during_autoscrolling.js
+endif
+
 libs:: $(_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
diff --git a/toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js b/toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js
new file mode 100644
index 00000000000..c94ef68e07d
--- /dev/null
+++ b/toolkit/content/tests/browser/browser_keyevents_during_autoscrolling.js
@@ -0,0 +1,118 @@
+function test()
+{
+  const kPrefName_AutoScroll = "general.autoScroll";
+  const kPrefName_ContentLoadURL = "middlemouse.contentLoadURL";
+  var prefSvc = Components.classes["@mozilla.org/preferences-service;1"]
+                          .getService(Components.interfaces.nsIPrefBranch2);
+  var kAutoScrollingEnabled = prefSvc.getBoolPref(kPrefName_AutoScroll);
+  prefSvc.setBoolPref(kPrefName_AutoScroll, true);
+
+  const kNoKeyEvents   = 0;
+  const kKeyDownEvent  = 1;
+  const kKeyPressEvent = 2;
+  const kKeyUpEvent    = 4;
+  const kAllKeyEvents  = 7;
+
+  var expectedKeyEvents;
+  var dispatchedKeyEvents;
+  var key;
+  var root;
+
+  function sendKey(aKey)
+  {
+    key = aKey;
+    dispatchedKeyEvents = kNoKeyEvents;
+    EventUtils.synthesizeKey(key, {}, gBrowser.contentWindow);
+    is(dispatchedKeyEvents, expectedKeyEvents,
+       "unexpected key events were dispatched or not dispatched: " + key);
+  }
+
+  function onKey(aEvent)
+  {
+    if (aEvent.target != root) {
+      ok(false, "unknown target: " + aEvent.target.tagName);
+      return;
+    }
+
+    var keyFlag;
+    switch (aEvent.type) {
+      case "keydown":
+        keyFlag = kKeyDownEvent;
+        break;
+      case "keypress":
+        keyFlag = kKeyPressEvent;
+        break;
+      case "keyup":
+        keyFlag = kKeyUpEvent;
+        break;
+      default:
+        ok(false, "Unknown events: " + aEvent.type);
+        return;
+    }
+    dispatchedKeyEvents |= keyFlag;
+    is(keyFlag, expectedKeyEvents & keyFlag, aEvent.type + " fired: " + key);
+  }
+
+  function startTest() {
+    waitForExplicitFinish();
+    gBrowser.addEventListener("load", onLoad, false);
+    var dataUri = 'data:text/html,<body style="height:10000px;"></body>';
+    gBrowser.loadURI(dataUri);
+  }
+
+  function onLoad() {
+    gBrowser.removeEventListener("load", onLoad, false);
+
+    gBrowser.contentWindow.focus();
+
+    var doc = gBrowser.contentDocument;
+
+    root = doc.documentElement;
+    root.addEventListener("keydown", onKey, true);
+    root.addEventListener("keypress", onKey, true);
+    root.addEventListener("keyup", onKey, true);
+
+    // Test whether the key events are handled correctly under normal condition
+    expectedKeyEvents = kAllKeyEvents;
+    sendKey("A");
+
+    // Start autoscrolling by middle button lick on the page
+    EventUtils.synthesizeMouse(root, 10, 10, { button: 1 },
+                               gBrowser.contentWindow);
+
+    // Most key events should be eaten by the browser.
+    expectedKeyEvents = kNoKeyEvents;
+    sendKey("A");
+    sendKey("VK_DOWN");
+    sendKey("VK_RETURN");
+    sendKey("VK_ENTER");
+    sendKey("VK_HOME");
+    sendKey("VK_END");
+    sendKey("VK_TAB");
+    sendKey("VK_ENTER");
+
+    // Finish autoscrolling by ESC key.  Note that only keydown and keypress
+    // events are eaten because keyup event is fired *after* the autoscrolling
+    // is finished.
+    expectedKeyEvents = kKeyUpEvent;
+    sendKey("VK_ESCAPE");
+
+    // Test whether the key events are handled correctly under normal condition
+    expectedKeyEvents = kAllKeyEvents;
+    sendKey("A");
+
+    root.removeEventListener("keydown", onKey, true);
+    root.removeEventListener("keypress", onKey, true);
+    root.removeEventListener("keyup", onKey, true);
+
+    // restore the changed prefs
+    prefSvc.setBoolPref(kPrefName_AutoScroll, kAutoScrollingEnabled);
+
+    // cleaning-up
+    gBrowser.loadURI("about:blank");
+
+    finish();
+  }
+
+  startTest();
+}
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index 12a73b2b84c..fdd6cd78ef7 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -757,6 +757,9 @@
               window.removeEventListener("mousedown", this, true);
               window.removeEventListener("mouseup", this, true);
               window.removeEventListener("contextmenu", this, true);
+              window.removeEventListener("keydown", this, true);
+              window.removeEventListener("keypress", this, true);
+              window.removeEventListener("keyup", this, true);
               clearInterval(this._autoScrollTimer);
             }
          ]]>
@@ -767,7 +770,7 @@
         <body>
           <![CDATA[
             const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-            var popup = document.createElementNS(XUL_NS, "popup");
+            var popup = document.createElementNS(XUL_NS, "panel");
             popup.className = "autoscroller";
             return popup;
           ]]>
@@ -828,6 +831,9 @@
             window.addEventListener("mousedown", this, true);
             window.addEventListener("mouseup", this, true);
             window.addEventListener("contextmenu", this, true);
+            window.addEventListener("keydown", this, true);
+            window.addEventListener("keypress", this, true);
+            window.addEventListener("keyup", this, true);
 
             this._scrollErrorX = 0;
             this._scrollErrorY = 0;
@@ -951,6 +957,22 @@
                 this.stopScroll();
                 break;
               }
+              case "keypress": {
+                if (aEvent.keyCode == aEvent.DOM_VK_ESCAPE) {
+                  // the escape key will be processed by
+                  // nsXULPopupManager::KeyPress and the panel will be closed.
+                  // So, nothing to do here.
+                  break;
+                }
+                // don't break here. we need to eat keypress events.
+              }
+              case "keydown":
+              case "keyup": {
+                // All keyevents should be eaten here during autoscrolling.
+                aEvent.stopPropagation();
+                aEvent.preventDefault();
+                break;
+              }
             }
           }
         ]]>

From aa17a93482f6043dd6afdf559c061ab99ddb621d Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Sat, 1 Aug 2009 08:53:40 -0700
Subject: [PATCH 136/175] Don't resolve a new context for the root when we're
 computing rem units for the root.  (Bug 478321)  r=bzbarsky

---
 layout/style/crashtests/478321-1.xhtml  |  1 +
 layout/style/crashtests/crashtests.list |  1 +
 layout/style/nsRuleNode.cpp             | 13 +++-
 layout/style/test/Makefile.in           |  1 +
 layout/style/test/test_rem_unit.html    | 81 +++++++++++++++++++++++++
 5 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 layout/style/crashtests/478321-1.xhtml
 create mode 100644 layout/style/test/test_rem_unit.html

diff --git a/layout/style/crashtests/478321-1.xhtml b/layout/style/crashtests/478321-1.xhtml
new file mode 100644
index 00000000000..654e11c1062
--- /dev/null
+++ b/layout/style/crashtests/478321-1.xhtml
@@ -0,0 +1 @@
+<html xmlns="http://www.w3.org/1999/xhtml" style="display: table; float: left; line-height: 1rem;"/>
diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list
index fe390f391c1..24269ab78ae 100644
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -36,6 +36,7 @@ HTTP(..) load 472237-1.html
 load 473720-1.html
 load 473892-1.html
 load 473914-1.html
+load 478321-1.xhtml
 skip load long-url-list-stack-overflow.html # skipped due to being slow (bug 477490)
 load 495269-1.html
 load 495269-2.html
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 47625d13eab..c6f49c85094 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -172,6 +172,7 @@ static nscoord CalcLengthWith(const nsCSSValue& aValue,
 {
   NS_ASSERTION(aValue.IsLengthUnit(), "not a length unit");
   NS_ASSERTION(aStyleFont || aStyleContext, "Must have style data");
+  NS_ASSERTION(!aStyleFont || !aStyleContext, "Duplicate sources of data");
   NS_ASSERTION(aPresContext, "Must have prescontext");
 
   if (aValue.IsFixedLengthUnit()) {
@@ -197,9 +198,17 @@ static nscoord CalcLengthWith(const nsCSSValue& aValue,
 
       if (aUseProvidedRootEmSize) {
         // We should use the provided aFontSize as the reference length to
-        // scale. This only happens when we are calculating something on the
-        // root element, in which case aFontSize is already the value we want.
+        // scale. This only happens when we are calculating font-size or
+        // an equivalent (scriptminsize or CalcLengthWithInitialFont) on
+        // the root element, in which case aFontSize is already the
+        // value we want.
         rootFontSize = aFontSize;
+      } else if (aStyleContext && !aStyleContext->GetParent()) {
+        // This is the root element (XXX we don't really know this, but
+        // nsRuleNode::SetFont makes the same assumption!), so we should
+        // use GetStyleFont on this context to get the root element's
+        // font size.
+        rootFontSize = aStyleFont->mFont.size;
       } else {
         // This is not the root element or we are calculating something other
         // than font size, so rem is relative to the root element's font size.
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index ac5c876d5f2..8abd57dc4bd 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -124,6 +124,7 @@ _TEST_FILES =	test_acid3_test46.html \
 		test_property_database.html \
 		test_priority_preservation.html \
 		test_property_syntax_errors.html \
+		test_rem_unit.html \
 		test_selectors.html \
 		test_selectors_on_anonymous_content.html \
 		test_shorthand_property_getters.html \
diff --git a/layout/style/test/test_rem_unit.html b/layout/style/test/test_rem_unit.html
new file mode 100644
index 00000000000..94fdc9656c6
--- /dev/null
+++ b/layout/style/test/test_rem_unit.html
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=478321
+-->
+<head>
+  <title>Test for CSS 'rem' unit</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/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=478321">Mozilla Bug 478321</a>
+<p id="display"></p>
+<p id="display2"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for CSS 'rem' unit **/
+
+function px_to_num(str)
+{
+    return Number(String(str).match(/^([\d.]+)px$/)[1]);
+}
+
+function fs(elt)
+{
+    return px_to_num(getComputedStyle(elt, "").fontSize);
+}
+
+var html = document.documentElement;
+var body = document.body;
+var p = document.getElementById("display");
+var p2 = document.getElementById("display2");
+
+html.style.font = "-moz-initial";
+
+var defaultFontSize = fs(html);
+
+// NOTE:  This test assumes that the default font size is an
+// integral number of pixels (which is always the case at present).
+// If that ever becomes false, the calls to "is" may need to be replaced by
+// calls to "isapprox" that allows errors of up to some small fraction
+// of a pixel.
+
+html.style.fontSize = "3rem";
+is(fs(html), 3 * defaultFontSize,
+   "3rem on root should triple root's font size");
+body.style.font = "-moz-initial";
+is(fs(body), defaultFontSize,
+   "-moz-initial should produce initial font size");
+body.style.fontSize = "1em";
+is(fs(body), 3 * defaultFontSize, "1em should inherit from parent");
+body.style.fontSize = "200%";
+is(fs(body), 6 * defaultFontSize, "200% should double parent");
+body.style.fontSize = "2rem";
+is(fs(body), 6 * defaultFontSize, "2rem should double root");
+p.style.font = "inherit";
+is(fs(p), 6 * defaultFontSize, "inherit should inherit from parent");
+p2.style.fontSize = "2rem";
+is(fs(p2), 6 * defaultFontSize, "2rem should double root");
+body.style.font = "-moz-initial";
+is(fs(p), defaultFontSize, "inherit should inherit from parent");
+is(fs(p2), 6 * defaultFontSize, "2rem should double root");
+body.style.fontSize = "5em";
+html.style.fontSize = "200%";
+is(fs(p), 10 * defaultFontSize, "inherit should inherit from parent");
+is(fs(p2), 4 * defaultFontSize, "2rem should double root");
+
+
+// Make things readable again.
+html.style.fontSize = "1em";
+body.style.fontSize = "1em";
+
+</script>
+</pre>
+</body>
+</html>

From 1d55af8964a1bf17ae6d35a9e2a0b90396e11353 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Sat, 1 Aug 2009 08:53:40 -0700
Subject: [PATCH 137/175] Separate RuleProcessorData and derived structs into
 their own header file to reduce include dependencies.  (Bug 435441) 
 r=bzbarsky

--HG--
rename : layout/style/nsIStyleRuleProcessor.h => layout/style/nsRuleProcessorData.h
---
 content/base/src/nsContentUtils.cpp       |   1 +
 content/base/src/nsGenericElement.cpp     |   1 +
 content/xbl/src/nsBindingManager.cpp      |   1 +
 content/xbl/src/nsXBLPrototypeHandler.cpp |   1 +
 layout/style/Makefile.in                  |   1 +
 layout/style/nsCSSRuleProcessor.cpp       |   1 +
 layout/style/nsCSSRuleProcessor.h         |   2 +-
 layout/style/nsHTMLCSSStyleSheet.cpp      |   1 +
 layout/style/nsHTMLStyleSheet.cpp         |   1 +
 layout/style/nsHTMLStyleSheet.h           |   1 +
 layout/style/nsIStyleRuleProcessor.h      | 173 +----------------
 layout/style/nsRuleProcessorData.h        | 217 ++++++++++++++++++++++
 layout/style/nsStyleSet.cpp               |   1 +
 layout/style/nsStyleSet.h                 |   2 +
 14 files changed, 235 insertions(+), 169 deletions(-)
 create mode 100644 layout/style/nsRuleProcessorData.h

diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 967a46c1dcb..d3ad9dbb930 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -165,6 +165,7 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #include "nsIDOMDragEvent.h"
 #include "nsDOMDataTransfer.h"
 #include "nsHtml5Module.h"
+#include "nsPresContext.h"
 
 #ifdef IBMBIDI
 #include "nsIBidiKeyboard.h"
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 11ad999a9b2..df5875a4fc8 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -134,6 +134,7 @@
 #include "nsXBLInsertionPoint.h"
 #include "nsICSSStyleRule.h" /* For nsCSSSelectorList */
 #include "nsCSSRuleProcessor.h"
+#include "nsRuleProcessorData.h"
 
 #ifdef MOZ_XUL
 #include "nsIXULDocument.h"
diff --git a/content/xbl/src/nsBindingManager.cpp b/content/xbl/src/nsBindingManager.cpp
index 837de33cd3f..b8ee3378885 100644
--- a/content/xbl/src/nsBindingManager.cpp
+++ b/content/xbl/src/nsBindingManager.cpp
@@ -69,6 +69,7 @@
 #include "nsIHTMLCSSStyleSheet.h"
 
 #include "nsIStyleRuleProcessor.h"
+#include "nsRuleProcessorData.h"
 #include "nsIWeakReference.h"
 
 #include "jsapi.h"
diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp
index 03f63f479b6..0eeab2da895 100644
--- a/content/xbl/src/nsXBLPrototypeHandler.cpp
+++ b/content/xbl/src/nsXBLPrototypeHandler.cpp
@@ -81,6 +81,7 @@
 #include "nsCRT.h"
 #include "nsXBLEventHandler.h"
 #include "nsEventDispatcher.h"
+#include "nsPresContext.h"
 
 static NS_DEFINE_CID(kDOMScriptObjectFactoryCID,
                      NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in
index 16543c5a5c6..1a38bc73fde 100644
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -114,6 +114,7 @@ EXPORTS		= \
 		nsLayoutStylesheetCache.h \
 		nsRuleData.h \
 		nsRuleNode.h \
+		nsRuleProcessorData.h \
 		nsRuleWalker.h \
 		nsStyleContext.h \
 		nsStyleCoord.h \
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index a25fcafc9e7..5f1df105ddd 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -46,6 +46,7 @@
  */
 
 #include "nsCSSRuleProcessor.h"
+#include "nsRuleProcessorData.h"
 
 #define PL_ARENA_CONST_ALIGN_MASK 7
 #define NS_RULEHASH_ARENA_BLOCK_SIZE (256)
diff --git a/layout/style/nsCSSRuleProcessor.h b/layout/style/nsCSSRuleProcessor.h
index 6863f404e31..cfd5b2a70b9 100644
--- a/layout/style/nsCSSRuleProcessor.h
+++ b/layout/style/nsCSSRuleProcessor.h
@@ -49,10 +49,10 @@
 #include "nsCSSStyleSheet.h"
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
+#include "nsCSSRules.h"
 
 struct RuleCascadeData;
 struct nsCSSSelectorList;
-class nsCSSFontFaceRule;
 
 /**
  * The CSS style rule processor provides a mechanism for sibling style
diff --git a/layout/style/nsHTMLCSSStyleSheet.cpp b/layout/style/nsHTMLCSSStyleSheet.cpp
index 8739e465731..07726191a51 100644
--- a/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -54,6 +54,7 @@
 #include "nsCOMPtr.h"
 #include "nsRuleWalker.h"
 #include "nsRuleData.h"
+#include "nsRuleProcessorData.h"
 
 // -----------------------------------------------------------
 
diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp
index 7ecbf9289a1..eb6a6f84fe0 100644
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@@ -69,6 +69,7 @@
 #include "nsRuleWalker.h"
 #include "nsRuleData.h"
 #include "nsContentErrors.h"
+#include "nsRuleProcessorData.h"
 
 NS_IMPL_ISUPPORTS1(nsHTMLStyleSheet::HTMLColorRule, nsIStyleRule)
 
diff --git a/layout/style/nsHTMLStyleSheet.h b/layout/style/nsHTMLStyleSheet.h
index d0727af34da..fc5cc7aebef 100644
--- a/layout/style/nsHTMLStyleSheet.h
+++ b/layout/style/nsHTMLStyleSheet.h
@@ -50,6 +50,7 @@
 #include "nsIStyleRule.h"
 #include "pldhash.h"
 #include "nsCOMPtr.h"
+#include "nsColor.h"
 class nsMappedAttributes;
 
 class nsHTMLStyleSheet : public nsIStyleSheet, public nsIStyleRuleProcessor {
diff --git a/layout/style/nsIStyleRuleProcessor.h b/layout/style/nsIStyleRuleProcessor.h
index 4588b949948..4363dc495b0 100644
--- a/layout/style/nsIStyleRuleProcessor.h
+++ b/layout/style/nsIStyleRuleProcessor.h
@@ -45,179 +45,16 @@
 #ifndef nsIStyleRuleProcessor_h___
 #define nsIStyleRuleProcessor_h___
 
-#include <stdio.h>
-
 #include "nsISupports.h"
-#include "nsPresContext.h" // for nsCompatability
-#include "nsString.h"
 #include "nsChangeHint.h"
 #include "nsIContent.h"
 
-class nsIStyleSheet;
+struct RuleProcessorData;
+struct ElementRuleProcessorData;
+struct PseudoRuleProcessorData;
+struct StateRuleProcessorData;
+struct AttributeRuleProcessorData;
 class nsPresContext;
-class nsIAtom;
-class nsICSSPseudoComparator;
-class nsRuleWalker;
-class nsAttrValue;
-
-// The implementation of the constructor and destructor are currently in
-// nsCSSRuleProcessor.cpp.
-
-struct RuleProcessorData {
-  RuleProcessorData(nsPresContext* aPresContext,
-                    nsIContent* aContent, 
-                    nsRuleWalker* aRuleWalker,
-                    nsCompatibility* aCompat = nsnull);
-  
-  // NOTE: not |virtual|
-  ~RuleProcessorData();
-
-  // This should be used for all heap-allocation of RuleProcessorData
-  static RuleProcessorData* Create(nsPresContext* aPresContext,
-                                   nsIContent* aContent, 
-                                   nsRuleWalker* aRuleWalker,
-                                   nsCompatibility aCompat)
-  {
-    if (NS_LIKELY(aPresContext)) {
-      return new (aPresContext) RuleProcessorData(aPresContext, aContent,
-                                                  aRuleWalker, &aCompat);
-    }
-
-    return new RuleProcessorData(aPresContext, aContent, aRuleWalker,
-                                 &aCompat);
-  }
-  
-  void Destroy() {
-    nsPresContext * pc = mPresContext;
-    if (NS_LIKELY(pc)) {
-      this->~RuleProcessorData();
-      pc->FreeToShell(sizeof(RuleProcessorData), this);
-      return;
-    }
-    delete this;
-  }
-
-  // For placement new
-  void* operator new(size_t sz, RuleProcessorData* aSlot) CPP_THROW_NEW {
-    return aSlot;
-  }
-private:
-  void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW {
-    return aContext->AllocateFromShell(sz);
-  }
-  void* operator new(size_t sz) CPP_THROW_NEW {
-    return ::operator new(sz);
-  }
-public:
-  const nsString* GetLang();
-
-  // Returns a 1-based index of the child in its parent.  If the child
-  // is not in its parent's child list (i.e., it is anonymous content),
-  // returns 0.
-  // If aCheckEdgeOnly is true, the function will return 1 if the result
-  // is 1, and something other than 1 (maybe or maybe not a valid
-  // result) otherwise.
-  PRInt32 GetNthIndex(PRBool aIsOfType, PRBool aIsFromEnd,
-                      PRBool aCheckEdgeOnly);
-
-  nsPresContext*    mPresContext;
-  nsIContent*       mContent;       // weak ref
-  nsIContent*       mParentContent; // if content, content->GetParent(); weak ref
-  nsRuleWalker*     mRuleWalker; // Used to add rules to our results.
-  nsIContent*       mScopedRoot;    // Root of scoped stylesheet (set and unset by the supplier of the scoped stylesheet
-  
-  nsIAtom*          mContentTag;    // if content, then content->GetTag()
-  nsIAtom*          mContentID;     // if styled content, then weak reference to styledcontent->GetID()
-  PRPackedBool      mIsHTMLContent; // if content, then does QI on HTMLContent, true or false
-  PRPackedBool      mIsLink;        // if content, calls nsStyleUtil::IsHTMLLink or nsStyleUtil::IsLink
-  PRPackedBool      mHasAttributes; // if content, content->GetAttrCount() > 0
-  nsCompatibility   mCompatMode;    // Possibly remove use of this in SelectorMatches?
-  nsLinkState       mLinkState;     // if a link, this is the state, otherwise unknown
-  PRInt32           mEventState;    // if content, eventStateMgr->GetContentState()
-  PRInt32           mNameSpaceID;   // if content, content->GetNameSapce()
-  const nsAttrValue* mClasses;      // if styled content, styledcontent->GetClasses()
-  // mPreviousSiblingData and mParentData are always RuleProcessorData
-  // and never a derived class.  They are allocated lazily, when
-  // selectors require matching of prior siblings or ancestors.
-  RuleProcessorData* mPreviousSiblingData;
-  RuleProcessorData* mParentData;
-
-protected:
-  nsString *mLanguage; // NULL means we haven't found out the language yet
-
-  // This node's index for :nth-child(), :nth-last-child(),
-  // :nth-of-type(), :nth-last-of-type().  If -2, needs to be computed.
-  // If -1, needs to be computed but known not to be 1.
-  // If 0, the node is not at any index in its parent.
-  // The first subscript is 0 for -child and 1 for -of-type, the second
-  // subscript is 0 for nth- and 1 for nth-last-.
-  PRInt32 mNthIndices[2][2];
-};
-
-struct ElementRuleProcessorData : public RuleProcessorData {
-  ElementRuleProcessorData(nsPresContext* aPresContext,
-                           nsIContent* aContent, 
-                           nsRuleWalker* aRuleWalker)
-  : RuleProcessorData(aPresContext,aContent,aRuleWalker)
-  {
-    NS_PRECONDITION(aPresContext, "null pointer");
-    NS_PRECONDITION(aContent, "null pointer");
-    NS_PRECONDITION(aRuleWalker, "null pointer");
-  }
-};
-
-struct PseudoRuleProcessorData : public RuleProcessorData {
-  PseudoRuleProcessorData(nsPresContext* aPresContext,
-                          nsIContent* aParentContent,
-                          nsIAtom* aPseudoTag,
-                          nsICSSPseudoComparator* aComparator,
-                          nsRuleWalker* aRuleWalker)
-  : RuleProcessorData(aPresContext, aParentContent, aRuleWalker)
-  {
-    NS_PRECONDITION(aPresContext, "null pointer");
-    NS_PRECONDITION(aPseudoTag, "null pointer");
-    NS_PRECONDITION(aRuleWalker, "null pointer");
-    mPseudoTag = aPseudoTag;
-    mComparator = aComparator;
-  }
-
-  nsIAtom*                 mPseudoTag;
-  nsICSSPseudoComparator*  mComparator;
-};
-
-struct StateRuleProcessorData : public RuleProcessorData {
-  StateRuleProcessorData(nsPresContext* aPresContext,
-                         nsIContent* aContent,
-                         PRInt32 aStateMask)
-    : RuleProcessorData(aPresContext, aContent, nsnull),
-      mStateMask(aStateMask)
-  {
-    NS_PRECONDITION(aPresContext, "null pointer");
-    NS_PRECONDITION(aContent, "null pointer");
-  }
-  const PRInt32 mStateMask; // |HasStateDependentStyle| for which state(s)?
-                            //  Constants defined in nsIEventStateManager.h .
-};
-
-struct AttributeRuleProcessorData : public RuleProcessorData {
-  AttributeRuleProcessorData(nsPresContext* aPresContext,
-                             nsIContent* aContent,
-                             nsIAtom* aAttribute,
-                             PRInt32 aModType,
-                             PRUint32 aStateMask)
-    : RuleProcessorData(aPresContext, aContent, nsnull),
-      mAttribute(aAttribute),
-      mModType(aModType),
-      mStateMask(aStateMask)
-  {
-    NS_PRECONDITION(aPresContext, "null pointer");
-    NS_PRECONDITION(aContent, "null pointer");
-  }
-  nsIAtom* mAttribute; // |HasAttributeDependentStyle| for which attribute?
-  PRInt32 mModType;    // The type of modification (see nsIDOMMutationEvent).
-  PRUint32 mStateMask; // The states that changed with the attr change.
-};
-
 
 // IID for the nsIStyleRuleProcessor interface {015575fe-7b6c-11d3-ba05-001083023c2b}
 #define NS_ISTYLE_RULE_PROCESSOR_IID     \
diff --git a/layout/style/nsRuleProcessorData.h b/layout/style/nsRuleProcessorData.h
new file mode 100644
index 00000000000..f28b7311e03
--- /dev/null
+++ b/layout/style/nsRuleProcessorData.h
@@ -0,0 +1,217 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   L. David Baron <dbaron@dbaron.org>, Mozilla Corporation
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * data structures passed to nsIStyleRuleProcessor methods (to pull loop
+ * invariant computations out of the loop)
+ */
+
+#ifndef nsRuleProcessorData_h_
+#define nsRuleProcessorData_h_
+
+#include "nsPresContext.h" // for nsCompatability
+#include "nsString.h"
+#include "nsChangeHint.h"
+#include "nsIContent.h"
+
+class nsIStyleSheet;
+class nsPresContext;
+class nsIAtom;
+class nsICSSPseudoComparator;
+class nsRuleWalker;
+class nsAttrValue;
+
+// The implementation of the constructor and destructor are currently in
+// nsCSSRuleProcessor.cpp.
+
+struct RuleProcessorData {
+  RuleProcessorData(nsPresContext* aPresContext,
+                    nsIContent* aContent, 
+                    nsRuleWalker* aRuleWalker,
+                    nsCompatibility* aCompat = nsnull);
+  
+  // NOTE: not |virtual|
+  ~RuleProcessorData();
+
+  // This should be used for all heap-allocation of RuleProcessorData
+  static RuleProcessorData* Create(nsPresContext* aPresContext,
+                                   nsIContent* aContent, 
+                                   nsRuleWalker* aRuleWalker,
+                                   nsCompatibility aCompat)
+  {
+    if (NS_LIKELY(aPresContext)) {
+      return new (aPresContext) RuleProcessorData(aPresContext, aContent,
+                                                  aRuleWalker, &aCompat);
+    }
+
+    return new RuleProcessorData(aPresContext, aContent, aRuleWalker,
+                                 &aCompat);
+  }
+  
+  void Destroy() {
+    nsPresContext * pc = mPresContext;
+    if (NS_LIKELY(pc)) {
+      this->~RuleProcessorData();
+      pc->FreeToShell(sizeof(RuleProcessorData), this);
+      return;
+    }
+    delete this;
+  }
+
+  // For placement new
+  void* operator new(size_t sz, RuleProcessorData* aSlot) CPP_THROW_NEW {
+    return aSlot;
+  }
+private:
+  void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW {
+    return aContext->AllocateFromShell(sz);
+  }
+  void* operator new(size_t sz) CPP_THROW_NEW {
+    return ::operator new(sz);
+  }
+public:
+  const nsString* GetLang();
+
+  // Returns a 1-based index of the child in its parent.  If the child
+  // is not in its parent's child list (i.e., it is anonymous content),
+  // returns 0.
+  // If aCheckEdgeOnly is true, the function will return 1 if the result
+  // is 1, and something other than 1 (maybe or maybe not a valid
+  // result) otherwise.
+  PRInt32 GetNthIndex(PRBool aIsOfType, PRBool aIsFromEnd,
+                      PRBool aCheckEdgeOnly);
+
+  nsPresContext*    mPresContext;
+  nsIContent*       mContent;       // weak ref
+  nsIContent*       mParentContent; // if content, content->GetParent(); weak ref
+  nsRuleWalker*     mRuleWalker; // Used to add rules to our results.
+  nsIContent*       mScopedRoot;    // Root of scoped stylesheet (set and unset by the supplier of the scoped stylesheet
+  
+  nsIAtom*          mContentTag;    // if content, then content->GetTag()
+  nsIAtom*          mContentID;     // if styled content, then weak reference to styledcontent->GetID()
+  PRPackedBool      mIsHTMLContent; // if content, then does QI on HTMLContent, true or false
+  PRPackedBool      mIsLink;        // if content, calls nsStyleUtil::IsHTMLLink or nsStyleUtil::IsLink
+  PRPackedBool      mHasAttributes; // if content, content->GetAttrCount() > 0
+  nsCompatibility   mCompatMode;    // Possibly remove use of this in SelectorMatches?
+  nsLinkState       mLinkState;     // if a link, this is the state, otherwise unknown
+  PRInt32           mEventState;    // if content, eventStateMgr->GetContentState()
+  PRInt32           mNameSpaceID;   // if content, content->GetNameSapce()
+  const nsAttrValue* mClasses;      // if styled content, styledcontent->GetClasses()
+  // mPreviousSiblingData and mParentData are always RuleProcessorData
+  // and never a derived class.  They are allocated lazily, when
+  // selectors require matching of prior siblings or ancestors.
+  RuleProcessorData* mPreviousSiblingData;
+  RuleProcessorData* mParentData;
+
+protected:
+  nsString *mLanguage; // NULL means we haven't found out the language yet
+
+  // This node's index for :nth-child(), :nth-last-child(),
+  // :nth-of-type(), :nth-last-of-type().  If -2, needs to be computed.
+  // If -1, needs to be computed but known not to be 1.
+  // If 0, the node is not at any index in its parent.
+  // The first subscript is 0 for -child and 1 for -of-type, the second
+  // subscript is 0 for nth- and 1 for nth-last-.
+  PRInt32 mNthIndices[2][2];
+};
+
+struct ElementRuleProcessorData : public RuleProcessorData {
+  ElementRuleProcessorData(nsPresContext* aPresContext,
+                           nsIContent* aContent, 
+                           nsRuleWalker* aRuleWalker)
+  : RuleProcessorData(aPresContext,aContent,aRuleWalker)
+  {
+    NS_PRECONDITION(aPresContext, "null pointer");
+    NS_PRECONDITION(aContent, "null pointer");
+    NS_PRECONDITION(aRuleWalker, "null pointer");
+  }
+};
+
+struct PseudoRuleProcessorData : public RuleProcessorData {
+  PseudoRuleProcessorData(nsPresContext* aPresContext,
+                          nsIContent* aParentContent,
+                          nsIAtom* aPseudoTag,
+                          nsICSSPseudoComparator* aComparator,
+                          nsRuleWalker* aRuleWalker)
+  : RuleProcessorData(aPresContext, aParentContent, aRuleWalker)
+  {
+    NS_PRECONDITION(aPresContext, "null pointer");
+    NS_PRECONDITION(aPseudoTag, "null pointer");
+    NS_PRECONDITION(aRuleWalker, "null pointer");
+    mPseudoTag = aPseudoTag;
+    mComparator = aComparator;
+  }
+
+  nsIAtom*                 mPseudoTag;
+  nsICSSPseudoComparator*  mComparator;
+};
+
+struct StateRuleProcessorData : public RuleProcessorData {
+  StateRuleProcessorData(nsPresContext* aPresContext,
+                         nsIContent* aContent,
+                         PRInt32 aStateMask)
+    : RuleProcessorData(aPresContext, aContent, nsnull),
+      mStateMask(aStateMask)
+  {
+    NS_PRECONDITION(aPresContext, "null pointer");
+    NS_PRECONDITION(aContent, "null pointer");
+  }
+  const PRInt32 mStateMask; // |HasStateDependentStyle| for which state(s)?
+                            //  Constants defined in nsIEventStateManager.h .
+};
+
+struct AttributeRuleProcessorData : public RuleProcessorData {
+  AttributeRuleProcessorData(nsPresContext* aPresContext,
+                             nsIContent* aContent,
+                             nsIAtom* aAttribute,
+                             PRInt32 aModType,
+                             PRUint32 aStateMask)
+    : RuleProcessorData(aPresContext, aContent, nsnull),
+      mAttribute(aAttribute),
+      mModType(aModType),
+      mStateMask(aStateMask)
+  {
+    NS_PRECONDITION(aPresContext, "null pointer");
+    NS_PRECONDITION(aContent, "null pointer");
+  }
+  nsIAtom* mAttribute; // |HasAttributeDependentStyle| for which attribute?
+  PRInt32 mModType;    // The type of modification (see nsIDOMMutationEvent).
+  PRUint32 mStateMask; // The states that changed with the attr change.
+};
+
+#endif /* !defined(nsRuleProcessorData_h_) */
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index 2a9493683af..fa735f0ab83 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -57,6 +57,7 @@
 #include "nsIContent.h"
 #include "nsIFrame.h"
 #include "nsContentUtils.h"
+#include "nsRuleProcessorData.h"
 
 NS_IMPL_ISUPPORTS1(nsEmptyStyleRule, nsIStyleRule)
 
diff --git a/layout/style/nsStyleSet.h b/layout/style/nsStyleSet.h
index ee991f9d7d6..29fa28addaa 100644
--- a/layout/style/nsStyleSet.h
+++ b/layout/style/nsStyleSet.h
@@ -58,6 +58,8 @@
 
 class nsIURI;
 class nsCSSFontFaceRule;
+class nsRuleWalker;
+struct RuleProcessorData;
 
 class nsEmptyStyleRule : public nsIStyleRule
 {

From 8827ed4546d435141182203e2a5973c92d2c5332 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Sat, 1 Aug 2009 08:53:40 -0700
Subject: [PATCH 138/175] Bug 434733:  Don't apply width on colgroups to
 columns that have their own width.  r=dbaron

---
 .../table-width/colgroup-vs-column-1-ref.html | 12 +++++++++++
 .../table-width/colgroup-vs-column-1.html     | 12 +++++++++++
 .../table-width/colgroup-vs-column-2-ref.html | 12 +++++++++++
 .../table-width/colgroup-vs-column-2.html     | 12 +++++++++++
 layout/reftests/table-width/reftest.list      |  2 ++
 layout/tables/BasicTableLayoutStrategy.cpp    | 20 +++++++++++--------
 6 files changed, 62 insertions(+), 8 deletions(-)
 create mode 100644 layout/reftests/table-width/colgroup-vs-column-1-ref.html
 create mode 100644 layout/reftests/table-width/colgroup-vs-column-1.html
 create mode 100644 layout/reftests/table-width/colgroup-vs-column-2-ref.html
 create mode 100644 layout/reftests/table-width/colgroup-vs-column-2.html

diff --git a/layout/reftests/table-width/colgroup-vs-column-1-ref.html b/layout/reftests/table-width/colgroup-vs-column-1-ref.html
new file mode 100644
index 00000000000..44f26c1b059
--- /dev/null
+++ b/layout/reftests/table-width/colgroup-vs-column-1-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Testcase for width attribute of colgroup element (bug 434733)</title>
+</head>
+<body>
+<table border="1">
+<colgroup><col width="200"/><col width="400"/></colgroup>
+<tr><td>width is 200</td><td>width is 400</td></tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/table-width/colgroup-vs-column-1.html b/layout/reftests/table-width/colgroup-vs-column-1.html
new file mode 100644
index 00000000000..0de75be80c8
--- /dev/null
+++ b/layout/reftests/table-width/colgroup-vs-column-1.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Testcase for width attribute of colgroup element (bug 434733)</title>
+</head>
+<body>
+<table border="1">
+<colgroup width="400"><col width="200"/><col/></colgroup>
+<tr><td>width is 200</td><td>width is 400</td></tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/table-width/colgroup-vs-column-2-ref.html b/layout/reftests/table-width/colgroup-vs-column-2-ref.html
new file mode 100644
index 00000000000..64293261996
--- /dev/null
+++ b/layout/reftests/table-width/colgroup-vs-column-2-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Testcase for width attribute of colgroup element (bug 434733)</title>
+</head>
+<body>
+<table border="1" width="600">
+<colgroup><col width="20%"/><col width="40%"/><col width="40%"/></colgroup>
+<tr><td>width is 20%</td><td>width is 40%</td><td>width is 40%</td></tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/table-width/colgroup-vs-column-2.html b/layout/reftests/table-width/colgroup-vs-column-2.html
new file mode 100644
index 00000000000..25cd31a4ab6
--- /dev/null
+++ b/layout/reftests/table-width/colgroup-vs-column-2.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Testcase for width attribute of colgroup element (bug 434733)</title>
+</head>
+<body>
+<table border="1" width="600">
+<colgroup width="40%"><col width="20%"/><col/><col/></colgroup>
+<tr><td>width is 20%</td><td>width is 40%</td><td>width is 40%</td></tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/table-width/reftest.list b/layout/reftests/table-width/reftest.list
index c5a7e7e1c21..0751b624d33 100644
--- a/layout/reftests/table-width/reftest.list
+++ b/layout/reftests/table-width/reftest.list
@@ -54,3 +54,5 @@ fails == default-box-sizing-collapse-quirks.html default-box-sizing-collapse-qui
 == spanning-cell-sort-2-large.html spanning-cell-sort-2-ref.html
 == spanning-cell-sort-2-small-fixed.html spanning-cell-sort-2-fixed-ref.html
 == spanning-cell-sort-2-large-fixed.html spanning-cell-sort-2-fixed-ref.html
+== colgroup-vs-column-1.html colgroup-vs-column-1-ref.html
+== colgroup-vs-column-2.html colgroup-vs-column-2-ref.html
diff --git a/layout/tables/BasicTableLayoutStrategy.cpp b/layout/tables/BasicTableLayoutStrategy.cpp
index 2beb3e493cc..228165e8520 100644
--- a/layout/tables/BasicTableLayoutStrategy.cpp
+++ b/layout/tables/BasicTableLayoutStrategy.cpp
@@ -273,14 +273,18 @@ BasicTableLayoutStrategy::ComputeColumnIntrinsicWidths(nsIRenderingContext* aRen
         // Consider the widths on the column-group.  Note that we follow
         // what the HTML spec says here, and make the width apply to
         // each column in the group, not the group as a whole.
-        // XXX Should we be doing this when we have widths on the column?
-        NS_ASSERTION(colFrame->GetParent()->GetType() ==
-                         nsGkAtoms::tableColGroupFrame,
-                     "expected a column-group");
-        colInfo = GetColWidthInfo(aRenderingContext, colFrame->GetParent());
-        colFrame->AddCoords(colInfo.minCoord, colInfo.prefCoord,
-                            colInfo.hasSpecifiedWidth);
-        colFrame->AddPrefPercent(colInfo.prefPercent);
+
+        // If column has width, column-group doesn't override width.
+        if (colInfo.minCoord == 0 && colInfo.prefCoord == 0 &&
+            colInfo.prefPercent == 0.0f) {
+            NS_ASSERTION(colFrame->GetParent()->GetType() ==
+                             nsGkAtoms::tableColGroupFrame,
+                         "expected a column-group");
+            colInfo = GetColWidthInfo(aRenderingContext, colFrame->GetParent());
+            colFrame->AddCoords(colInfo.minCoord, colInfo.prefCoord,
+                                colInfo.hasSpecifiedWidth);
+            colFrame->AddPrefPercent(colInfo.prefPercent);
+        }
 
         // Consider the contents of and the widths on the cells without
         // colspans.

From f4f05af16a0cbe3afc86fac32295286ef4db76f7 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Sat, 1 Aug 2009 08:53:40 -0700
Subject: [PATCH 139/175] Bug 434733:  Additional tests.

---
 .../table-width/colgroup-vs-column-3-ref.html        | 12 ++++++++++++
 .../reftests/table-width/colgroup-vs-column-3.html   | 12 ++++++++++++
 .../table-width/colgroup-vs-column-4-ref.html        | 12 ++++++++++++
 .../reftests/table-width/colgroup-vs-column-4.html   | 12 ++++++++++++
 layout/reftests/table-width/reftest.list             |  2 ++
 5 files changed, 50 insertions(+)
 create mode 100644 layout/reftests/table-width/colgroup-vs-column-3-ref.html
 create mode 100644 layout/reftests/table-width/colgroup-vs-column-3.html
 create mode 100644 layout/reftests/table-width/colgroup-vs-column-4-ref.html
 create mode 100644 layout/reftests/table-width/colgroup-vs-column-4.html

diff --git a/layout/reftests/table-width/colgroup-vs-column-3-ref.html b/layout/reftests/table-width/colgroup-vs-column-3-ref.html
new file mode 100644
index 00000000000..64584064183
--- /dev/null
+++ b/layout/reftests/table-width/colgroup-vs-column-3-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Testcase for width attribute of colgroup element (bug 434733)</title>
+</head>
+<body>
+<table border="1">
+<colgroup><col width="200"/><col width="20%"/></colgroup>
+<tr><td>width is 200</td><td>width is 20%</td></tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/table-width/colgroup-vs-column-3.html b/layout/reftests/table-width/colgroup-vs-column-3.html
new file mode 100644
index 00000000000..b932760610a
--- /dev/null
+++ b/layout/reftests/table-width/colgroup-vs-column-3.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Testcase for width attribute of colgroup element (bug 434733)</title>
+</head>
+<body>
+<table border="1">
+<colgroup width="20%"><col width="200"/><col/></colgroup>
+<tr><td>width is 200</td><td>width is 20%</td></tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/table-width/colgroup-vs-column-4-ref.html b/layout/reftests/table-width/colgroup-vs-column-4-ref.html
new file mode 100644
index 00000000000..cf14fabed79
--- /dev/null
+++ b/layout/reftests/table-width/colgroup-vs-column-4-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Testcase for width attribute of colgroup element (bug 434733)</title>
+</head>
+<body>
+<table border="1">
+<colgroup><col width="20%"/><col width="400"/></colgroup>
+<tr><td>width is 20%</td><td>width is 400</td></tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/table-width/colgroup-vs-column-4.html b/layout/reftests/table-width/colgroup-vs-column-4.html
new file mode 100644
index 00000000000..5df287720c6
--- /dev/null
+++ b/layout/reftests/table-width/colgroup-vs-column-4.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Testcase for width attribute of colgroup element (bug 434733)</title>
+</head>
+<body>
+<table border="1">
+<colgroup width="400"><col width="20%"/><col/></colgroup>
+<tr><td>width is 20%</td><td>width is 400</td></tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/table-width/reftest.list b/layout/reftests/table-width/reftest.list
index 0751b624d33..d72c348823a 100644
--- a/layout/reftests/table-width/reftest.list
+++ b/layout/reftests/table-width/reftest.list
@@ -56,3 +56,5 @@ fails == default-box-sizing-collapse-quirks.html default-box-sizing-collapse-qui
 == spanning-cell-sort-2-large-fixed.html spanning-cell-sort-2-fixed-ref.html
 == colgroup-vs-column-1.html colgroup-vs-column-1-ref.html
 == colgroup-vs-column-2.html colgroup-vs-column-2-ref.html
+== colgroup-vs-column-3.html colgroup-vs-column-3-ref.html
+== colgroup-vs-column-4.html colgroup-vs-column-4-ref.html

From 073534f7503219728392ec29a5224ed10e6028a4 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Sat, 1 Aug 2009 08:53:40 -0700
Subject: [PATCH 140/175] Bug 499655:  Selectors should have dual atoms so they
 can correctly (and case-sensitively) match non-HTML elements in text/html
 documents, part 1.  r=dbaron

---
 layout/style/nsCSSParser.cpp                  | 43 ++++-----------
 layout/style/nsCSSRuleProcessor.cpp           | 32 ++++++++---
 layout/style/nsCSSStyleRule.cpp               | 55 ++++++++++---------
 layout/style/nsICSSStyleRule.h                | 17 +++++-
 layout/style/test/Makefile.in                 |  2 +
 layout/style/test/test_bug499655.html         | 46 ++++++++++++++++
 layout/style/test/test_bug499655.xhtml        | 49 +++++++++++++++++
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp | 33 +++++------
 8 files changed, 190 insertions(+), 87 deletions(-)
 create mode 100644 layout/style/test/test_bug499655.html
 create mode 100644 layout/style/test/test_bug499655.xhtml

diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 6ac64e3691d..ea13346b31f 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -2452,7 +2452,7 @@ CSSParserImpl::ParseSelectorList(nsCSSSelectorList*& aListHead,
 static PRBool IsSinglePseudoClass(const nsCSSSelector& aSelector)
 {
   return PRBool((aSelector.mNameSpace == kNameSpaceID_Unknown) &&
-                (aSelector.mTag == nsnull) &&
+                (aSelector.mLowercaseTag == nsnull) &&
                 (aSelector.mIDList == nsnull) &&
                 (aSelector.mClassList == nsnull) &&
                 (aSelector.mAttrList == nsnull) &&
@@ -2527,7 +2527,7 @@ CSSParserImpl::ParseSelectorGroup(nsCSSSelectorList*& aList)
             list->AddSelector(empty); // leave a blank (universal) selector in the middle
             listSel = list->mSelectors; // use the new one for the pseudo
           }
-          listSel->mTag = pseudoElement;
+          listSel->mLowercaseTag = pseudoElement;
         }
         else {  // append new pseudo element selector
           nsAutoPtr<nsCSSSelector> pseudoTagSelector(new nsCSSSelector());
@@ -2535,9 +2535,9 @@ CSSParserImpl::ParseSelectorGroup(nsCSSSelectorList*& aList)
             mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
             return PR_FALSE;
           }
-          pseudoTagSelector->mTag = pseudoClassList->mAtom; // steal ref count
+          pseudoTagSelector->mLowercaseTag = pseudoClassList->mAtom; // steal ref count
 #ifdef MOZ_XUL
-          if (IsTreePseudoElement(pseudoTagSelector->mTag)) {
+          if (IsTreePseudoElement(pseudoTagSelector->mLowercaseTag)) {
             // Take the remaining "pseudoclasses" that we parsed
             // inside the tree pseudoelement's ()-list, and
             // make our new selector have these pseudoclasses
@@ -2684,13 +2684,8 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
       }
       if (eCSSToken_Ident == mToken.mType) {  // element name
         aDataMask |= SEL_MASK_ELEM;
-        if (mCaseSensitive) {
-          aSelector.SetTag(mToken.mIdent);
-        }
-        else {
-          ToLowerCase(mToken.mIdent, buffer);
-          aSelector.SetTag(buffer);
-        }
+
+        aSelector.SetTag(mToken.mIdent, mCaseSensitive);
       }
       else if (mToken.IsSymbol('*')) {  // universal selector
         aDataMask |= SEL_MASK_ELEM;
@@ -2728,13 +2723,8 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
       }
       if (eCSSToken_Ident == mToken.mType) {  // element name
         aDataMask |= SEL_MASK_ELEM;
-        if (mCaseSensitive) {
-          aSelector.SetTag(mToken.mIdent);
-        }
-        else {
-          ToLowerCase(mToken.mIdent, buffer);
-          aSelector.SetTag(buffer);
-        }
+       
+        aSelector.SetTag(mToken.mIdent, mCaseSensitive);
       }
       else if (mToken.IsSymbol('*')) {  // universal selector
         aDataMask |= SEL_MASK_ELEM;
@@ -2748,13 +2738,8 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
     }
     else {  // was element name
       SetDefaultNamespaceOnSelector(aSelector);
-      if (mCaseSensitive) {
-        aSelector.SetTag(buffer);
-      }
-      else {
-        ToLowerCase(buffer);
-        aSelector.SetTag(buffer);
-      }
+      aSelector.SetTag(buffer, mCaseSensitive);
+
       aDataMask |= SEL_MASK_ELEM;
     }
     if (! GetToken(PR_FALSE)) {   // premature eof is ok (here!)
@@ -2772,13 +2757,7 @@ CSSParserImpl::ParseTypeOrUniversalSelector(PRInt32&       aDataMask,
     }
     if (eCSSToken_Ident == mToken.mType) {  // element name
       aDataMask |= SEL_MASK_ELEM;
-      if (mCaseSensitive) {
-        aSelector.SetTag(mToken.mIdent);
-      }
-      else {
-        ToLowerCase(mToken.mIdent, buffer);
-        aSelector.SetTag(buffer);
-      }
+      aSelector.SetTag(mToken.mIdent, mCaseSensitive);
     }
     else if (mToken.IsSymbol('*')) {  // universal selector
       aDataMask |= SEL_MASK_ELEM;
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index 5f1df105ddd..197b1c628f0 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -211,7 +211,7 @@ RuleHash_TagTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr)
 {
   const RuleHashTableEntry *entry =
     static_cast<const RuleHashTableEntry*>(hdr);
-  return entry->mRules->mSelector->mTag;
+  return entry->mRules->mSelector->mLowercaseTag;
 }
 
 static nsIAtom*
@@ -514,8 +514,8 @@ void RuleHash::PrependRule(RuleValue *aRuleInfo)
     PrependRuleToTable(&mClassTable, selector->mClassList->mAtom, aRuleInfo);
     RULE_HASH_STAT_INCREMENT(mClassSelectors);
   }
-  else if (nsnull != selector->mTag) {
-    PrependRuleToTable(&mTagTable, selector->mTag, aRuleInfo);
+  else if (nsnull != selector->mLowercaseTag) {
+    PrependRuleToTable(&mTagTable, selector->mLowercaseTag, aRuleInfo);
     RULE_HASH_STAT_INCREMENT(mTagSelectors);
   }
   else if (kNameSpaceID_Unknown != selector->mNameSpace) {
@@ -1192,11 +1192,23 @@ static PRBool SelectorMatches(RuleProcessorData &data,
 
 {
   // namespace/tag match
+  // optimization : bail out early if we can
   if ((kNameSpaceID_Unknown != aSelector->mNameSpace &&
-       data.mNameSpaceID != aSelector->mNameSpace) ||
-      (aSelector->mTag && aSelector->mTag != data.mContentTag)) {
-    // optimization : bail out early if we can
+       data.mNameSpaceID != aSelector->mNameSpace))
     return PR_FALSE;
+
+  if (aSelector->mLowercaseTag) {
+    //If we tested that this is an HTML node in a text/html document and
+    //had some tweaks in RuleHash, we could remove case-sensitivity from
+    //style sheets.
+    if (data.mIsHTMLContent) {
+      if (data.mContentTag != aSelector->mLowercaseTag)
+        return PR_FALSE;
+    }
+    else {
+      if (data.mContentTag != aSelector->mCasedTag)
+        return PR_FALSE;
+    }
   }
 
   PRBool result = PR_TRUE;
@@ -1594,7 +1606,8 @@ static PRBool SelectorMatches(RuleProcessorData &data,
       if ((stateToCheck & (NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE)) &&
           data.mCompatMode == eCompatibility_NavQuirks &&
           // global selector (but don't check .class):
-          !aSelector->mTag && !aSelector->mIDList && !aSelector->mAttrList &&
+          !aSelector->HasTagSelector() && !aSelector->mIDList && 
+          !aSelector->mAttrList &&
           // This (or the other way around) both make :not() asymmetric
           // in quirks mode (and it's hard to work around since we're
           // testing the current mNegations, not the first
@@ -1930,7 +1943,10 @@ static void PseudoEnumFunc(nsICSSStyleRule* aRule, nsCSSSelector* aSelector,
 {
   PseudoRuleProcessorData* data = (PseudoRuleProcessorData*)aData;
 
-  NS_ASSERTION(aSelector->mTag == data->mPseudoTag, "RuleHash failure");
+  if (!aSelector->IsPseudoElement())
+    return;
+
+  NS_ASSERTION(aSelector->mLowercaseTag == data->mPseudoTag, "RuleHash failure");
   PRBool matches = PR_TRUE;
   if (data->mComparator)
     data->mComparator->PseudoMatches(data->mPseudoTag, aSelector, &matches);
diff --git a/layout/style/nsCSSStyleRule.cpp b/layout/style/nsCSSStyleRule.cpp
index 9f73064c36c..fc3bab8ece7 100644
--- a/layout/style/nsCSSStyleRule.cpp
+++ b/layout/style/nsCSSStyleRule.cpp
@@ -258,7 +258,8 @@ nsAttrSelector::~nsAttrSelector(void)
 // -- nsCSSSelector -------------------------------
 
 nsCSSSelector::nsCSSSelector(void)
-  : mTag(nsnull),
+  : mLowercaseTag(nsnull),
+    mCasedTag(nsnull),
     mIDList(nsnull),
     mClassList(nsnull),
     mPseudoClassList(nsnull),
@@ -279,7 +280,8 @@ nsCSSSelector::Clone(PRBool aDeepNext, PRBool aDeepNegations) const
     return nsnull;
 
   result->mNameSpace = mNameSpace;
-  result->mTag = mTag;
+  result->mLowercaseTag = mLowercaseTag;
+  result->mCasedTag = mCasedTag;
   result->mOperator = mOperator;
   
   NS_IF_CLONE(mIDList);
@@ -316,7 +318,8 @@ nsCSSSelector::~nsCSSSelector(void)
 void nsCSSSelector::Reset(void)
 {
   mNameSpace = kNameSpaceID_Unknown;
-  mTag = nsnull;
+  mLowercaseTag = nsnull;
+  mCasedTag = nsnull;
   NS_IF_DELETE(mIDList);
   NS_IF_DELETE(mClassList);
   NS_IF_DELETE(mPseudoClassList);
@@ -334,12 +337,23 @@ void nsCSSSelector::SetNameSpace(PRInt32 aNameSpace)
   mNameSpace = aNameSpace;
 }
 
-void nsCSSSelector::SetTag(const nsString& aTag)
+void nsCSSSelector::SetTag(const nsString& aTag, PRBool aCaseMatters)
 {
-  if (aTag.IsEmpty())
-    mTag = nsnull;
-  else
-    mTag = do_GetAtom(aTag);
+  if (aTag.IsEmpty()) {
+    mLowercaseTag = mCasedTag =  nsnull;
+    return;
+  }
+
+  mCasedTag = do_GetAtom(aTag);
+ 
+  if (aCaseMatters) {
+    mLowercaseTag = mCasedTag;
+  } 
+  else {
+    nsAutoString lowercase(aTag);
+    ToLowerCase(lowercase);
+    mLowercaseTag = do_GetAtom(lowercase);
+  }
 }
 
 void nsCSSSelector::AddID(const nsString& aID)
@@ -422,7 +436,7 @@ PRInt32 nsCSSSelector::CalcWeightWithoutNegations() const
 {
   PRInt32 weight = 0;
 
-  if (nsnull != mTag) {
+  if (nsnull != mLowercaseTag) {
     weight += 0x000001;
   }
   nsAtomList* list = mIDList;
@@ -458,19 +472,6 @@ PRInt32 nsCSSSelector::CalcWeight() const
   return weight;
 }
 
-// pseudo-elements are stored in the selectors' chain using fictional elements;
-// these fictional elements have mTag starting with a colon
-static PRBool IsPseudoElement(nsIAtom* aAtom)
-{
-  if (aAtom) {
-    const char* str;
-    aAtom->GetUTF8String(&str);
-    return str && (*str == ':');
-  }
-
-  return PR_FALSE;
-}
-
 //
 // Builds the textual representation of a selector. Called by DOM 2 CSS 
 // StyleRule:selectorText
@@ -499,7 +500,7 @@ nsCSSSelector::ToString(nsAString& aString, nsICSSStyleSheet* aSheet,
     // Append the combinator, if needed.
     if (!stack.IsEmpty()) {
       const nsCSSSelector *next = stack.ElementAt(index - 1);
-      if (!IsPseudoElement(next->mTag)) {
+      if (!next->IsPseudoElement()) {
         aString.Append(PRUnichar(' '));
         PRUnichar oper = s->mOperator;
         if (oper != PRUnichar(0)) {
@@ -532,7 +533,7 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
                    PRBool aIsNegated) const
 {
   nsAutoString temp;
-  PRBool isPseudoElement = IsPseudoElement(mTag);
+  PRBool isPseudoElement = IsPseudoElement();
 
   // For non-pseudo-element selectors or for lone pseudo-elements, deal with
   // namespace prefixes.
@@ -588,7 +589,7 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
     }
   }
       
-  if (!mTag) {
+  if (!mLowercaseTag) {
     // Universal selector:  avoid writing the universal selector when we
     // can avoid it, especially since we're required to avoid it for the
     // inside of :not()
@@ -605,12 +606,12 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
         // XXXldb Why?
         aString.Append(PRUnichar('*'));
       }
-      if (!nsCSSPseudoElements::IsCSS2PseudoElement(mTag)) {
+      if (!nsCSSPseudoElements::IsCSS2PseudoElement(mLowercaseTag)) {
         aString.Append(PRUnichar(':'));
       }
     }
     nsAutoString prefix;
-    mTag->ToString(prefix);
+    mLowercaseTag->ToString(prefix);
     aString.Append(prefix);
   }
 
diff --git a/layout/style/nsICSSStyleRule.h b/layout/style/nsICSSStyleRule.h
index 067ff505060..d6a94d48d5f 100644
--- a/layout/style/nsICSSStyleRule.h
+++ b/layout/style/nsICSSStyleRule.h
@@ -152,7 +152,7 @@ public:
 
   void Reset(void);
   void SetNameSpace(PRInt32 aNameSpace);
-  void SetTag(const nsString& aTag);
+  void SetTag(const nsString& aTag, PRBool aCaseSensitive);
   void AddID(const nsString& aID);
   void AddClass(const nsString& aClass);
   void AddPseudoClass(nsIAtom* aPseudoClass);
@@ -163,6 +163,14 @@ public:
                     const nsString& aValue, PRBool aCaseSensitive);
   void SetOperator(PRUnichar aOperator);
 
+  inline PRBool HasTagSelector() const {
+    return !!mCasedTag;
+  }
+
+  inline PRBool IsPseudoElement() const {
+    return mLowercaseTag && !mCasedTag;
+  }
+
   // Calculate the specificity of this selector (not including its mNext!).
   PRInt32 CalcWeight() const;
 
@@ -188,7 +196,12 @@ private:
   PRInt32 CalcWeightWithoutNegations() const;
 
 public:
-  nsCOMPtr<nsIAtom> mTag;
+  // For case-sensitive documents, mLowercaseTag is the same as mCasedTag,
+  // but in case-insensitive documents (HTML) mLowercaseTag is lowercase.
+  // Also, for pseudo-elements mCasedTag will be null but mLowercaseTag
+  // contains their name.
+  nsCOMPtr<nsIAtom> mLowercaseTag;
+  nsCOMPtr<nsIAtom> mCasedTag;
   nsAtomList*     mIDList;
   nsAtomList*     mClassList;
   nsPseudoClassList* mPseudoClassList; // atom for the pseudo, string for
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index 8abd57dc4bd..3e7fc8ccb46 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -101,6 +101,8 @@ _TEST_FILES =	test_acid3_test46.html \
 		test_bug450191.html \
 		test_bug453896_deck.html \
 		test_bug470769.html \
+		test_bug499655.html \
+		test_bug499655.xhtml \
 		test_cascade.html \
 		test_compute_data_with_start_struct.html \
 		test_css_eof_handling.html \
diff --git a/layout/style/test/test_bug499655.html b/layout/style/test/test_bug499655.html
new file mode 100644
index 00000000000..05ee443152a
--- /dev/null
+++ b/layout/style/test/test_bug499655.html
@@ -0,0 +1,46 @@
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=499655
+-->
+<head>
+  <title>Test for Bug 499655</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=499655">Mozilla Bug 499655</a>
+<p id="display"></p>
+<div id="content">
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Bug 499655 **/
+
+test1 = document.createElementNS("http://www.w3.org/1999/xhtml","test");
+test2 = document.createElementNS("http://www.w3.org/1999/xhtml","TEst");
+test3 = document.createElementNS("test","test");
+test4 = document.createElementNS("test","TEst");
+
+content = document.getElementById("content");
+
+content.appendChild(test1);
+content.appendChild(test2);
+content.appendChild(test3);
+content.appendChild(test4);
+
+list = document.querySelectorAll('test');
+is(list.length, 2, "Number of elements found");
+is(list[0], test1, "First element didn't match");
+is(list[1], test3, "Third element didn't match");
+
+list = document.querySelectorAll('TEst');
+is(list.length, 2, "Wrong number of elements found");
+is(list[0], test1, "First element didn't match");
+is(list[1], test4, "Fourth element didn't match");
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/layout/style/test/test_bug499655.xhtml b/layout/style/test/test_bug499655.xhtml
new file mode 100644
index 00000000000..45d756c9139
--- /dev/null
+++ b/layout/style/test/test_bug499655.xhtml
@@ -0,0 +1,49 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=499655
+-->
+<head>
+  <title>Test for Bug 499655</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/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=499655">Mozilla Bug 499655</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+<![CDATA[
+
+test1 = document.createElementNS("http://www.w3.org/1999/xhtml","test");
+test2 = document.createElementNS("http://www.w3.org/1999/xhtml","TEst");
+test3 = document.createElementNS("test","test");
+test4 = document.createElementNS("test","TEst");
+
+content = document.getElementById("content");
+
+content.appendChild(test1);
+content.appendChild(test2);
+content.appendChild(test3);
+content.appendChild(test4);
+
+
+list = document.querySelectorAll('test');
+is(list.length, 2, "Number of elements found");
+is(list[0], test1, "First element didn't match");
+is(list[1] , test3, "Third element didn't match");
+
+list = document.querySelectorAll('TEst');
+is(list.length, 2, "Number of elements found");
+is(list[0], test2, "Second element didn't match");
+is(list[1], test4, "Fourth element didn't match");
+
+
+]]>
+</script>
+</pre>
+</body>
+</html>
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index b9847fb3c2f..102e8a9c6c6 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -4267,26 +4267,23 @@ nsTreeBodyFrame::GetPseudoStyleContext(nsIAtom* aPseudoElement)
 NS_IMETHODIMP
 nsTreeBodyFrame::PseudoMatches(nsIAtom* aTag, nsCSSSelector* aSelector, PRBool* aResult)
 {
-  if (aSelector->mTag == aTag) {
-    // Iterate the pseudoclass list.  For each item in the list, see if
-    // it is contained in our scratch array.  If we have a miss, then
-    // we aren't a match.  If all items in the pseudoclass list are
-    // present in the scratch array, then we have a match.
-    nsPseudoClassList* curr = aSelector->mPseudoClassList;
-    while (curr) {
-      PRInt32 index;
-      mScratchArray->GetIndexOf(curr->mAtom, &index);
-      if (index == -1) {
-        *aResult = PR_FALSE;
-        return NS_OK;
-      }
-      curr = curr->mNext;
+  NS_ABORT_IF_FALSE(aSelector->mLowercaseTag == aTag,
+                   "should not have been called");
+  // Iterate the pseudoclass list.  For each item in the list, see if
+  // it is contained in our scratch array.  If we have a miss, then
+  // we aren't a match.  If all items in the pseudoclass list are
+  // present in the scratch array, then we have a match.
+  nsPseudoClassList* curr = aSelector->mPseudoClassList;
+  while (curr) {
+    PRInt32 index;
+    mScratchArray->GetIndexOf(curr->mAtom, &index);
+    if (index == -1) {
+      *aResult = PR_FALSE;
+      return NS_OK;
     }
-    *aResult = PR_TRUE;
+    curr = curr->mNext;
   }
-  else 
-    *aResult = PR_FALSE;
-
+  *aResult = PR_TRUE;
   return NS_OK;
 }
 

From 058ae0c3196db850cd7129a626e04cb132a6ffe6 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Sat, 1 Aug 2009 08:53:40 -0700
Subject: [PATCH 141/175] Bug 507487:  Selectors should have dual atoms so they
 can correctly (and case-sensitively) match non-HTML elements in text/html
 documents, part 2: fix RuleHash to hash tag selectors twice when needed. 
 r=dbaron

---
 layout/reftests/bugs/507487-1-ref.html  |  7 +++
 layout/reftests/bugs/507487-1.html      | 32 +++++++++++++
 layout/reftests/bugs/507487-2-ref.xhtml | 11 +++++
 layout/reftests/bugs/507487-2.xhtml     | 32 +++++++++++++
 layout/reftests/bugs/reftest.list       |  2 +
 layout/style/nsCSSRuleProcessor.cpp     | 62 +++++++++++++++++++------
 6 files changed, 131 insertions(+), 15 deletions(-)
 create mode 100644 layout/reftests/bugs/507487-1-ref.html
 create mode 100644 layout/reftests/bugs/507487-1.html
 create mode 100644 layout/reftests/bugs/507487-2-ref.xhtml
 create mode 100644 layout/reftests/bugs/507487-2.xhtml

diff --git a/layout/reftests/bugs/507487-1-ref.html b/layout/reftests/bugs/507487-1-ref.html
new file mode 100644
index 00000000000..e2b451602fe
--- /dev/null
+++ b/layout/reftests/bugs/507487-1-ref.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+<div style="display:block; width:100px; height:100px; background: blue;"></div>
+<div style="display:block; width:100px; height:100px; background: green;"></div>
+<div style="display:block; width:100px; height:100px; background: blue;"></div>
+<div style="display:block; width:100px; height:100px; background: purple;"></div>
+</html>
diff --git a/layout/reftests/bugs/507487-1.html b/layout/reftests/bugs/507487-1.html
new file mode 100644
index 00000000000..412b4843b04
--- /dev/null
+++ b/layout/reftests/bugs/507487-1.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=507487
+-->
+<head>
+<style>
+#content > * {
+  display:block; width:100px; height:100px; background: purple;
+}
+#content > teST {
+  display:block; width:100px; height:100px; background: green;
+}
+
+#content > test {
+  display:block; width:100px; height:100px; background: blue;
+}
+
+</style>
+<script>
+  function f() {
+    document.getElementById('content').appendChild(document.createElementNS("test", "test"));
+    document.getElementById('content').appendChild(document.createElementNS("test", "teST"));
+    document.getElementById('content').appendChild(document.createElementNS("http://www.w3.org/1999/xhtml", "test"));
+    document.getElementById('content').appendChild(document.createElementNS("http://www.w3.org/1999/xhtml", "teST"));
+  }
+</script>
+</head>
+<body onload="f();">
+<div id=content></div>
+</body>
+</html>
diff --git a/layout/reftests/bugs/507487-2-ref.xhtml b/layout/reftests/bugs/507487-2-ref.xhtml
new file mode 100644
index 00000000000..6ccb5048d75
--- /dev/null
+++ b/layout/reftests/bugs/507487-2-ref.xhtml
@@ -0,0 +1,11 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=507487
+-->
+<body>
+<div style="display:block; width:100px; height:100px; background: blue;"></div>
+<div style="display:block; width:100px; height:100px; background: green;"></div>
+<div style="display:block; width:100px; height:100px; background: blue;"></div>
+<div style="display:block; width:100px; height:100px; background: green;"></div>
+</body>
+</html>
diff --git a/layout/reftests/bugs/507487-2.xhtml b/layout/reftests/bugs/507487-2.xhtml
new file mode 100644
index 00000000000..84bf023e1b4
--- /dev/null
+++ b/layout/reftests/bugs/507487-2.xhtml
@@ -0,0 +1,32 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=507487
+-->
+<head>
+  <style>
+    #content > * {
+    display:block; width:100px; height:100px; background: purple;
+    }
+    #content > teST {
+    display:block; width:100px; height:100px; background: green;
+    }
+    
+    #content > test {
+    display:block; width:100px; height:100px; background: blue;
+    }
+  </style>
+  <script type="application/javascript">
+  <![CDATA[
+  function f() {
+    document.getElementById('content').appendChild(document.createElementNS("test", "test"));
+    document.getElementById('content').appendChild(document.createElementNS("test", "teST"));
+    document.getElementById('content').appendChild(document.createElementNS("http://www.w3.org/1999/xhtml", "test"));
+    document.getElementById('content').appendChild(document.createElementNS("http://www.w3.org/1999/xhtml", "teST"));
+  }
+  ]]>
+  </script>
+</head>
+<body onload="f();">
+<div id="content"></div>
+</body>
+</html>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index dbd870863d8..badcf13920d 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1288,3 +1288,5 @@ fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == 488692-1.html 488692-1-ref.html # needs
 == 503364-1b.html 503364-1-ref.html
 == 504032-1.html 504032-1-ref.html
 == 505743-1.html about:blank
+== 507487-1.html 507487-1-ref.html
+== 507487-2.xhtml 507487-2-ref.xhtml
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index 197b1c628f0..b0f2030e496 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -145,6 +145,10 @@ struct RuleHashTableEntry : public PLDHashEntryHdr {
   RuleValue *mRules; // linked list of |RuleValue|, null-terminated
 };
 
+struct RuleHashTagTableEntry : public RuleHashTableEntry {
+  nsCOMPtr<nsIAtom> mTag;
+};
+
 static PLDHashNumber
 RuleHash_CIHashKey(PLDHashTable *table, const void *key)
 {
@@ -206,12 +210,20 @@ RuleHash_CSMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
   return match_atom == entry_atom;
 }
 
-static nsIAtom*
-RuleHash_TagTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr)
+static PRBool
+RuleHash_TagTable_MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
+                      const void *key)
 {
-  const RuleHashTableEntry *entry =
-    static_cast<const RuleHashTableEntry*>(hdr);
-  return entry->mRules->mSelector->mLowercaseTag;
+  nsIAtom *match_atom = const_cast<nsIAtom*>(static_cast<const nsIAtom*>
+                                              (key));
+  nsIAtom *entry_atom = static_cast<const RuleHashTagTableEntry*>(hdr)->mTag;
+
+  return match_atom == entry_atom;
+}
+
+static void RuleHash_TagTable_ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
+{
+  (static_cast<RuleHashTagTableEntry*>(entry))->~RuleHashTagTableEntry();
 }
 
 static nsIAtom*
@@ -248,18 +260,15 @@ RuleHash_NameSpaceTable_MatchEntry(PLDHashTable *table,
          entry->mRules->mSelector->mNameSpace;
 }
 
-static const RuleHashTableOps RuleHash_TagTable_Ops = {
-  {
+static const PLDHashTableOps RuleHash_TagTable_Ops = {
   PL_DHashAllocTable,
   PL_DHashFreeTable,
   PL_DHashVoidPtrKeyStub,
-  RuleHash_CSMatchEntry,
+  RuleHash_TagTable_MatchEntry,
   PL_DHashMoveEntryStub,
-  PL_DHashClearEntryStub,
+  RuleHash_TagTable_ClearEntry,
   PL_DHashFinalizeStub,
   NULL
-  },
-  RuleHash_TagTable_GetKey
 };
 
 // Case-sensitive ops.
@@ -362,6 +371,7 @@ public:
 protected:
   void PrependRuleToTable(PLDHashTable* aTable, const void* aKey,
                           RuleValue* aRuleInfo);
+  void PrependRuleToTagTable(const void* aKey, RuleValue* aRuleInfo);
   void PrependUniversalRule(RuleValue* aRuleInfo);
 
   // All rule values in these hashtables are arena allocated
@@ -421,8 +431,8 @@ RuleHash::RuleHash(PRBool aQuirksMode)
   // Initialize our arena
   PL_INIT_ARENA_POOL(&mArena, "RuleHashArena", NS_RULEHASH_ARENA_BLOCK_SIZE);
 
-  PL_DHashTableInit(&mTagTable, &RuleHash_TagTable_Ops.ops, nsnull,
-                    sizeof(RuleHashTableEntry), 64);
+  PL_DHashTableInit(&mTagTable, &RuleHash_TagTable_Ops, nsnull,
+                    sizeof(RuleHashTagTableEntry), 64);
   PL_DHashTableInit(&mIdTable,
                     aQuirksMode ? &RuleHash_IdTable_CIOps.ops
                                 : &RuleHash_IdTable_CSOps.ops,
@@ -498,6 +508,21 @@ void RuleHash::PrependRuleToTable(PLDHashTable* aTable, const void* aKey,
   entry->mRules = aRuleInfo->Add(mRuleCount++, entry->mRules);
 }
 
+void RuleHash::PrependRuleToTagTable(const void* aKey, RuleValue* aRuleInfo)
+{
+  // Get a new or exisiting entry
+   RuleHashTagTableEntry *entry = static_cast<RuleHashTagTableEntry*>
+                              (PL_DHashTableOperate(&mTagTable, aKey, PL_DHASH_ADD));
+   if (!entry)
+     return;
+
+   entry->mTag = const_cast<nsIAtom*>(static_cast<const nsIAtom*>(aKey));
+
+   // This may give the same rule two different rule counts, but that is OK
+   // because we never combine two different entries in the tag table.
+   entry->mRules = aRuleInfo->Add(mRuleCount++, entry->mRules);
+}
+
 void RuleHash::PrependUniversalRule(RuleValue *aRuleInfo)
 {
   mUniversalRules = aRuleInfo->Add(mRuleCount++, mUniversalRules);
@@ -514,9 +539,16 @@ void RuleHash::PrependRule(RuleValue *aRuleInfo)
     PrependRuleToTable(&mClassTable, selector->mClassList->mAtom, aRuleInfo);
     RULE_HASH_STAT_INCREMENT(mClassSelectors);
   }
-  else if (nsnull != selector->mLowercaseTag) {
-    PrependRuleToTable(&mTagTable, selector->mLowercaseTag, aRuleInfo);
+  else if (selector->mLowercaseTag) {
+    PrependRuleToTagTable(selector->mLowercaseTag, aRuleInfo);
     RULE_HASH_STAT_INCREMENT(mTagSelectors);
+    if (selector->mCasedTag && 
+        selector->mCasedTag != selector->mLowercaseTag) {
+      PrependRuleToTagTable(selector->mCasedTag, 
+                            new (mArena) RuleValue(aRuleInfo->mRule, 
+                                                   aRuleInfo->mSelector));
+      RULE_HASH_STAT_INCREMENT(mTagSelectors);
+    }
   }
   else if (kNameSpaceID_Unknown != selector->mNameSpace) {
     PrependRuleToTable(&mNameSpaceTable,

From 4e2c25d11b43be2bc7cd663730b800ee8fb4e51b Mon Sep 17 00:00:00 2001
From: Michael Ventnor <ventnor.bugzilla@gmail.com>
Date: Sat, 1 Aug 2009 08:53:40 -0700
Subject: [PATCH 142/175] Bug 479220: Implement support for CSS gradients:
 -moz-linear-gradient() and -moz-radial-gradient().  r=roc, dbaron

---
 layout/base/nsCSSRendering.cpp                | 146 +++++++++---
 layout/base/nsCSSRendering.h                  |  11 +
 layout/base/nsDisplayList.cpp                 |   6 +-
 layout/base/nsPresContext.cpp                 |   6 +-
 layout/generic/nsFrame.cpp                    |   9 +-
 .../css-gradients/linear-keywords-ref.html    |  23 ++
 .../css-gradients/linear-keywords.html        |   1 +
 .../css-gradients/linear-mix-ref.html         |  34 +++
 layout/reftests/css-gradients/linear-mix.html |   3 +
 .../css-gradients/linear-percent-ref.html     |  23 ++
 .../css-gradients/linear-percent.html         |   1 +
 layout/reftests/css-gradients/linear-ref.html |  24 ++
 layout/reftests/css-gradients/linear.html     |   1 +
 .../reftests/css-gradients/nostops-ref.html   |  21 ++
 layout/reftests/css-gradients/nostops.html    |   1 +
 .../reftests/css-gradients/onestop-ref.html   |  22 ++
 layout/reftests/css-gradients/onestop.html    |   1 +
 layout/reftests/css-gradients/radial-ref.html |  23 ++
 layout/reftests/css-gradients/radial.html     |   1 +
 layout/reftests/css-gradients/reftest.list    |   8 +
 .../reftests/css-gradients/twostops-ref.html  |  23 ++
 layout/reftests/css-gradients/twostops.html   |   1 +
 layout/reftests/reftest.list                  |   3 +
 layout/style/nsCSSDeclaration.cpp             |  44 ++++
 layout/style/nsCSSParser.cpp                  | 215 ++++++++++++++++--
 layout/style/nsCSSValue.cpp                   |  64 +++++-
 layout/style/nsCSSValue.h                     | 137 ++++++++++-
 layout/style/nsComputedDOMStyle.cpp           | 117 +++++++++-
 layout/style/nsComputedDOMStyle.h             |   3 +
 layout/style/nsRuleNode.cpp                   |  98 +++++++-
 layout/style/nsStyleStruct.cpp                | 147 +++++++++++-
 layout/style/nsStyleStruct.h                  | 110 ++++++++-
 layout/style/test/property_database.js        |  28 ++-
 layout/tables/nsTablePainter.cpp              |   2 +-
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |   4 +-
 35 files changed, 1277 insertions(+), 84 deletions(-)
 create mode 100644 layout/reftests/css-gradients/linear-keywords-ref.html
 create mode 100644 layout/reftests/css-gradients/linear-keywords.html
 create mode 100644 layout/reftests/css-gradients/linear-mix-ref.html
 create mode 100644 layout/reftests/css-gradients/linear-mix.html
 create mode 100644 layout/reftests/css-gradients/linear-percent-ref.html
 create mode 100644 layout/reftests/css-gradients/linear-percent.html
 create mode 100644 layout/reftests/css-gradients/linear-ref.html
 create mode 100644 layout/reftests/css-gradients/linear.html
 create mode 100644 layout/reftests/css-gradients/nostops-ref.html
 create mode 100644 layout/reftests/css-gradients/nostops.html
 create mode 100644 layout/reftests/css-gradients/onestop-ref.html
 create mode 100644 layout/reftests/css-gradients/onestop.html
 create mode 100644 layout/reftests/css-gradients/radial-ref.html
 create mode 100644 layout/reftests/css-gradients/radial.html
 create mode 100644 layout/reftests/css-gradients/reftest.list
 create mode 100644 layout/reftests/css-gradients/twostops-ref.html
 create mode 100644 layout/reftests/css-gradients/twostops.html

diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index ded69d92211..034e57bc7b6 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1513,9 +1513,12 @@ DetermineBackgroundColorInternal(nsPresContext* aPresContext,
     aDrawBackgroundColor = aPresContext->GetBackgroundColorDraw();
   }
 
-  aBottomImage = aBackground.BottomLayer().mImage;
-
-  if (!aDrawBackgroundImage || !HaveCompleteBackgroundImage(aBottomImage)) {
+  if (aBackground.BottomLayer().mImage.GetType() == eBackgroundImage_Image) {
+    aBottomImage = aBackground.BottomLayer().mImage.GetImageData();
+    if (!aDrawBackgroundImage || !HaveCompleteBackgroundImage(aBottomImage)) {
+      aBottomImage = nsnull;
+    }
+  } else {
     aBottomImage = nsnull;
   }
 
@@ -1555,6 +1558,84 @@ nsCSSRendering::DetermineBackgroundColor(nsPresContext* aPresContext,
                                           bottomImage);
 }
 
+static gfxFloat
+ConvertGradientValueToPixels(const nsStyleCoord& aCoord,
+                             nscoord aFillLength,
+                             nscoord aAppUnitsPerPixel)
+{
+  switch (aCoord.GetUnit()) {
+    case eStyleUnit_Percent:
+      return aCoord.GetPercentValue() * aFillLength / aAppUnitsPerPixel;
+    case eStyleUnit_Coord:
+      return aCoord.GetCoordValue() / aAppUnitsPerPixel;
+    default:
+      NS_WARNING("Unexpected coord unit");
+      return 0;
+  }
+}
+
+void
+nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
+                              nsIRenderingContext& aRenderingContext,
+                              nsStyleGradient* aGradient,
+                              const nsRect& aDirtyRect,
+                              const nsRect& aOneCellArea,
+                              const nsRect& aFillArea,
+                              PRBool aRepeat)
+{
+  gfxContext *ctx = aRenderingContext.ThebesContext();
+  nscoord appUnitsPerPixel = aPresContext->AppUnitsPerDevPixel();
+
+  gfxRect dirtyRect = RectToGfxRect(aDirtyRect, appUnitsPerPixel);
+  gfxRect areaToFill = RectToGfxRect(aFillArea, appUnitsPerPixel);
+  gfxRect oneCellArea = RectToGfxRect(aOneCellArea, appUnitsPerPixel);
+  gfxPoint fillOrigin = oneCellArea.TopLeft();
+
+  areaToFill = areaToFill.Intersect(dirtyRect);
+  if (areaToFill.IsEmpty())
+    return;
+
+  gfxFloat gradX0 = ConvertGradientValueToPixels(aGradient->mStartX,
+                        aOneCellArea.width, appUnitsPerPixel);
+  gfxFloat gradY0 = ConvertGradientValueToPixels(aGradient->mStartY,
+                        aOneCellArea.height, appUnitsPerPixel);
+  gfxFloat gradX1 = ConvertGradientValueToPixels(aGradient->mEndX,
+                        aOneCellArea.width, appUnitsPerPixel);
+  gfxFloat gradY1 = ConvertGradientValueToPixels(aGradient->mEndY,
+                        aOneCellArea.height, appUnitsPerPixel);
+
+  nsRefPtr<gfxPattern> gradientPattern;
+  if (aGradient->mIsRadial) {
+    gfxFloat gradRadius0 = double(aGradient->mStartRadius) / appUnitsPerPixel;
+    gfxFloat gradRadius1 = double(aGradient->mEndRadius) / appUnitsPerPixel;
+    gradientPattern = new gfxPattern(gradX0, gradY0, gradRadius0,
+                                     gradX1, gradY1, gradRadius1);
+  } else {
+    gradientPattern = new gfxPattern(gradX0, gradY0, gradX1, gradY1);
+  }
+
+  if (!gradientPattern || gradientPattern->CairoStatus())
+    return;
+
+  for (PRUint32 i = 0; i < aGradient->mStops.Length(); i++) {
+    gradientPattern->AddColorStop(aGradient->mStops[i].mPosition,
+                                  gfxRGBA(aGradient->mStops[i].mColor));
+  }
+
+  if (aRepeat)
+    gradientPattern->SetExtend(gfxPattern::EXTEND_REPEAT);
+
+  ctx->Save();
+  ctx->NewPath();
+  // The fill origin is part of the translate call so the pattern starts at
+  // the desired point, rather than (0,0).
+  ctx->Translate(fillOrigin);
+  ctx->SetPattern(gradientPattern);
+  ctx->Rectangle(areaToFill - fillOrigin, PR_TRUE);
+  ctx->Fill();
+  ctx->Restore();
+}
+
 void
 nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
                                       nsIRenderingContext& aRenderingContext,
@@ -1811,26 +1892,6 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
    *   background-repeat
    */
 
-  // Lookup the image
-  imgIRequest *req = aLayer.mImage;
-  if (!HaveCompleteBackgroundImage(req))
-    return;
-
-  nsCOMPtr<imgIContainer> image;
-  req->GetImage(getter_AddRefs(image));
-  req = nsnull;
-
-  nsIntSize imageIntSize;
-  image->GetWidth(&imageIntSize.width);
-  image->GetHeight(&imageIntSize.height);
-
-  nsSize imageSize;
-  imageSize.width = nsPresContext::CSSPixelsToAppUnits(imageIntSize.width);
-  imageSize.height = nsPresContext::CSSPixelsToAppUnits(imageIntSize.height);
-
-  if (imageSize.width == 0 || imageSize.height == 0)
-    return;
-
   // relative to aBorderArea
   nsRect bgPositioningArea(0, 0, 0, 0);
 
@@ -1885,6 +1946,32 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
     }
   }
 
+  nsSize imageSize;
+  nsCOMPtr<imgIContainer> image;
+  if (aLayer.mImage.GetType() == eBackgroundImage_Image) {
+    // Lookup the image
+    imgIRequest *req = aLayer.mImage.GetImageData();
+    if (!HaveCompleteBackgroundImage(req))
+      return;
+
+    req->GetImage(getter_AddRefs(image));
+    req = nsnull;
+
+    nsIntSize imageIntSize;
+    image->GetWidth(&imageIntSize.width);
+    image->GetHeight(&imageIntSize.height);
+
+    imageSize.width = nsPresContext::CSSPixelsToAppUnits(imageIntSize.width);
+    imageSize.height = nsPresContext::CSSPixelsToAppUnits(imageIntSize.height);
+  } else if (aLayer.mImage.GetType() == eBackgroundImage_Gradient) {
+    imageSize = bgPositioningArea.Size();
+  } else {
+    return;
+  }
+
+  if (imageSize.width == 0 || imageSize.height == 0)
+    return;
+
   // Compute the anchor point.
   //
   // relative to aBorderArea.TopLeft() (which is where the top-left
@@ -1994,9 +2081,16 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
   }
   fillArea.IntersectRect(fillArea, aBGClipRect);
 
-  nsLayoutUtils::DrawImage(&aRenderingContext, image,
-      nsLayoutUtils::GetGraphicsFilterForFrame(aForFrame),
-      destArea, fillArea, anchor + aBorderArea.TopLeft(), aDirtyRect);
+  if (aLayer.mImage.GetType() == eBackgroundImage_Image) {
+    nsLayoutUtils::DrawImage(&aRenderingContext, image,
+        nsLayoutUtils::GetGraphicsFilterForFrame(aForFrame),
+        destArea, fillArea, anchor + aBorderArea.TopLeft(), aDirtyRect);
+  } else {
+    nsCSSRendering::PaintGradient(aPresContext, aRenderingContext,
+                  aLayer.mImage.GetGradientData(),
+                  aDirtyRect, destArea, fillArea,
+                  (repeat != NS_STYLE_BG_REPEAT_OFF));
+  }
 }
 
 static void
diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index a672f26e26e..ac3e9e1c885 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -127,6 +127,17 @@ struct nsCSSRendering {
                          const nsRect& aFocusRect,
                          nscolor aColor);
 
+  /**
+   * Render a gradient for an element.
+   */
+  static void PaintGradient(nsPresContext* aPresContext,
+                            nsIRenderingContext& aRenderingContext,
+                            nsStyleGradient* aGradient,
+                            const nsRect& aDirtyRect,
+                            const nsRect& aOneCellArea,
+                            const nsRect& aFillArea,
+                            PRBool aRepeat);
+
   /**
    * Gets the root frame for the frame
    */
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index a6c82474f82..24081535f5c 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -562,9 +562,9 @@ nsDisplayBackground::IsOpaque(nsDisplayListBuilder* aBuilder) {
     return PR_TRUE;
 
   if (bottomLayer.mRepeat == NS_STYLE_BG_REPEAT_XY) {
-    if (bottomLayer.mImage) {
+    if (bottomLayer.mImage.GetType() == eBackgroundImage_Image) {
       nsCOMPtr<imgIContainer> container;
-      bottomLayer.mImage->GetImage(getter_AddRefs(container));
+      bottomLayer.mImage.GetImageData()->GetImage(getter_AddRefs(container));
       if (container) {
         PRBool animated;
         container->GetAnimated(&animated);
@@ -591,7 +591,7 @@ nsDisplayBackground::IsUniform(nsDisplayListBuilder* aBuilder) {
     nsCSSRendering::FindBackground(mFrame->PresContext(), mFrame, &bg);
   if (!hasBG)
     return PR_TRUE;
-  if (!bg->BottomLayer().mImage &&
+  if (bg->BottomLayer().mImage.GetType() == eBackgroundImage_Null &&
       bg->mImageCount == 1 &&
       !nsLayoutUtils::HasNonZeroCorner(mFrame->GetStyleBorder()->mBorderRadius) &&
       bg->BottomLayer().mClip == NS_STYLE_BG_CLIP_BORDER)
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index a1ba13754e7..04762d35f0e 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1268,8 +1268,10 @@ nsPresContext::SetupBackgroundImageLoaders(nsIFrame* aFrame,
 {
   nsRefPtr<nsImageLoader> loaders;
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, aStyleBackground) {
-    imgIRequest *image = aStyleBackground->mLayers[i].mImage;
-    loaders = nsImageLoader::Create(aFrame, image, PR_FALSE, loaders);
+    if (aStyleBackground->mLayers[i].mImage.GetType() == eBackgroundImage_Image) {
+      imgIRequest *image = aStyleBackground->mLayers[i].mImage.GetImageData();
+      loaders = nsImageLoader::Create(aFrame, image, PR_FALSE, loaders);
+    }
   }
   SetImageLoaders(aFrame, BACKGROUND_IMAGE, loaders);
 }
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 7a6f377008f..285d934cea5 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -532,11 +532,8 @@ nsFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
     const nsStyleBackground *oldBG = aOldStyleContext->GetStyleBackground();
     const nsStyleBackground *newBG = GetStyleBackground();
     NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, oldBG) {
-      imgIRequest *oldImage = oldBG->mLayers[i].mImage;
-      imgIRequest *newImage = i < newBG->mImageCount
-                                ? newBG->mLayers[i].mImage.get()
-                                : nsnull;
-      if (oldImage && !EqualImages(oldImage, newImage)) {
+      if (i >= newBG->mImageCount ||
+          oldBG->mLayers[i].mImage != newBG->mLayers[i].mImage) {
         // stop the image loading for the frame, the image has changed
         PresContext()->SetImageLoaders(this,
           nsPresContext::BACKGROUND_IMAGE, nsnull);
@@ -4092,7 +4089,7 @@ nsIFrame::CheckInvalidateSizeChange(const nsRect& aOldRect,
   const nsStyleBackground *bg = GetStyleBackground();
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, bg) {
     const nsStyleBackground::Layer &layer = bg->mLayers[i];
-    if (layer.mImage &&
+    if (layer.mImage.GetType() != eBackgroundImage_Null &&
         (layer.mPosition.mXIsPercent || layer.mPosition.mYIsPercent)) {
       Invalidate(nsRect(0, 0, aOldRect.width, aOldRect.height));
       return;
diff --git a/layout/reftests/css-gradients/linear-keywords-ref.html b/layout/reftests/css-gradients/linear-keywords-ref.html
new file mode 100644
index 00000000000..867e42675f4
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-keywords-ref.html
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(0,0,150,300);
+  grad.addColorStop(0, '#0000ff');
+  grad.addColorStop(1, '#000000');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/linear-keywords.html b/layout/reftests/css-gradients/linear-keywords.html
new file mode 100644
index 00000000000..2f1223fdcbd
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-keywords.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(left top, center bottom, from(#0000ff), to(#000000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/linear-mix-ref.html b/layout/reftests/css-gradients/linear-mix-ref.html
new file mode 100644
index 00000000000..dfde1130119
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-mix-ref.html
@@ -0,0 +1,34 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(150,20,270,130);
+  grad.addColorStop(0, '#0000ff');
+  grad.addColorStop(1, '#000000');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  ctx = document.getElementById('canvas2').getContext('2d');
+
+  grad = ctx.createLinearGradient(30,300,300,50);
+  grad.addColorStop(0, '#00ff00');
+  grad.addColorStop(1, '#000000');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300" style="position: absolute; top: 30px; left: 30px;"></canvas>
+<br/><br/>
+<canvas id="canvas2" width="300" height="300" style="position: absolute; top: 360px; left: 30px;"></canvas>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/linear-mix.html b/layout/reftests/css-gradients/linear-mix.html
new file mode 100644
index 00000000000..745a37294b3
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-mix.html
@@ -0,0 +1,3 @@
+<div style="background: -moz-linear-gradient(center 20px, 90% 130px, from(#0000ff), to(#000000)) no-repeat; width: 300px; height: 300px; position: absolute; top: 30px; left: 30px;"><br></div>
+
+<div style="background: -moz-linear-gradient(10% bottom, right 50px, from(#00ff00), to(#000000)) no-repeat; width: 300px; height: 300px; position: absolute; top: 360px; left: 30px;"><br></div>
diff --git a/layout/reftests/css-gradients/linear-percent-ref.html b/layout/reftests/css-gradients/linear-percent-ref.html
new file mode 100644
index 00000000000..b1bf73d897f
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-percent-ref.html
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(30,60,240,270);
+  grad.addColorStop(0, '#0000ff');
+  grad.addColorStop(1, '#000000');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/linear-percent.html b/layout/reftests/css-gradients/linear-percent.html
new file mode 100644
index 00000000000..d2f6eb1eee8
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-percent.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(10% 20%, 80% 90%, from(#0000ff), to(#000000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/linear-ref.html b/layout/reftests/css-gradients/linear-ref.html
new file mode 100644
index 00000000000..fe1d6fdd922
--- /dev/null
+++ b/layout/reftests/css-gradients/linear-ref.html
@@ -0,0 +1,24 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(10,20,50,100);
+  grad.addColorStop(0, 'red');
+  grad.addColorStop(1, 'rgb(100, 200, 0)');
+  grad.addColorStop(0.5, '#7777FF');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/linear.html b/layout/reftests/css-gradients/linear.html
new file mode 100644
index 00000000000..83dd41238e7
--- /dev/null
+++ b/layout/reftests/css-gradients/linear.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(10px 20px, 50px 100px, from(red), to(rgb(100, 200, 0)), color-stop(0.5, #7777FF)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/nostops-ref.html b/layout/reftests/css-gradients/nostops-ref.html
new file mode 100644
index 00000000000..4aa8b1e704c
--- /dev/null
+++ b/layout/reftests/css-gradients/nostops-ref.html
@@ -0,0 +1,21 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(0,0,150,300);
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/nostops.html b/layout/reftests/css-gradients/nostops.html
new file mode 100644
index 00000000000..d0a78e66202
--- /dev/null
+++ b/layout/reftests/css-gradients/nostops.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(left top, center bottom) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/onestop-ref.html b/layout/reftests/css-gradients/onestop-ref.html
new file mode 100644
index 00000000000..99c384ffce4
--- /dev/null
+++ b/layout/reftests/css-gradients/onestop-ref.html
@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(0,0,150,300);
+  grad.addColorStop(0.5, '#0000ff');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/onestop.html b/layout/reftests/css-gradients/onestop.html
new file mode 100644
index 00000000000..498ba5cde06
--- /dev/null
+++ b/layout/reftests/css-gradients/onestop.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(left top, center bottom, color-stop(0.5, #0000ff)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/radial-ref.html b/layout/reftests/css-gradients/radial-ref.html
new file mode 100644
index 00000000000..7eb20a8f317
--- /dev/null
+++ b/layout/reftests/css-gradients/radial-ref.html
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var radgrad = ctx.createRadialGradient(45,45,10,45,45,30);
+  radgrad.addColorStop(0, '#FF0000');
+  radgrad.addColorStop(1, '#0000FF');
+
+  ctx.fillStyle = radgrad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/radial.html b/layout/reftests/css-gradients/radial.html
new file mode 100644
index 00000000000..b739a65bb8c
--- /dev/null
+++ b/layout/reftests/css-gradients/radial.html
@@ -0,0 +1 @@
+<div style="background: -moz-radial-gradient(45px 45px, 10px, 45px 45px, 30px, from(#ff0000), to(#0000ff)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list
new file mode 100644
index 00000000000..30c30917aa4
--- /dev/null
+++ b/layout/reftests/css-gradients/reftest.list
@@ -0,0 +1,8 @@
+== linear.html linear-ref.html
+== radial.html radial-ref.html
+== linear-keywords.html linear-keywords-ref.html
+== linear-percent.html linear-percent-ref.html
+== linear-mix.html linear-mix-ref.html
+== nostops.html nostops-ref.html
+== onestop.html onestop-ref.html
+== twostops.html twostops-ref.html
diff --git a/layout/reftests/css-gradients/twostops-ref.html b/layout/reftests/css-gradients/twostops-ref.html
new file mode 100644
index 00000000000..9a4624728a2
--- /dev/null
+++ b/layout/reftests/css-gradients/twostops-ref.html
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      class="reftest-wait">
+<head>
+<script>
+function doDraw() {
+  var ctx = document.getElementById('canvas').getContext('2d');
+
+  var grad = ctx.createLinearGradient(0,0,150,300);
+  grad.addColorStop(0.5, '#0000ff');
+  grad.addColorStop(0.5, '#ff0000');
+
+  ctx.fillStyle = grad;
+  ctx.fillRect(0,0,300,300);
+
+  document.documentElement.removeAttribute('class');
+}
+</script>
+</head>
+<body onload="doDraw();">
+<canvas id="canvas" width="300" height="300"/>
+</body>
+</html>
+
diff --git a/layout/reftests/css-gradients/twostops.html b/layout/reftests/css-gradients/twostops.html
new file mode 100644
index 00000000000..f4f51727b43
--- /dev/null
+++ b/layout/reftests/css-gradients/twostops.html
@@ -0,0 +1 @@
+<div style="background: -moz-linear-gradient(left top, center bottom, color-stop(0.5, #0000ff), color-stop(0.5, #ff0000)) no-repeat; width: 300px; height: 300px;"><br></div>
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index dcd15fc36ef..6f21e928c67 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -41,6 +41,9 @@ include css-import/reftest.list
 # css character encoding tests
 include css-charset/reftest.list
 
+# css gradients
+include css-gradients/reftest.list
+
 # css media queries (tests for print mode)
 include css-mediaqueries/reftest.list
 
diff --git a/layout/style/nsCSSDeclaration.cpp b/layout/style/nsCSSDeclaration.cpp
index 4eebd5bf336..870076f0351 100644
--- a/layout/style/nsCSSDeclaration.cpp
+++ b/layout/style/nsCSSDeclaration.cpp
@@ -413,6 +413,49 @@ nsCSSDeclaration::AppendCSSValueToString(nsCSSProperty aProperty,
     tmpStr.AppendFloat(aValue.GetFloatValue());
     aResult.Append(tmpStr);
   }
+  else if (eCSSUnit_Gradient == unit) {
+    nsCSSValueGradient* gradient = aValue.GetGradientValue();
+
+    if (gradient->mIsRadial)
+      aResult.AppendLiteral("-moz-radial-gradient(");
+    else
+      aResult.AppendLiteral("-moz-linear-gradient(");
+
+    AppendCSSValueToString(eCSSProperty_background_position,
+                           gradient->mStartX, aResult);
+    aResult.AppendLiteral(" ");
+
+    AppendCSSValueToString(eCSSProperty_background_position,
+                           gradient->mStartY, aResult);
+    aResult.AppendLiteral(", ");
+
+    if (gradient->mIsRadial) {
+      AppendCSSValueToString(aProperty, gradient->mStartRadius, aResult);
+      aResult.AppendLiteral(", ");
+    }
+
+    AppendCSSValueToString(eCSSProperty_background_position,
+                           gradient->mEndX, aResult);
+    aResult.AppendLiteral(" ");
+
+    AppendCSSValueToString(eCSSProperty_background_position,
+                           gradient->mEndY, aResult);
+
+    if (gradient->mIsRadial) {
+      aResult.AppendLiteral(", ");
+      AppendCSSValueToString(aProperty, gradient->mEndRadius, aResult);
+    }
+
+    for (PRUint32 i = 0; i < gradient->mStops.Length(); i++) {
+      aResult.AppendLiteral(", color-stop(");
+      AppendCSSValueToString(aProperty, gradient->mStops[i].mLocation, aResult);
+      aResult.AppendLiteral(", ");
+      AppendCSSValueToString(aProperty, gradient->mStops[i].mColor, aResult);
+      aResult.AppendLiteral(")");
+    }
+
+    aResult.AppendLiteral(")");
+  }
 
   switch (unit) {
     case eCSSUnit_Null:         break;
@@ -446,6 +489,7 @@ nsCSSDeclaration::AppendCSSValueToString(nsCSSProperty aProperty,
     case eCSSUnit_Color:        break;
     case eCSSUnit_Percent:      aResult.Append(PRUnichar('%'));    break;
     case eCSSUnit_Number:       break;
+    case eCSSUnit_Gradient:     break;
 
     case eCSSUnit_Inch:         aResult.AppendLiteral("in");   break;
     case eCSSUnit_Millimeter:   aResult.AppendLiteral("mm");   break;
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index ea13346b31f..6ca629c2fc5 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -66,7 +66,6 @@
 #include "nsIAtom.h"
 #include "nsCOMArray.h"
 #include "nsColor.h"
-#include "nsStyleConsts.h"
 #include "nsCSSPseudoClasses.h"
 #include "nsCSSPseudoElements.h"
 #include "nsCSSAnonBoxes.h"
@@ -107,6 +106,7 @@
 #define VARIANT_NONE            0x040000  // O
 #define VARIANT_NORMAL          0x080000  // M
 #define VARIANT_SYSFONT         0x100000  // eCSSUnit_System_Font
+#define VARIANT_GRADIENT        0x200000  // eCSSUnit_Gradient
 
 // Common combinations of variants
 #define VARIANT_AL   (VARIANT_AUTO | VARIANT_LENGTH)
@@ -422,7 +422,7 @@ protected:
 
   PRBool ParseBackgroundList(nsCSSProperty aPropID); // a single value prop-id
   PRBool ParseBackgroundPosition();
-  PRBool ParseBoxPositionValues(nsCSSValuePair& aOut);
+  PRBool ParseBoxPositionValues(nsCSSValuePair& aOut, PRBool aAcceptsInherit);
   PRBool ParseBackgroundSize();
   PRBool ParseBackgroundSizeValues(nsCSSValuePair& aOut);
   PRBool ParseBorderColor();
@@ -510,6 +510,8 @@ protected:
   PRBool ParseURL(nsCSSValue& aValue);
   PRBool TranslateDimension(nsCSSValue& aValue, PRInt32 aVariantMask,
                             float aNumber, const nsString& aUnit);
+  PRBool ParseGradientStop(nsCSSValueGradient* aGradient);
+  PRBool ParseGradient(nsCSSValue& aValue, PRBool aIsRadial);
 
   void SetParsingCompoundProperty(PRBool aBool) {
     NS_ASSERTION(aBool == PR_TRUE || aBool == PR_FALSE, "bad PRBool value");
@@ -4513,6 +4515,15 @@ CSSParserImpl::ParseVariant(nsCSSValue& aValue,
     }
     return PR_FALSE;
   }
+  if ((aVariantMask & VARIANT_GRADIENT) != 0 &&
+      eCSSToken_Function == tk->mType) {
+    // a generated gradient
+    if (tk->mIdent.LowerCaseEqualsLiteral("-moz-linear-gradient"))
+      return ParseGradient(aValue, PR_FALSE);
+
+    if (tk->mIdent.LowerCaseEqualsLiteral("-moz-radial-gradient"))
+      return ParseGradient(aValue, PR_TRUE);
+  }
   if ((aVariantMask & VARIANT_COLOR) != 0) {
     if ((mNavQuirkMode && !IsParsingCompoundProperty()) || // NONSTANDARD: Nav interprets 'xxyyzz' values even without '#' prefix
         (eCSSToken_ID == tk->mType) ||
@@ -4762,6 +4773,181 @@ CSSParserImpl::ParseURL(nsCSSValue& aValue)
   return PR_TRUE;
 }
 
+PRBool
+CSSParserImpl::ParseGradientStop(nsCSSValueGradient* aGradient)
+{
+  if (!GetToken(PR_TRUE))
+    return PR_FALSE;
+
+  if (eCSSToken_Function != mToken.mType) {
+    UngetToken();
+    return PR_FALSE;
+  }
+
+  if (mToken.mIdent.LowerCaseEqualsLiteral("from")) {
+    // Start of the gradient
+    if (!ExpectSymbol('(', PR_FALSE)) {
+      NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
+    }
+
+    nsCSSValue fromFloat(0.0f, eCSSUnit_Percent);
+    nsCSSValue fromColor;
+    if (!ParseVariant(fromColor, VARIANT_COLOR, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    if (!ExpectSymbol(')', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    aGradient->mStops.AppendElement(nsCSSValueGradientStop(fromFloat, fromColor));
+    return PR_TRUE;
+  }
+
+  if (mToken.mIdent.LowerCaseEqualsLiteral("to")) {
+    // End of the gradient
+    if (!ExpectSymbol('(', PR_FALSE)) {
+      NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
+    }
+
+    nsCSSValue toFloat(1.0f, eCSSUnit_Percent);
+    nsCSSValue toColor;
+    if (!ParseVariant(toColor, VARIANT_COLOR, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    if (!ExpectSymbol(')', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    aGradient->mStops.AppendElement(nsCSSValueGradientStop(toFloat, toColor));
+    return PR_TRUE;
+  }
+
+  if (mToken.mIdent.LowerCaseEqualsLiteral("color-stop")) {
+    // Some kind of gradient stop, somewhere...
+    if (!ExpectSymbol('(', PR_FALSE)) {
+      NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
+    }
+
+    nsCSSValue stopFloat;
+    if (!ParseVariant(stopFloat, VARIANT_PERCENT | VARIANT_NUMBER, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    // Check for a sane position value, and clamp it if it isn't
+    if (stopFloat.GetUnit() == eCSSUnit_Percent) {
+      if (stopFloat.GetPercentValue() > 1.0)
+        stopFloat.SetPercentValue(1.0);
+      else if (stopFloat.GetPercentValue() < 0.0)
+        stopFloat.SetPercentValue(0.0);
+    } else {
+      if (stopFloat.GetFloatValue() > 1.0)
+        stopFloat.SetFloatValue(1.0, eCSSUnit_Number);
+      else if (stopFloat.GetFloatValue() < 0.0)
+        stopFloat.SetFloatValue(0.0, eCSSUnit_Number);
+    }
+
+    if (!ExpectSymbol(',', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    nsCSSValue stopColor;
+    if (!ParseVariant(stopColor, VARIANT_COLOR, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    if (!ExpectSymbol(')', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    aGradient->mStops.AppendElement(nsCSSValueGradientStop(stopFloat, stopColor));
+    return PR_TRUE;
+  }
+
+  // No idea what this is
+  return PR_FALSE;
+}
+
+PRBool
+CSSParserImpl::ParseGradient(nsCSSValue& aValue,
+                             PRBool aIsRadial)
+{
+  if (!ExpectSymbol('(', PR_FALSE)) {
+    NS_ABORT_IF_FALSE(PR_FALSE, "function token without (");
+  }
+
+  nsCSSValuePair startPos;
+  if (!ParseBoxPositionValues(startPos, PR_FALSE))
+    return PR_FALSE;
+
+  if (!ExpectSymbol(',', PR_TRUE)) {
+    SkipUntil(')');
+    return PR_FALSE;
+  }
+
+  nsCSSValue startRadius;
+  if (aIsRadial) {
+    if (!ParseNonNegativeVariant(startRadius, VARIANT_LENGTH, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    if (!ExpectSymbol(',', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+  }
+
+  nsCSSValuePair endPos;
+  if (!ParseBoxPositionValues(endPos, PR_FALSE)) {
+    SkipUntil(')');
+    return PR_FALSE;
+  }
+
+  nsCSSValue endRadius;
+  if (aIsRadial) {
+    if (!ExpectSymbol(',', PR_TRUE)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+
+    if (!ParseNonNegativeVariant(endRadius, VARIANT_LENGTH, nsnull)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+  }
+
+  nsRefPtr<nsCSSValueGradient> cssGradient =
+    new nsCSSValueGradient(aIsRadial, startPos.mXValue, startPos.mYValue,
+                           startRadius, endPos.mXValue, endPos.mYValue,
+                           endRadius);
+
+  // Do optional stop functions
+  while (ExpectSymbol(',', PR_TRUE)) {
+    if (!ParseGradientStop(cssGradient)) {
+      SkipUntil(')');
+      return PR_FALSE;
+    }
+  }
+
+  if (!ExpectSymbol(')', PR_TRUE)) {
+    SkipUntil(')');
+    return PR_FALSE;
+  }
+
+  aValue.SetGradientValue(cssGradient);
+  return PR_TRUE;
+}
+
 PRInt32
 CSSParserImpl::ParseChoice(nsCSSValue aValues[],
                            const nsCSSProperty aPropIDs[], PRInt32 aNumIDs)
@@ -5421,7 +5607,7 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
     return ParseVariant(aValue, VARIANT_HC, nsnull);
   case eCSSProperty_background_image:
     // Used only internally.
-    return ParseVariant(aValue, VARIANT_HUO, nsnull);
+    return ParseVariant(aValue, VARIANT_HUO | VARIANT_GRADIENT, nsnull);
   case eCSSProperty__moz_background_inline_policy:
     return ParseVariant(aValue, VARIANT_HK,
                         nsCSSProps::kBackgroundInlinePolicyKTable);
@@ -6155,7 +6341,7 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
         if (havePosition)
           return PR_FALSE;
         havePosition = PR_TRUE;
-        if (!ParseBoxPositionValues(aItem.mPosition)) {
+        if (!ParseBoxPositionValues(aItem.mPosition, PR_FALSE)) {
           return PR_FALSE;
         }
 #if 0
@@ -6202,7 +6388,9 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
         aItem.mLastItem = PR_TRUE;
       }
     } else if (eCSSToken_Function == tt &&
-               mToken.mIdent.LowerCaseEqualsLiteral("url")) {
+               (mToken.mIdent.LowerCaseEqualsLiteral("url") ||
+                mToken.mIdent.LowerCaseEqualsLiteral("-moz-linear-gradient") ||
+                mToken.mIdent.LowerCaseEqualsLiteral("-moz-radial-gradient"))) {
       if (haveImage)
         return PR_FALSE;
       haveImage = PR_TRUE;
@@ -6214,7 +6402,7 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
       if (havePosition)
         return PR_FALSE;
       havePosition = PR_TRUE;
-      if (!ParseBoxPositionValues(aItem.mPosition)) {
+      if (!ParseBoxPositionValues(aItem.mPosition, PR_FALSE)) {
         return PR_FALSE;
       }
     } else {
@@ -6285,15 +6473,11 @@ CSSParserImpl::ParseBackgroundPosition()
   nsCSSValuePair valuePair;
   nsCSSValuePairList *head = nsnull, **tail = &head;
   for (;;) {
-    if (!ParseBoxPositionValues(valuePair)) {
+    if (!ParseBoxPositionValues(valuePair, !head)) {
       break;
     }
     PRBool inheritOrInitial = valuePair.mXValue.GetUnit() == eCSSUnit_Inherit ||
                               valuePair.mXValue.GetUnit() == eCSSUnit_Initial;
-    if (inheritOrInitial && head) {
-      // inherit and initial are only allowed on their own
-      break;
-    }
     nsCSSValuePairList *item = new nsCSSValuePairList;
     if (!item) {
       mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
@@ -6323,14 +6507,17 @@ CSSParserImpl::ParseBackgroundPosition()
  * like "top," "left center," etc.
  *
  * @param aOut The nsCSSValuePair in which to place the result.
+ * @param aAcceptsInherit If true, 'inherit' and 'initial' are legal values
  * @return Whether or not the operation succeeded.
  */
-PRBool CSSParserImpl::ParseBoxPositionValues(nsCSSValuePair &aOut)
+PRBool CSSParserImpl::ParseBoxPositionValues(nsCSSValuePair &aOut,
+                                             PRBool aAcceptsInherit)
 {
   // First try a percentage or a length value
   nsCSSValue &xValue = aOut.mXValue,
              &yValue = aOut.mYValue;
-  if (ParseVariant(xValue, VARIANT_HLP, nsnull)) {
+  PRInt32 variantMask = aAcceptsInherit ? VARIANT_HLP : VARIANT_LP;
+  if (ParseVariant(xValue, variantMask, nsnull)) {
     if (eCSSUnit_Inherit == xValue.GetUnit() ||
         eCSSUnit_Initial == xValue.GetUnit()) {  // both are inherited or both are set to initial
       yValue = xValue;
@@ -7585,7 +7772,7 @@ PRBool CSSParserImpl::ParseMozTransform()
 PRBool CSSParserImpl::ParseMozTransformOrigin()
 {
   /* Read in a box position, fail if we can't. */
-  if (!ParseBoxPositionValues(mTempData.mDisplay.mTransformOrigin) ||
+  if (!ParseBoxPositionValues(mTempData.mDisplay.mTransformOrigin, PR_TRUE) ||
       !ExpectEndProperty())
     return PR_FALSE;
 
diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp
index 5257821a18f..cfcfc6edc96 100644
--- a/layout/style/nsCSSValue.cpp
+++ b/layout/style/nsCSSValue.cpp
@@ -124,6 +124,13 @@ nsCSSValue::nsCSSValue(nsCSSValue::Image* aValue)
   mValue.mImage->AddRef();
 }
 
+nsCSSValue::nsCSSValue(nsCSSValueGradient* aValue)
+  : mUnit(eCSSUnit_Gradient)
+{
+  mValue.mGradient = aValue;
+  mValue.mGradient->AddRef();
+}
+
 nsCSSValue::nsCSSValue(const nsCSSValue& aCopy)
   : mUnit(aCopy.mUnit)
 {
@@ -155,6 +162,10 @@ nsCSSValue::nsCSSValue(const nsCSSValue& aCopy)
     mValue.mImage = aCopy.mValue.mImage;
     mValue.mImage->AddRef();
   }
+  else if (eCSSUnit_Gradient == mUnit) {
+    mValue.mGradient = aCopy.mValue.mGradient;
+    mValue.mGradient->AddRef();
+  }
   else {
     NS_NOTREACHED("unknown unit");
   }
@@ -194,6 +205,9 @@ PRBool nsCSSValue::operator==(const nsCSSValue& aOther) const
     else if (eCSSUnit_Image == mUnit) {
       return *mValue.mImage == *aOther.mValue.mImage;
     }
+    else if (eCSSUnit_Gradient == mUnit) {
+      return *mValue.mGradient == *aOther.mValue.mGradient;
+    }
     else {
       return mValue.mFloat == aOther.mValue.mFloat;
     }
@@ -243,6 +257,8 @@ void nsCSSValue::DoReset()
     mValue.mURL->Release();
   } else if (eCSSUnit_Image == mUnit) {
     mValue.mImage->Release();
+  } else if (eCSSUnit_Gradient == mUnit) {
+    mValue.mGradient->Release();
   }
   mUnit = eCSSUnit_Null;
 }
@@ -326,6 +342,14 @@ void nsCSSValue::SetImageValue(nsCSSValue::Image* aValue)
   mValue.mImage->AddRef();
 }
 
+void nsCSSValue::SetGradientValue(nsCSSValueGradient* aValue)
+{
+  Reset();
+  mUnit = eCSSUnit_Gradient;
+  mValue.mGradient = aValue;
+  mValue.mGradient->AddRef();
+}
+
 void nsCSSValue::SetAutoValue()
 {
   Reset();
@@ -439,15 +463,12 @@ nsCSSValue::URL::URL(nsIURI* aURI, nsStringBuffer* aString, nsIURI* aReferrer,
     mRefCnt(0)
 {
   NS_PRECONDITION(aOriginPrincipal, "Must have an origin principal");
-  
   mString->AddRef();
-  MOZ_COUNT_CTOR(nsCSSValue::URL);
 }
 
 nsCSSValue::URL::~URL()
 {
   mString->Release();
-  MOZ_COUNT_DTOR(nsCSSValue::URL);
 }
 
 PRBool
@@ -485,8 +506,6 @@ nsCSSValue::Image::Image(nsIURI* aURI, nsStringBuffer* aString,
                          nsIDocument* aDocument)
   : URL(aURI, aString, aReferrer, aOriginPrincipal)
 {
-  MOZ_COUNT_CTOR(nsCSSValue::Image);
-
   if (mURI &&
       nsContentUtils::CanLoadImage(mURI, aDocument, aDocument,
                                    aOriginPrincipal)) {
@@ -498,5 +517,38 @@ nsCSSValue::Image::Image(nsIURI* aURI, nsStringBuffer* aString,
 
 nsCSSValue::Image::~Image()
 {
-  MOZ_COUNT_DTOR(nsCSSValue::Image);
+}
+
+nsCSSValueGradientStop::nsCSSValueGradientStop(const nsCSSValue& aLocation,
+                                               const nsCSSValue& aColor)
+  : mLocation(aLocation),
+    mColor(aColor)
+{ 
+  MOZ_COUNT_CTOR(nsCSSValueGradientStop);
+}
+
+nsCSSValueGradientStop::nsCSSValueGradientStop(const nsCSSValueGradientStop& aOther)
+  : mLocation(aOther.mLocation),
+    mColor(aOther.mColor)
+{ 
+  MOZ_COUNT_CTOR(nsCSSValueGradientStop);
+}
+
+nsCSSValueGradientStop::~nsCSSValueGradientStop()
+{
+  MOZ_COUNT_DTOR(nsCSSValueGradientStop);
+}
+
+nsCSSValueGradient::nsCSSValueGradient(PRBool aIsRadial, const nsCSSValue& aStartX,
+           const nsCSSValue& aStartY, const nsCSSValue& aStartRadius, const nsCSSValue& aEndX,
+           const nsCSSValue& aEndY, const nsCSSValue& aEndRadius)
+  : mIsRadial(aIsRadial),
+    mStartX(aStartX),
+    mStartY(aStartY),
+    mEndX(aEndX),
+    mEndY(aEndY),
+    mStartRadius(aStartRadius),
+    mEndRadius(aEndRadius),
+    mRefCnt(0)
+{ 
 }
diff --git a/layout/style/nsCSSValue.h b/layout/style/nsCSSValue.h
index 2c7673eb8cd..06728267e9e 100644
--- a/layout/style/nsCSSValue.h
+++ b/layout/style/nsCSSValue.h
@@ -49,6 +49,7 @@
 #include "nsAutoPtr.h"
 #include "nsCRTGlue.h"
 #include "nsStringBuffer.h"
+#include "nsTArray.h"
 
 class imgIRequest;
 class nsIDocument;
@@ -112,6 +113,7 @@ enum nsCSSUnit {
 
   eCSSUnit_URL          = 30,     // (nsCSSValue::URL*) value
   eCSSUnit_Image        = 31,     // (nsCSSValue::Image*) value
+  eCSSUnit_Gradient     = 32,     // (nsCSSValueGradient*) value
   eCSSUnit_Integer      = 50,     // (int) simple value
   eCSSUnit_Enumerated   = 51,     // (int) value has enumerated meaning
   eCSSUnit_EnumColor    = 80,     // (int) enumerated color (kColorKTable)
@@ -155,6 +157,8 @@ enum nsCSSUnit {
   eCSSUnit_Milliseconds = 3001     // (float) 1/1000 second
 };
 
+struct nsCSSValueGradient;
+
 class nsCSSValue {
 public:
   struct Array;
@@ -180,6 +184,7 @@ public:
   nsCSSValue(Array* aArray, nsCSSUnit aUnit) NS_HIDDEN;
   explicit nsCSSValue(URL* aValue) NS_HIDDEN;
   explicit nsCSSValue(Image* aValue) NS_HIDDEN;
+  explicit nsCSSValue(nsCSSValueGradient* aValue) NS_HIDDEN;
   nsCSSValue(const nsCSSValue& aCopy) NS_HIDDEN;
   ~nsCSSValue() { Reset(); }
 
@@ -266,6 +271,12 @@ public:
       mValue.mURL->mURI : mValue.mImage->mURI;
   }
 
+  nsCSSValueGradient* GetGradientValue() const
+  {
+    NS_ASSERTION(mUnit == eCSSUnit_Gradient, "not a gradient value");
+    return mValue.mGradient;
+  }
+
   URL* GetURLStructValue() const
   {
     // Not allowing this for Image values, because if the caller takes
@@ -307,6 +318,7 @@ public:
   NS_HIDDEN_(void)  SetArrayValue(nsCSSValue::Array* aArray, nsCSSUnit aUnit);
   NS_HIDDEN_(void)  SetURLValue(nsCSSValue::URL* aURI);
   NS_HIDDEN_(void)  SetImageValue(nsCSSValue::Image* aImage);
+  NS_HIDDEN_(void)  SetGradientValue(nsCSSValueGradient* aGradient);
   NS_HIDDEN_(void)  SetAutoValue();
   NS_HIDDEN_(void)  SetInheritValue();
   NS_HIDDEN_(void)  SetInitialValue();
@@ -355,17 +367,24 @@ public:
         return;
       }
       ++mRefCnt;
+      NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::URL", sizeof(*this));
     }
     void Release() {
       if (mRefCnt == PR_UINT32_MAX) {
         NS_WARNING("refcount overflow, leaking nsCSSValue::URL");
         return;
       }
-      if (--mRefCnt == 0)
+      --mRefCnt;
+      NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::URL");
+      if (mRefCnt == 0)
         delete this;
     }
   protected:
     nsrefcnt mRefCnt;
+
+    // not to be implemented
+    URL(const URL& aOther);
+    URL& operator=(const URL& aOther);
   };
 
   struct Image : public URL {
@@ -381,13 +400,25 @@ public:
 
     nsCOMPtr<imgIRequest> mRequest; // null == image load blocked or somehow failed
 
-    // Override Release so we delete correctly without a virtual destructor
+    // Override AddRef and Release to not only log ourselves correctly, but
+    // also so that we delete correctly without a virtual destructor
+    void AddRef() {
+      if (mRefCnt == PR_UINT32_MAX) {
+        NS_WARNING("refcount overflow, leaking nsCSSValue::Image");
+        return;
+      }
+      ++mRefCnt;
+      NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Image", sizeof(*this));
+    }
+
     void Release() {
       if (mRefCnt == PR_UINT32_MAX) {
         NS_WARNING("refcount overflow, leaking nsCSSValue::Image");
         return;
       }
-      if (--mRefCnt == 0)
+      --mRefCnt;
+      NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Image");
+      if (mRefCnt == 0)
         delete this;
     }
   };
@@ -409,9 +440,105 @@ protected:
     Array*     mArray;
     URL*       mURL;
     Image*     mImage;
+    nsCSSValueGradient* mGradient;
   }         mValue;
 };
 
+struct nsCSSValueGradientStop {
+public:
+  nsCSSValueGradientStop(const nsCSSValue& aLocation, const nsCSSValue& aColor) NS_HIDDEN;
+  // needed to keep bloat logs happy when we use the nsTArray in nsCSSValueGradient
+  nsCSSValueGradientStop(const nsCSSValueGradientStop& aOther) NS_HIDDEN;
+  ~nsCSSValueGradientStop() NS_HIDDEN;
+
+  nsCSSValue mLocation;
+  nsCSSValue mColor;
+
+  PRBool operator==(const nsCSSValueGradientStop& aOther) const
+  {
+    return (mLocation == aOther.mLocation &&
+            mColor == aOther.mColor);
+  }
+
+  PRBool operator!=(const nsCSSValueGradientStop& aOther) const
+  {
+    return !(*this == aOther);
+  }
+};
+
+struct nsCSSValueGradient {
+  nsCSSValueGradient(PRBool aIsRadial, const nsCSSValue& aStartX, const nsCSSValue& aStartY,
+           const nsCSSValue& aStartRadius, const nsCSSValue& aEndX, const nsCSSValue& aEndY,
+           const nsCSSValue& aEndRadius) NS_HIDDEN;
+
+  // true if gradient is radial, false if it is linear
+  PRPackedBool mIsRadial;
+  nsCSSValue mStartX;
+  nsCSSValue mStartY;
+
+  nsCSSValue mEndX;
+  nsCSSValue mEndY;
+
+  // Only meaningful if mIsRadial is true
+  nsCSSValue mStartRadius;
+  nsCSSValue mEndRadius;
+
+  nsTArray<nsCSSValueGradientStop> mStops;
+
+  PRBool operator==(const nsCSSValueGradient& aOther) const
+  {
+    if (mIsRadial != aOther.mIsRadial ||
+        mStartX != aOther.mStartX ||
+        mStartY != aOther.mStartY ||
+        mStartRadius != aOther.mStartRadius ||
+        mEndX != aOther.mEndX ||
+        mEndY != aOther.mEndY ||
+        mEndRadius != aOther.mEndRadius)
+      return PR_FALSE;
+
+    if (mStops.Length() != aOther.mStops.Length())
+      return PR_FALSE;
+
+    for (PRUint32 i = 0; i < mStops.Length(); i++) {
+      if (mStops[i] != aOther.mStops[i])
+        return PR_FALSE;
+    }
+
+    return PR_TRUE;
+  }
+
+  PRBool operator!=(const nsCSSValueGradient& aOther) const
+  {
+    return !(*this == aOther);
+  }
+
+  void AddRef() {
+    if (mRefCnt == PR_UINT32_MAX) {
+      NS_WARNING("refcount overflow, leaking nsCSSValue::Gradient");
+      return;
+    }
+    ++mRefCnt;
+    NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Gradient", sizeof(*this));
+  }
+  void Release() {
+    if (mRefCnt == PR_UINT32_MAX) {
+      NS_WARNING("refcount overflow, leaking nsCSSValue::Gradient");
+      return;
+    }
+    --mRefCnt;
+    NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Gradient");
+    if (mRefCnt == 0)
+      delete this;
+  }
+
+private:
+  nsrefcnt mRefCnt;
+
+  // not to be implemented
+  nsCSSValueGradient(const nsCSSValueGradient& aOther);
+  nsCSSValueGradient& operator=(const nsCSSValueGradient& aOther);
+};
+
 struct nsCSSValue::Array {
 
   // return |Array| with reference count of zero
@@ -508,7 +635,9 @@ private:
 #undef CSSVALUE_LIST_FOR_EXTRA_VALUES
 
 private:
-  Array(const Array& aOther); // not to be implemented
+  // not to be implemented
+  Array(const Array& aOther);
+  Array& operator=(const Array& aOther);
 };
 
 #endif /* nsCSSValue_h___ */
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index c299ffa80d5..aa765b863e1 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -1250,6 +1250,97 @@ nsComputedDOMStyle::GetBackgroundColor(nsIDOMCSSValue** aValue)
   return CallQueryInterface(val, aValue);
 }
 
+static void
+AppendCSSGradientLength(const nsStyleCoord& aValue,
+                        nsROCSSPrimitiveValue* aPrimitive,
+                        nsAString& aString)
+{
+  nsAutoString tokenString;
+  if (aValue.GetUnit() == eStyleUnit_Coord)
+    aPrimitive->SetAppUnits(aValue.GetCoordValue());
+  else
+    aPrimitive->SetPercent(aValue.GetPercentValue());
+  aPrimitive->GetCssText(tokenString);
+  aString.Append(tokenString);
+}
+
+static void
+AppendCSSGradientRadius(const nscoord aValue,
+                        nsROCSSPrimitiveValue* aPrimitive,
+                        nsAString& aString)
+{
+  nsAutoString tokenString;
+  aPrimitive->SetAppUnits(aValue);
+  aPrimitive->GetCssText(tokenString);
+  aString.Append(tokenString);
+}
+
+nsresult
+nsComputedDOMStyle::GetCSSGradientString(const nsStyleGradient* aGradient,
+                                         nsAString& aString)
+{
+  if (aGradient->mIsRadial)
+    aString.AssignLiteral("-moz-radial-gradient(");
+  else
+    aString.AssignLiteral("-moz-linear-gradient(");
+
+  nsROCSSPrimitiveValue *tmpVal = GetROCSSPrimitiveValue();
+  if (!tmpVal)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  // starting X position
+  AppendCSSGradientLength(aGradient->mStartX, tmpVal, aString);
+  aString.AppendLiteral(" ");
+
+  // starting Y position
+  AppendCSSGradientLength(aGradient->mStartY, tmpVal, aString);
+  aString.AppendLiteral(", ");
+
+  // starting radius
+  if (aGradient->mIsRadial) {
+    AppendCSSGradientRadius(aGradient->mStartRadius, tmpVal, aString);
+    aString.AppendLiteral(", ");
+  }
+
+  // ending X position
+  AppendCSSGradientLength(aGradient->mEndX, tmpVal, aString);
+  aString.AppendLiteral(" ");
+
+  // ending Y position
+  AppendCSSGradientLength(aGradient->mEndY, tmpVal, aString);
+
+  // ending radius
+  if (aGradient->mIsRadial) {
+    aString.AppendLiteral(", ");
+    AppendCSSGradientRadius(aGradient->mStartRadius, tmpVal, aString);
+  }
+
+  // color stops
+  for (PRUint32 i = 0; i < aGradient->mStops.Length(); ++i) {
+    nsAutoString tokenString;
+    aString.AppendLiteral(", color-stop(");
+
+    tmpVal->SetPercent(aGradient->mStops[i].mPosition);
+    tmpVal->GetCssText(tokenString);
+    aString.Append(tokenString);
+    aString.AppendLiteral(", ");
+
+    nsresult rv = SetToRGBAColor(tmpVal, aGradient->mStops[i].mColor);
+    if (NS_FAILED(rv)) {
+      delete tmpVal;
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    tmpVal->GetCssText(tokenString);
+    aString.Append(tokenString);
+    aString.AppendLiteral(")");
+  }
+
+  delete tmpVal;
+  aString.AppendLiteral(")");
+  return NS_OK;
+}
+
 nsresult
 nsComputedDOMStyle::GetBackgroundImage(nsIDOMCSSValue** aValue)
 {
@@ -1266,13 +1357,27 @@ nsComputedDOMStyle::GetBackgroundImage(nsIDOMCSSValue** aValue)
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    imgIRequest *image = bg->mLayers[i].mImage;
-    if (!image) {
-      val->SetIdent(eCSSKeyword_none);
+    const nsStyleBackground::Image &image = bg->mLayers[i].mImage;
+    if (image.GetType() == eBackgroundImage_Image) {
+      imgIRequest *req = image.GetImageData();
+      if (!req) {
+        val->SetIdent(eCSSKeyword_none);
+      } else {
+        nsCOMPtr<nsIURI> uri;
+        req->GetURI(getter_AddRefs(uri));
+        val->SetURI(uri);
+      }
+    } else if (image.GetType() == eBackgroundImage_Gradient) {
+      nsAutoString gradientString;
+      nsresult rv = GetCSSGradientString(image.GetGradientData(),
+                                         gradientString);
+      if (NS_FAILED(rv)) {
+        delete valueList;
+        return rv;
+      }
+      val->SetString(gradientString);
     } else {
-      nsCOMPtr<nsIURI> uri;
-      image->GetURI(getter_AddRefs(uri));
-      val->SetURI(uri);
+      val->SetIdent(eCSSKeyword_none);
     }
   }
 
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 7e8bf8fc710..5ecc5ce249a 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -131,6 +131,9 @@ private:
                              const PRInt32 aTable[],
                              nsIDOMCSSValue** aResult);
 
+  nsresult GetCSSGradientString(const nsStyleGradient* aGradient,
+                                nsAString& aString);
+
   /* Properties Queryable as CSSValues */
 
   nsresult GetAppearance(nsIDOMCSSValue** aValue);
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index c6f49c85094..d5d3252c036 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -480,6 +480,81 @@ static PRBool SetColor(const nsCSSValue& aValue, const nscolor aParentColor,
   return result;
 }
 
+static void SetGradientCoord(const nsCSSValue& aValue, nsPresContext* aPresContext,
+                             nsStyleContext* aContext, nsStyleCoord& aResult,
+                             PRBool& aCanStoreInRuleTree)
+{
+  // If coordinate is an enumerated type, handle it explicitly.
+  if (aValue.GetUnit() == eCSSUnit_Enumerated) {
+    aResult.SetPercentValue(GetFloatFromBoxPosition(aValue.GetIntValue()));
+    return;
+  }
+
+  // OK to pass bad aParentCoord since we're not passing SETCOORD_INHERIT
+  PRBool result = SetCoord(aValue, aResult, nsStyleCoord(), SETCOORD_LP,
+                           aContext, aPresContext, aCanStoreInRuleTree);
+  NS_ABORT_IF_FALSE(result, "Incorrect data structure created by parsing code");
+}
+
+static void SetGradient(const nsCSSValue& aValue, nsPresContext* aPresContext,
+                        nsStyleContext* aContext, nsStyleGradient& aResult,
+                        PRBool& aCanStoreInRuleTree)
+{
+  NS_ABORT_IF_FALSE(aValue.GetUnit() == eCSSUnit_Gradient,
+                    "The given data is not a gradient");
+
+  nsCSSValueGradient* gradient = aValue.GetGradientValue();
+  aResult.mIsRadial = gradient->mIsRadial;
+
+  // start values
+  SetGradientCoord(gradient->mStartX, aPresContext, aContext,
+                   aResult.mStartX, aCanStoreInRuleTree);
+
+  SetGradientCoord(gradient->mStartY, aPresContext, aContext,
+                   aResult.mStartY, aCanStoreInRuleTree);
+
+  if (gradient->mIsRadial) {
+    NS_ABORT_IF_FALSE(gradient->mStartRadius.IsLengthUnit(),
+                      "Incorrect data structure created by parsing code");
+    aResult.mStartRadius = CalcLength(gradient->mStartRadius, aContext,
+                                      aPresContext, aCanStoreInRuleTree);
+  }
+
+  // end values
+  SetGradientCoord(gradient->mEndX, aPresContext, aContext,
+                   aResult.mEndX, aCanStoreInRuleTree);
+
+  SetGradientCoord(gradient->mEndY, aPresContext, aContext,
+                   aResult.mEndY, aCanStoreInRuleTree);
+
+  if (gradient->mIsRadial) {
+    NS_ABORT_IF_FALSE(gradient->mEndRadius.IsLengthUnit(),
+                      "Incorrect data structure created by parsing code");
+    aResult.mEndRadius = CalcLength(gradient->mEndRadius, aContext,
+                                    aPresContext, aCanStoreInRuleTree);
+  }
+
+  // stops
+  for (PRUint32 i = 0; i < gradient->mStops.Length(); i++) {
+    nsStyleGradientStop stop;
+    nsCSSValueGradientStop &valueStop = gradient->mStops[i];
+
+    if (valueStop.mLocation.GetUnit() == eCSSUnit_Percent)
+      stop.mPosition = valueStop.mLocation.GetPercentValue();
+    else
+      stop.mPosition = valueStop.mLocation.GetFloatValue();
+
+    // inherit is not a valid color for stops, so we pass in a dummy
+    // parent color
+    NS_ASSERTION(valueStop.mColor.GetUnit() != eCSSUnit_Inherit,
+                 "inherit is not a valid color for gradient stops");
+    SetColor(valueStop.mColor, NS_RGB(0, 0, 0), aPresContext,
+             aContext, stop.mColor, aCanStoreInRuleTree);
+
+    aResult.mStops.AppendElement(stop);
+  }
+}
+
 // flags for SetDiscrete - align values with SETCOORD_* constants
 // where possible
 
@@ -3812,20 +3887,30 @@ struct BackgroundItemComputer<nsCSSValueList, PRUint8>
 };
 
 NS_SPECIALIZE_TEMPLATE
-struct BackgroundItemComputer<nsCSSValueList, nsCOMPtr<imgIRequest> >
+struct BackgroundItemComputer<nsCSSValueList, nsStyleBackground::Image>
 {
   static void ComputeValue(nsStyleContext* aStyleContext,
                            const nsCSSValueList* aSpecifiedValue,
-                           nsCOMPtr<imgIRequest>& aComputedValue,
+                           nsStyleBackground::Image& aComputedValue,
                            PRBool& aCanStoreInRuleTree)
   {
     const nsCSSValue &value = aSpecifiedValue->mValue;
     if (eCSSUnit_Image == value.GetUnit()) {
-      aComputedValue = value.GetImageValue();
+      aComputedValue.SetImageData(value.GetImageValue());
+    }
+    else if (eCSSUnit_Gradient == value.GetUnit()) {
+      nsStyleGradient* gradient = new nsStyleGradient();
+      if (gradient) {
+        SetGradient(value, aStyleContext->PresContext(), aStyleContext,
+                    *gradient, aCanStoreInRuleTree);
+        aComputedValue.SetGradientData(gradient);
+      } else {
+        aComputedValue.SetNull();
+      }
     }
     else {
       NS_ASSERTION(eCSSUnit_None == value.GetUnit(), "unexpected unit");
-      aComputedValue = nsnull;
+      aComputedValue.SetNull();
     }
   }
 };
@@ -4065,10 +4150,11 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct,
   PRBool rebuild = PR_FALSE;
 
   // background-image: url (stored as image), none, inherit [list]
+  nsStyleBackground::Image initialImage;
   SetBackgroundList(aContext, colorData.mBackImage, bg->mLayers,
                     parentBG->mLayers, &nsStyleBackground::Layer::mImage,
-                    nsCOMPtr<imgIRequest>(nsnull), parentBG->mImageCount,
-                    bg->mImageCount, maxItemCount, rebuild, canStoreInRuleTree);
+                    initialImage, parentBG->mImageCount, bg->mImageCount,
+                    maxItemCount, rebuild, canStoreInRuleTree);
 
   // background-repeat: enum, inherit, initial [list]
   SetBackgroundList(aContext, colorData.mBackRepeat, bg->mLayers,
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 55e97e4dfd7..664937104a6 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1206,6 +1206,51 @@ nsChangeHint nsStyleColor::MaxDifference()
 }
 #endif
 
+// --------------------
+// nsStyleGradient
+//
+PRBool
+nsStyleGradient::operator==(const nsStyleGradient& aOther) const
+{
+  NS_ABORT_IF_FALSE(mIsRadial || (mStartRadius == 0 && mEndRadius == 0),
+                    "incorrect unused radius values");
+  NS_ABORT_IF_FALSE(aOther.mIsRadial ||
+                    (aOther.mStartRadius == 0 && aOther.mEndRadius == 0),
+                    "incorrect unused radius values");
+
+  if (mIsRadial != aOther.mIsRadial ||
+      mStartX != aOther.mStartX ||
+      mStartY != aOther.mStartY ||
+      mStartRadius != aOther.mStartRadius ||
+      mEndX != aOther.mEndX ||
+      mEndY != aOther.mEndY ||
+      mEndRadius != aOther.mEndRadius)
+    return PR_FALSE;
+
+  if (mStops.Length() != aOther.mStops.Length())
+    return PR_FALSE;
+
+  for (PRUint32 i = 0; i < mStops.Length(); i++) {
+    if (mStops[i].mPosition != aOther.mStops[i].mPosition ||
+        mStops[i].mColor != aOther.mStops[i].mColor)
+      return PR_FALSE;
+  }
+
+  return PR_TRUE;
+}
+
+nsStyleGradient::nsStyleGradient(void)
+  : mIsRadial(PR_FALSE)
+  , mStartRadius(0)
+  , mEndRadius(0)
+  , mRefCnt(0)
+{
+  mStartX.SetCoordValue(0);
+  mStartY.SetCoordValue(0);
+  mEndX.SetCoordValue(0);
+  mEndY.SetCoordValue(0);
+}
+
 // --------------------
 // nsStyleBackground
 //
@@ -1284,7 +1329,8 @@ PRBool nsStyleBackground::HasFixedBackground() const
 {
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, this) {
     const Layer &layer = mLayers[i];
-    if (layer.mAttachment == NS_STYLE_BG_ATTACHMENT_FIXED && layer.mImage) {
+    if (layer.mAttachment == NS_STYLE_BG_ATTACHMENT_FIXED &&
+        layer.mImage.GetType() != eBackgroundImage_Null) {
       return PR_TRUE;
     }
   }
@@ -1293,7 +1339,8 @@ PRBool nsStyleBackground::HasFixedBackground() const
 
 PRBool nsStyleBackground::IsTransparent() const
 {
-  return !BottomLayer().mImage && mImageCount == 1 &&
+  return BottomLayer().mImage.GetType() == eBackgroundImage_Null &&
+         mImageCount == 1 &&
          NS_GET_A(mBackgroundColor) == 0;
 }
 
@@ -1363,7 +1410,7 @@ nsStyleBackground::Layer::SetInitialValues()
   mRepeat = NS_STYLE_BG_REPEAT_XY;
   mPosition.SetInitialValues();
   mSize.SetInitialValues();
-  mImage = nsnull;
+  mImage.SetNull();
 }
 
 PRBool nsStyleBackground::Layer::operator==(const Layer& aOther) const
@@ -1374,7 +1421,99 @@ PRBool nsStyleBackground::Layer::operator==(const Layer& aOther) const
          mRepeat == aOther.mRepeat &&
          mPosition == aOther.mPosition &&
          mSize == aOther.mSize &&
-         EqualImages(mImage, aOther.mImage);
+         mImage == aOther.mImage;
+}
+
+nsStyleBackground::Image::Image()
+{
+  MOZ_COUNT_CTOR(nsStyleBackground::Image);
+  mType = eBackgroundImage_Null;
+}
+
+nsStyleBackground::Image::~Image()
+{
+  MOZ_COUNT_DTOR(nsStyleBackground::Image);
+  if (mType != eBackgroundImage_Null)
+    SetNull();
+}
+
+nsStyleBackground::Image::Image(const nsStyleBackground::Image& aOther)
+{
+  // We need our own copy constructor because we don't want
+  // to copy the reference count
+  MOZ_COUNT_CTOR(nsStyleBackground::Image);
+  mType = eBackgroundImage_Null;
+  DoCopy(aOther);
+}
+
+nsStyleBackground::Image&
+nsStyleBackground::Image::operator=(const nsStyleBackground::Image& aOther)
+{
+  if (this != &aOther)
+    DoCopy(aOther);
+
+  return *this;
+}
+
+void nsStyleBackground::Image::DoCopy(const nsStyleBackground::Image& aOther)
+{
+  SetNull();
+
+  if (aOther.mType == eBackgroundImage_Image)
+    SetImageData(aOther.mImage);
+  else if (aOther.mType == eBackgroundImage_Gradient)
+    SetGradientData(aOther.mGradient);
+}
+
+void nsStyleBackground::Image::SetImageData(imgIRequest* aImage)
+{
+  NS_IF_ADDREF(aImage);
+
+  if (mType != eBackgroundImage_Null)
+    SetNull();
+
+  if (aImage) {
+    mImage = aImage;
+    mType = eBackgroundImage_Image;
+  }
+}
+
+void nsStyleBackground::Image::SetGradientData(nsStyleGradient* aGradient)
+{
+  if (aGradient)
+    aGradient->AddRef();
+
+  if (mType != eBackgroundImage_Null)
+    SetNull();
+
+  if (aGradient) {
+    mGradient = aGradient;
+    mType = eBackgroundImage_Gradient;
+  }
+}
+
+void nsStyleBackground::Image::SetNull()
+{
+  if (mType == eBackgroundImage_Gradient)
+    mGradient->Release();
+  else if (mType == eBackgroundImage_Image)
+    NS_RELEASE(mImage);
+
+  mType = eBackgroundImage_Null;
+}
+
+PRBool nsStyleBackground::Image::operator==(const Image& aOther) const
+{
+  if (mType != aOther.mType)
+    return PR_FALSE;
+
+  if (mType == eBackgroundImage_Image)
+    return EqualImages(mImage, aOther.mImage);
+
+  if (mType == eBackgroundImage_Gradient)
+    return *mGradient == *aOther.mGradient;
+
+  return PR_TRUE;
 }
 
 // --------------------
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index c8fff5e98ee..e1189bb5379 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -124,6 +124,68 @@ struct nsStyleFont {
 #endif
 };
 
+struct nsStyleGradientStop {
+  nscolor mColor;
+  float mPosition; // 0.0 - 1.0
+};
+
+class nsStyleGradient {
+public:
+  nsStyleGradient();
+
+  PRPackedBool mIsRadial;
+
+  nsStyleCoord mStartX; // percent or coord
+  nsStyleCoord mStartY; // percent or coord
+
+  nsStyleCoord mEndX; // percent or coord
+  nsStyleCoord mEndY; // percent or coord
+
+  nscoord mStartRadius;
+  nscoord mEndRadius;
+
+  // stops are in the order specified in the stylesheet
+  nsTArray<nsStyleGradientStop> mStops;
+
+  nsrefcnt AddRef() {
+    if (mRefCnt == PR_UINT32_MAX) {
+      NS_WARNING("refcount overflow, leaking nsStyleGradient");
+      return mRefCnt;
+    }
+    ++mRefCnt;
+    NS_LOG_ADDREF(this, mRefCnt, "nsStyleGradient", sizeof(*this));
+    return mRefCnt;
+  }
+
+  nsrefcnt Release() {
+    if (mRefCnt == PR_UINT32_MAX) {
+      NS_WARNING("refcount overflow, leaking nsStyleGradient");
+      return mRefCnt;
+    }
+    --mRefCnt;
+    NS_LOG_RELEASE(this, mRefCnt, "nsStyleGradient");
+    if (mRefCnt == 0) {
+      delete this;
+      return 0;
+    }
+    return mRefCnt;
+  }
+
+  PRBool operator==(const nsStyleGradient& aOther) const;
+  PRBool operator!=(const nsStyleGradient& aOther) const {
+    return !(*this == aOther);
+  };
+
+private:
+  nsrefcnt mRefCnt;
+
+  ~nsStyleGradient() {}
+
+  // Not to be implemented
+  nsStyleGradient(const nsStyleGradient& aOther);
+  nsStyleGradient& operator=(const nsStyleGradient& aOther);
+};
+
 struct nsStyleColor {
   nsStyleColor(nsPresContext* aPresContext);
   nsStyleColor(const nsStyleColor& aOther);
@@ -147,6 +209,12 @@ struct nsStyleColor {
   nscolor mColor;                 // [inherited]
 };
 
+enum nsStyleBackgroundImageType {
+  eBackgroundImage_Null,
+  eBackgroundImage_Image,
+  eBackgroundImage_Gradient
+};
+
 struct nsStyleBackground {
   nsStyleBackground();
   nsStyleBackground(const nsStyleBackground& aOther);
@@ -228,6 +296,46 @@ struct nsStyleBackground {
     }
   };
 
+  struct Image;
+  friend struct Image;
+  struct Image {
+  public:
+    Image();
+    ~Image();
+    Image(const Image& aOther);
+    Image& operator=(const Image& aOther);
+
+    void SetImageData(imgIRequest* aImage);
+    void SetGradientData(nsStyleGradient* aGradient);
+    void SetNull();
+
+    nsStyleBackgroundImageType GetType() const {
+      return mType;
+    };
+    imgIRequest* GetImageData() const {
+      NS_ASSERTION(mType == eBackgroundImage_Image, "Data is not an image!");
+      return mImage;
+    };
+    nsStyleGradient* GetGradientData() const {
+      NS_ASSERTION(mType == eBackgroundImage_Gradient, "Data is not a gradient!");
+      return mGradient;
+    };
+
+    PRBool operator==(const Image& aOther) const;
+    PRBool operator!=(const Image& aOther) const {
+      return !(*this == aOther);
+    }
+
+  private:
+    void DoCopy(const Image& aOther);
+
+    nsStyleBackgroundImageType mType;
+    union {
+      imgIRequest* mImage;
+      nsStyleGradient* mGradient;
+    };
+  };
+
   struct Layer;
   friend struct Layer;
   struct Layer {
@@ -236,7 +344,7 @@ struct nsStyleBackground {
     PRUint8 mOrigin;                    // [reset] See nsStyleConsts.h
     PRUint8 mRepeat;                    // [reset] See nsStyleConsts.h
     Position mPosition;                 // [reset]
-    nsCOMPtr<imgIRequest> mImage;       // [reset]
+    Image mImage;                       // [reset]
     Size mSize;                         // [reset]
 
     // Initializes only mImage
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 420b0955676..a9fe6599e84 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -625,7 +625,7 @@ var gCSSProperties = {
 		initial_values: [ "transparent", "none", "repeat", "scroll", "0% 0%", "top left", "left top", "transparent none", "top left none", "left top none", "none left top", "none top left", "none 0% 0%", "transparent none repeat scroll top left", "left top repeat none scroll transparent" ],
 		other_values: [
 		        /* without multiple backgrounds */
-		        "green", "none green repeat scroll left top", "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)", "repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') transparent left top scroll", "repeat-x", "repeat-y", "no-repeat", "none repeat-y transparent scroll 0% 0%", "fixed", "0% top transparent fixed repeat none", "top", "left", "50% 50%", "center", "bottom right scroll none transparent repeat", "50% transparent", "transparent 50%", "50%",
+		        "green", "none green repeat scroll left top", "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)", "repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') transparent left top scroll", "repeat-x", "repeat-y", "no-repeat", "none repeat-y transparent scroll 0% 0%", "fixed", "0% top transparent fixed repeat none", "top", "left", "50% 50%", "center", "bottom right scroll none transparent repeat", "50% transparent", "transparent 50%", "50%", "-moz-radial-gradient(10% bottom, 30px, 20px 20px, 10px, from(#ffffff), to(black)) scroll no-repeat", "-moz-linear-gradient(10px 10px, 20px 20px, from(red), to(blue)) repeat",
 		        /* multiple backgrounds */
 		        "url(404.png), url(404.png)",
 		        "url(404.png), url(404.png) transparent",
@@ -633,6 +633,7 @@ var gCSSProperties = {
 		        "repeat-x, fixed, none",
 		        "0% top url(404.png), url(404.png) 0% top",
 		        "fixed repeat-y top left url(404.png), repeat-x green",
+		        "url(404.png), -moz-linear-gradient(20px 20px, 30px 30px, from(blue), to(green)) black",
 		        /* test cases with clip+origin in the shorthand */
     // This is commented out for now until we change
     // -moz-background-clip to background-clip, -moz-background-origin
@@ -688,9 +689,30 @@ var gCSSProperties = {
 			"none, none, none, none, none",
 			"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), none",
 			"none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), none",
-			"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)"
+			"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==), url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)",
+
+            "-moz-radial-gradient(45px 60px, 10px, 52px 50px, 30px, from(red), color-stop(90%, #019f62), to(rgba(1, 159, 98, 0)))",
+            "-moz-linear-gradient(20% center, left bottom, color-stop(0, #ffff00), to(green))",
+            "-moz-radial-gradient(50% 50%, 60px, 10% 20%, 20px, to(red), from(pink), color-stop(0.94, goldenrod))",
+            "-moz-linear-gradient(20px 10px, 100px top, from(rgb(10, 100, 0)), color-stop(1, rgba(10, 20, 30, 0.4)))",
+            "-moz-radial-gradient(center top, 10px, right bottom, 20px, color-stop(0.7, green), color-stop(20%, #ccddee), from(rgb(1, 2, 3)), color-stop(0.95, #aa0012))",
+            "-moz-linear-gradient(10px 20%, -50px -10%, from(green))",
+            "-moz-linear-gradient(10px 10px, 20px 20px)",
+            "-moz-linear-gradient(10px 10px, 20px 20px, color-stop(314%, blue))",
+            "-moz-linear-gradient(10px 10px, 20px 20px, color-stop(-0.2, green))",
+            "-moz-linear-gradient( 10px  10px  , 40px 20px ,  from(blue)  )"
 		],
-		invalid_values: []
+		invalid_values: [ "-moz-linear-gradient(10px 10px, 20px, 30px 30px, 40px, from(blue), to(red))",
+                          "-moz-radial-gradient(20px 20px, 10px 10px, from(green), to(#ff00ff))",
+                          "-moz-radial-gradient(10px 10px, 20%, 40px 40px, 10px, from(green), to(#ff00ff))",
+                          "-moz-linear-gradient(10px, 20px, 30px, 40px, color-stop(0.5, #00ccff))",
+                          "-moz-linear-gradient(20px 20px, from(blue), to(red))",
+                          "-moz-linear-gradient(40px 40px, 10px 10px, from(blue) to(red) color-stop(10%, fuchsia))",
+                          "-moz-linear-gradient(20px 20px 30px, 10px 10px, from(red), to(#ff0000))",
+                          "-moz-radial-gradient(left top, center, 20px 20px, 10px, from(blue), to(red))",
+                          "-moz-linear-gradient(left left, top top, from(blue))",
+                          "-moz-linear-gradient(inherit, 10px 10px, from(blue))",
+                          "-moz-linear-gradient()" ]
 	},
 	"background-position": {
 		domProp: "backgroundPosition",
diff --git a/layout/tables/nsTablePainter.cpp b/layout/tables/nsTablePainter.cpp
index 8b1a4c2016f..b9d6b477110 100644
--- a/layout/tables/nsTablePainter.cpp
+++ b/layout/tables/nsTablePainter.cpp
@@ -202,7 +202,7 @@ TableBackgroundPainter::TableBackgroundData::ShouldSetBCBorder()
   }
 
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, mBackground) {
-    if (mBackground->mLayers[i].mImage)
+    if (mBackground->mLayers[i].mImage.GetType() != eBackgroundImage_Null)
       return PR_TRUE;
   }
   return PR_FALSE;
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 102e8a9c6c6..6e96ada345d 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -4118,7 +4118,7 @@ nsTreeBodyFrame::ScrollInternal(const ScrollParts& aParts, PRInt32 aRow)
   // See if we have a transparent background or a background image.  
   // If we do, then we cannot blit.
   const nsStyleBackground* background = GetStyleBackground();
-  if (background->BottomLayer().mImage ||
+  if (background->BottomLayer().mImage.GetType() != eBackgroundImage_Null ||
       background->mImageCount > 1 ||
       NS_GET_A(background->mBackgroundColor) < 255 ||
       PR_ABS(delta)*mRowHeight >= mRect.height) {
@@ -4175,7 +4175,7 @@ nsTreeBodyFrame::ScrollHorzInternal(const ScrollParts& aParts, PRInt32 aPosition
   // See if we have a transparent background or a background image.  
   // If we do, then we cannot blit.
   const nsStyleBackground* background = GetStyleBackground();
-  if (background->BottomLayer().mImage ||
+  if (background->BottomLayer().mImage.GetType() != eBackgroundImage_Null ||
       background->mImageCount > 1 ||
       NS_GET_A(background->mBackgroundColor) < 255 ||
       PR_ABS(delta) >= mRect.width) {

From d96f2e68bce91b7ba7b8037a5178212e9a9b9dba Mon Sep 17 00:00:00 2001
From: Graeme McCutcheon <graememcc_firefox@graeme-online.co.uk>
Date: Sat, 1 Aug 2009 17:16:03 +0100
Subject: [PATCH 143/175] Further tests for bug 451286, and tidy up the
 relevant file somewhat. r=mano

---
 .../content/tests/chrome/bug451286_window.xul | 64 ++++++++++++++-----
 1 file changed, 48 insertions(+), 16 deletions(-)

diff --git a/toolkit/content/tests/chrome/bug451286_window.xul b/toolkit/content/tests/chrome/bug451286_window.xul
index 390cf2b06e8..b05c3cdca16 100644
--- a/toolkit/content/tests/chrome/bug451286_window.xul
+++ b/toolkit/content/tests/chrome/bug451286_window.xul
@@ -50,6 +50,8 @@
     const Ci = Components.interfaces;
     const Cc = Components.classes;
     const Cr = Components.results;
+    const SEARCH_TEXT = "text";
+    const DATAURI = "data:text/html," + SEARCH_TEXT;
 
     var gFindBar = null;
     var gBrowser;
@@ -69,7 +71,17 @@
         gFindBar = document.getElementById("FindToolbar");
         gBrowser = document.getElementById("content");
         gBrowser.addEventListener("pageshow", onPageShow, false);
-        gBrowser.loadURI("data:text/html,text<iframe style='display: none;' src='data:text/html,text'></iframe>text<iframe id='if' src='data:text/html,text'></iframe>text");
+
+        // Bug 451286. An iframe that should be highlighted
+        var visible = "<iframe id='visible' src='" + DATAURI + "'></iframe>";
+
+        // Bug 493658. An invisible iframe that shouldn't interfere with
+        // highlighting matches lying after it in the document
+        var invisible = "<iframe id='invisible' style='display: none;' " +
+                        "src='" + DATAURI + "'></iframe>";
+
+        var uri = DATAURI + invisible + SEARCH_TEXT + visible + SEARCH_TEXT;
+        gBrowser.loadURI(uri);
       }
       let tm = Cc["@mozilla.org/thread-manager;1"].
                getService(Ci.nsIThreadManager);
@@ -80,9 +92,14 @@
 
     function onPageShow() {
       gBrowser.removeEventListener("pageshow", onPageShow, false);
+
+      // First, take a snapshot of the window without highlighting
+      // to be used later to test the unhighlighting case
+      var gWin = gBrowser.contentWindow;
+      var noHighlightSnapshot = snapshotWindow(gWin);
+
       gFindBar.open();
-      var search = "text";
-      gFindBar._findField.value = search;
+      gFindBar._findField.value = SEARCH_TEXT;
       var matchCase = gFindBar.getElement("find-case-sensitive");
       if (matchCase.checked)
         matchCase.doCommand();
@@ -91,21 +108,25 @@
       gFindBar.toggleHighlight(true);
       gFindBar.close();
     
-      // Take snapshot
-      var gWin = gBrowser.contentWindow;
+      // Take snapshot of highlighing
       var findSnapshot = snapshotWindow(gWin);
 
-      // Now, perform the same selections manually
+      // Now, remove the highlighting, and take a snapshot to compare
+      // to our original state
       gFindBar.open();
       gFindBar.toggleHighlight(false);
       gFindBar.close();
+      var unhighlightSnapshot = snapshotWindow(gWin);
 
+      // Select the matches that should have been highlighted manually
       var doc = gBrowser.contentDocument;
-      var iframe = doc.getElementById("if");
+
+      // Create a manual highlight in the visible iframe to test bug 451286
+      var iframe = doc.getElementById("visible");
       var ifBody = iframe.contentDocument.body;
       var range = iframe.contentDocument.createRange();
       range.selectNodeContents(ifBody.childNodes[0]);
-      var ifWindow = doc.getElementById("if").contentWindow;
+      var ifWindow = iframe.contentWindow;
       var ifDocShell = ifWindow.QueryInterface(Ci.nsIInterfaceRequestor)
                                .getInterface(Ci.nsIWebNavigation)
                                .QueryInterface(Ci.nsIDocShell);
@@ -114,10 +135,12 @@
                                    .getInterface(Ci.nsISelectionDisplay)
                                    .QueryInterface(Ci.nsISelectionController);
 
-      var findSelection = ifController.getSelection(ifController.SELECTION_FIND);
-      findSelection.addRange(range);
-
+      var frameFindSelection =
+        ifController.getSelection(ifController.SELECTION_FIND);
+      frameFindSelection.addRange(range);
 
+      // Create manual highlights in the main document (the matches that lie
+      // before/after the iframes
       var docShell = gWin.QueryInterface(Ci.nsIInterfaceRequestor)
                          .getInterface(Ci.nsIWebNavigation)
                           .QueryInterface(Ci.nsIDocShell);
@@ -126,21 +149,30 @@
                                .getInterface(Ci.nsISelectionDisplay)
                                .QueryInterface(Ci.nsISelectionController);
 
-      var findSelection2 = controller.getSelection(ifController.SELECTION_FIND);
+      var docFindSelection =
+        controller.getSelection(ifController.SELECTION_FIND);
+
       range = doc.createRange();
       range.selectNodeContents(doc.body.childNodes[0]);
-      findSelection2.addRange(range);
+      docFindSelection.addRange(range);
       range = doc.createRange();
       range.selectNodeContents(doc.body.childNodes[2]);
-      findSelection2.addRange(range);
+      docFindSelection.addRange(range);
       range = doc.createRange();
       range.selectNodeContents(doc.body.childNodes[4]);
-      findSelection2.addRange(range);
+      docFindSelection.addRange(range);
 
-      //Take snapshots
+      // Take snapshot of manual highlighting
       var manualSnapshot = snapshotWindow(gBrowser.contentWindow);
+
+      // Test 1: Were the matches in iframe correctly highlighted?
       var res = compareSnapshots(findSnapshot, manualSnapshot, true);
       ok(res[0], "Matches found in iframe correctly highlighted");
+
+      // Test 2: Were the matches in iframe correctly unhighlighted?
+      res = compareSnapshots(noHighlightSnapshot, unhighlightSnapshot, true);
+      ok(res[0], "Highlighting in iframe correctly removed");
+
       finish();
     }
   ]]></script>

From e00a97ff5c3aa6adf920f9466f645eda686c1780 Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin.sharp@gmail.com>
Date: Sat, 1 Aug 2009 18:17:11 +0200
Subject: [PATCH 144/175] Bug 445421 - Add static "bp-" in front of crash ID.
 r=ted

---
 toolkit/crashreporter/content/crashes.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/crashreporter/content/crashes.xhtml b/toolkit/crashreporter/content/crashes.xhtml
index e94098ebbbe..62e94941a20 100644
--- a/toolkit/crashreporter/content/crashes.xhtml
+++ b/toolkit/crashreporter/content/crashes.xhtml
@@ -113,7 +113,7 @@ function populateReportList() {
       if (leaf.substr(0, 3) == "bp-" &&
           leaf.substr(-4) == ".txt") {
         var entry = {
-          id: leaf.substring(3, leaf.length - 4),
+          id: leaf.slice(0, -4),
           date: file.lastModifiedTime
         };
         var pos = findInsertionPoint(reports, entry.date);

From 94621c558f7953b6a78f126e045fc5403ef2b416 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 14:54:42 +1200
Subject: [PATCH 145/175] Bug 506615. XUL decks should not have wididgets.
 r=dbaron

---
 layout/generic/nsContainerFrame.cpp    |  9 +++----
 layout/generic/nsFrame.cpp             |  9 -------
 layout/generic/nsIFrame.h              |  9 ++-----
 layout/xul/base/src/nsBoxFrame.cpp     | 12 ---------
 layout/xul/base/src/nsDeckFrame.cpp    | 34 +++++++++++++++++++++++
 layout/xul/base/src/nsDeckFrame.h      | 14 +++++++---
 layout/xul/base/src/nsLeafBoxFrame.cpp | 12 ---------
 view/public/nsIViewManager.h           |  7 ++++-
 view/src/nsView.cpp                    | 37 +++++++++++++++++++-------
 view/src/nsView.h                      |  4 +++
 view/src/nsViewManager.cpp             | 25 +++--------------
 11 files changed, 91 insertions(+), 81 deletions(-)

diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index d61279abc90..f4f58f27cf8 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -617,11 +617,10 @@ nsContainerFrame::SyncFrameViewProperties(nsPresContext*  aPresContext,
 
     if (!aStyleContext->GetStyleVisibility()->IsVisible() &&
         !aFrame->SupportsVisibilityHidden()) {
-      // If it's a scrollable frame that can't hide its scrollbars,
-      // hide the view. This means that child elements can't override
-      // their parent's visibility, but it's not practical to leave it
-      // visible in all cases because the scrollbars will be showing
-      // XXXldb Does the view system really enforce this correctly?
+      // If it's a subdocument frame or a plugin, hide the view and
+      // any associated widget.
+      // These are leaf elements so this is OK, no descendant can be
+      // visibility:visible.
       viewIsVisible = PR_FALSE;
     } else if (IsMenuPopup(aFrame)) {
       // if the view is for a popup, don't show the view if the popup is closed
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 285d934cea5..c0cab3233b0 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -6714,15 +6714,6 @@ nsFrame::SetParent(const nsIFrame* aParent)
   else if (wasBoxWrapped && !IsBoxWrapped())
     DeleteProperty(nsGkAtoms::boxMetricsProperty);
 
-  if (aParent && aParent->IsBoxFrame()) {
-    if (aParent->ChildrenMustHaveWidgets()) {
-        nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
-        nsIView* view = GetView();
-        if (!view->HasWidget())
-          CreateWidgetForView(view);
-    }
-  }
-
   return NS_OK;
 }
 
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 8bdd21a701e..2a4cbce3fd7 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -106,11 +106,9 @@ struct nsMargin;
 
 typedef class nsIFrame nsIBox;
 
-// IID for the nsIFrame interface
-// 2871104e-2738-4ad7-b86a-ede63c71f1c2
 #define NS_IFRAME_IID \
-  { 0x2871104e, 0x2738, 0x4ad7,                       \
-    { 0xb8, 0x6a, 0xed, 0xe6, 0x3c, 0x71, 0xf1, 0xc2 } }
+  { 0x7e9018b5, 0x5405, 0x4e2b, \
+    { 0x87, 0x67, 0xe2, 0xb4, 0xb1, 0x3e, 0xc1, 0x69 } }
 
 /**
  * Indication of how the frame can be split. This is used when doing runaround
@@ -2290,9 +2288,6 @@ NS_PTR_TO_INT32(frame->GetProperty(nsGkAtoms::embeddingLevel))
   NS_IMETHOD DumpBox(FILE* out)=0;
 #endif
 
-  // Only nsDeckFrame requires that all its children have widgets
-  virtual PRBool ChildrenMustHaveWidgets() const { return PR_FALSE; }
-
   /**
    * @return PR_TRUE if this text frame ends with a newline character.  It
    * should return PR_FALSE if this is not a text frame.
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index 103e95666d6..d60b673834e 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -205,18 +205,6 @@ nsBoxFrame::Init(nsIContent*      aContent,
 
   MarkIntrinsicWidthsDirty();
 
-  // see if we need a widget
-  if (aParent && aParent->IsBoxFrame()) {
-    if (aParent->ChildrenMustHaveWidgets()) {
-        rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        nsIView* view = GetView();
-        if (!view->HasWidget())
-           view->CreateWidget(kWidgetCID);   
-    }
-  }
-
   CacheAttributes();
 
 #ifdef DEBUG_LAYOUT
diff --git a/layout/xul/base/src/nsDeckFrame.cpp b/layout/xul/base/src/nsDeckFrame.cpp
index d7b27d9fcb6..deea1547250 100644
--- a/layout/xul/base/src/nsDeckFrame.cpp
+++ b/layout/xul/base/src/nsDeckFrame.cpp
@@ -56,6 +56,7 @@
 #include "nsBoxLayoutState.h"
 #include "nsStackLayout.h"
 #include "nsDisplayList.h"
+#include "nsHTMLContainerFrame.h"
 
 nsIFrame*
 NS_NewDeckFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
@@ -107,6 +108,39 @@ nsDeckFrame::Init(nsIContent*     aContent,
   return rv;
 }
 
+static void
+CreateViewsForFrames(const nsFrameList& aFrames)
+{
+  for (nsFrameList::Enumerator f(aFrames); !f.AtEnd(); f.Next()) {
+    nsHTMLContainerFrame::CreateViewForFrame(f.get(), PR_TRUE);
+  }
+}
+
+NS_IMETHODIMP
+nsDeckFrame::SetInitialChildList(nsIAtom*        aListName,
+                                 nsFrameList&    aChildList)
+{
+  CreateViewsForFrames(aChildList);
+  return nsBoxFrame::SetInitialChildList(aListName, aChildList);
+}
+
+NS_IMETHODIMP
+nsDeckFrame::AppendFrames(nsIAtom*        aListName,
+                          nsFrameList&    aFrameList)
+{
+  CreateViewsForFrames(aFrameList);
+  return nsBoxFrame::AppendFrames(aListName, aFrameList);
+}
+
+NS_IMETHODIMP
+nsDeckFrame::InsertFrames(nsIAtom*        aListName,
+                          nsIFrame*       aPrevFrame,
+                          nsFrameList&    aFrameList)
+{
+  CreateViewsForFrames(aFrameList);
+  return nsBoxFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
+}
+
 void
 nsDeckFrame::HideBox(nsPresContext* aPresContext, nsIBox* aBox)
 {
diff --git a/layout/xul/base/src/nsDeckFrame.h b/layout/xul/base/src/nsDeckFrame.h
index 741ba5315c1..d0b6df84f36 100644
--- a/layout/xul/base/src/nsDeckFrame.h
+++ b/layout/xul/base/src/nsDeckFrame.h
@@ -73,11 +73,17 @@ public:
                   nsIFrame*        aParent,
                   nsIFrame*        aPrevInFlow);
 
-  virtual nsIAtom* GetType() const;
+  // Override SetInitialChildList/AppendFrames/InsertFrames to
+  // create views for our child frames if necessary
+  NS_IMETHOD  SetInitialChildList(nsIAtom*        aListName,
+                                  nsFrameList&    aChildList);
+  NS_IMETHOD AppendFrames(nsIAtom*        aListName,
+                          nsFrameList&    aFrameList);
+  NS_IMETHOD InsertFrames(nsIAtom*        aListName,
+                          nsIFrame*       aPrevFrame,
+                          nsFrameList&    aFrameList);
 
-#ifndef MOZ_GFX_OPTIMIZE_MOBILE
-  virtual PRBool ChildrenMustHaveWidgets() const { return PR_TRUE; }
-#endif
+  virtual nsIAtom* GetType() const;
 
 #ifdef NS_DEBUG
   NS_IMETHOD GetFrameName(nsAString& aResult) const
diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/base/src/nsLeafBoxFrame.cpp
index dec1019d00c..07448fe5743 100644
--- a/layout/xul/base/src/nsLeafBoxFrame.cpp
+++ b/layout/xul/base/src/nsLeafBoxFrame.cpp
@@ -98,18 +98,6 @@ nsLeafBoxFrame::Init(
   nsresult  rv = nsLeafFrame::Init(aContent, aParent, aPrevInFlow);
   NS_ENSURE_SUCCESS(rv, rv);
 
-   // see if we need a widget
-  if (aParent && aParent->IsBoxFrame()) {
-    if (aParent->ChildrenMustHaveWidgets()) {
-        rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE); 
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        nsIView* view = GetView();
-        if (!view->HasWidget())
-           view->CreateWidget(kWidgetCID);   
-    }
-  }
-  
   mMouseThrough = unset;
 
   UpdateMouseThrough();
diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h
index 840421b5e4f..ec4825e4c1b 100644
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@@ -256,7 +256,12 @@ public:
                          PRBool aRepaintExposedAreaOnly = PR_FALSE) = 0;
 
   /**
-   * Set the visibility of a view.
+   * Set the visibility of a view. Hidden views have the effect of hiding
+   * their descendants as well. This does not affect painting, so layout
+   * is responsible for ensuring that content in hidden views is not
+   * painted nor handling events. It does affect the visibility of widgets;
+   * if a view is hidden, descendant views with widgets have their widgets
+   * hidden.
    * The view manager generates the appropriate dirty regions.
    * @param aView view to change visibility state of
    * @param visible new visibility state
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 228e74597f2..1fff95629f5 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -52,7 +52,6 @@ static nsEventStatus HandleEvent(nsGUIEvent *aEvent);
 
 
 //#define SHOW_VIEW_BORDERS
-//#define HIDE_ALL_WIDGETS
 
 // {34297A07-A8FD-d811-87C6-000244212BCB}
 #define VIEW_WRAPPER_IID \
@@ -338,6 +337,15 @@ void nsView::ResetWidgetBounds(PRBool aRecurse, PRBool aMoveOnly,
   }
 }
 
+PRBool nsView::IsEffectivelyVisible()
+{
+  for (nsView* v = this; v; v = v->mParent) {
+    if (v->GetVisibility() == nsViewVisibility_kHide)
+      return PR_FALSE;
+  }
+  return PR_TRUE;
+}
+
 nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
 {
   nsCOMPtr<nsIDeviceContext> dx;
@@ -354,7 +362,7 @@ nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
     viewBounds += offset;
 
     if (parentWidget && aType == eWindowType_popup &&
-        mVis == nsViewVisibility_kShow) {
+        IsEffectivelyVisible()) {
       nsIntPoint screenPoint = parentWidget->WidgetToScreenOffset();
       viewBounds += nsPoint(NSIntPixelsToAppUnits(screenPoint.x, p2a),
                             NSIntPixelsToAppUnits(screenPoint.y, p2a));
@@ -433,29 +441,38 @@ void nsView::SetDimensions(const nsRect& aRect, PRBool aPaint, PRBool aResizeWid
   }
 }
 
-NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility)
+void nsView::NotifyEffectiveVisibilityChanged(PRBool aEffectivelyVisible)
 {
-
-  mVis = aVisibility;
-
-  if (aVisibility == nsViewVisibility_kHide)
+  if (!aEffectivelyVisible)
   {
     DropMouseGrabbing();
   }
 
   if (nsnull != mWindow)
   {
-#ifndef HIDE_ALL_WIDGETS
-    if (mVis == nsViewVisibility_kShow)
+    if (aEffectivelyVisible)
     {
       DoResetWidgetBounds(PR_FALSE, PR_TRUE);
       mWindow->Show(PR_TRUE);
     }
     else
-#endif
       mWindow->Show(PR_FALSE);
   }
 
+  for (nsView* child = mFirstChild; child; child = child->mNextSibling) {
+    if (child->mVis == nsViewVisibility_kHide) {
+      // It was effectively hidden and still is
+      continue;
+    }
+    // Our child is visible if we are
+    child->NotifyEffectiveVisibilityChanged(aEffectivelyVisible);
+  }
+}
+
+NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility)
+{
+  mVis = aVisibility;
+  NotifyEffectiveVisibilityChanged(IsEffectivelyVisible());
   return NS_OK;
 }
 
diff --git a/view/src/nsView.h b/view/src/nsView.h
index 8baf66500c5..ad12aa1dade 100644
--- a/view/src/nsView.h
+++ b/view/src/nsView.h
@@ -166,6 +166,8 @@ public:
   void SetPositionIgnoringChildWidgets(nscoord aX, nscoord aY);
   nsresult LoadWidget(const nsCID &aClassIID);
 
+  void NotifyEffectiveVisibilityChanged(PRBool aEffectivelyVisible);
+
   // Update the cached RootViewManager for all view manager descendents,
   // If the hierarchy is being removed, aViewManagerParent points to the view
   // manager for the hierarchy's old parent, and will have its mouse grab
@@ -193,6 +195,8 @@ public:
 
   nsIntRect CalcWidgetBounds(nsWindowType aType);
 
+  PRBool IsEffectivelyVisible();
+
 protected:
   // Do the actual work of ResetWidgetBounds, unconditionally.  Don't
   // call this method if we have no widget.
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index 440ddfd1b3f..bd63ad2cecd 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -110,14 +110,8 @@ public:
 
 static PRBool IsViewVisible(nsView *aView)
 {
-  for (nsIView *view = aView; view; view = view->GetParent()) {
-    // We don't check widget visibility here because in the future (with
-    // the better approach to this that's in attachment 160801 on bug
-    // 227361), callers of the equivalent to this function should be able
-    // to rely on being notified when the result of this function changes.
-    if (view->GetVisibility() == nsViewVisibility_kHide)
-      return PR_FALSE;
-  }
+  if (!aView->IsEffectivelyVisible())
+    return PR_FALSE;
 
   // Find out if the root view is visible by asking the view observer
   // (this won't be needed anymore if we link view trees across chrome /
@@ -1231,8 +1225,7 @@ NS_IMETHODIMP nsViewManager::GrabMouseEvents(nsIView *aView, PRBool &aResult)
 
   // Along with nsView::SetVisibility, we enforce that the mouse grabber
   // can never be a hidden view.
-  if (aView && static_cast<nsView*>(aView)->GetVisibility()
-               == nsViewVisibility_kHide) {
+  if (aView && !static_cast<nsView*>(aView)->IsEffectivelyVisible()) {
     aView = nsnull;
   }
 
@@ -1587,16 +1580,6 @@ NS_IMETHODIMP nsViewManager::SetViewVisibility(nsIView *aView, nsViewVisibility
         }
       }
     }
-
-    // Any child views not associated with frames might not get their visibility
-    // updated, so propagate our visibility to them. This is important because
-    // hidden views should have all hidden children.
-    for (nsView* childView = view->GetFirstChild(); childView;
-         childView = childView->GetNextSibling()) {
-      if (!childView->GetClientData()) {
-        childView->SetVisibility(aVisible);
-      }
-    }
   }
   return NS_OK;
 }
@@ -1967,7 +1950,7 @@ NS_IMETHODIMP nsViewManager::GetRectVisibility(nsIView *aView,
   }
 
   // is this view even visible?
-  if (view->GetVisibility() == nsViewVisibility_kHide) {
+  if (!view->IsEffectivelyVisible()) {
     return NS_OK; 
   }
 

From 3e221a327d968742d3c68dd88d1acaeaf1fef882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sat, 1 Aug 2009 18:17:30 +0200
Subject: [PATCH 146/175] Bug 507583 - WindowIsClosing() cleanup. r=gavin

---
 browser/base/content/browser.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index a07ce65feba..fce6b078c01 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5652,15 +5652,13 @@ var OfflineApps = {
 
 function WindowIsClosing()
 {
-  var cn = gBrowser.tabContainer.childNodes;
-  var numtabs = cn.length;
   var reallyClose = closeWindow(false, warnAboutClosingWindow);
-
   if (!reallyClose)
     return false;
 
-  for (var i = 0; reallyClose && i < numtabs; ++i) {
-    var ds = gBrowser.getBrowserForTab(cn[i]).docShell;
+  var numBrowsers = gBrowser.browsers.length;
+  for (let i = 0; reallyClose && i < numBrowsers; ++i) {
+    let ds = gBrowser.browsers[i].docShell;
 
     if (ds.contentViewer && !ds.contentViewer.permitUnload())
       reallyClose = false;

From fc574bae0253c25cd3ccbe00fd1ef946a6863eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sat, 1 Aug 2009 19:42:46 +0200
Subject: [PATCH 147/175] browser_aboutCrashes.js fix for bug 445421

---
 toolkit/crashreporter/test/browser/browser_aboutCrashes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/crashreporter/test/browser/browser_aboutCrashes.js b/toolkit/crashreporter/test/browser/browser_aboutCrashes.js
index 5471a7a81d6..5bb5dd4bfcc 100644
--- a/toolkit/crashreporter/test/browser/browser_aboutCrashes.js
+++ b/toolkit/crashreporter/test/browser/browser_aboutCrashes.js
@@ -8,7 +8,7 @@ function check_crash_list(tab, crashes) {
   let crashlinks = doc.getElementById("tbody").getElementsByTagName("a");
   is(crashlinks.length, crashes.length, "about:crashes lists correct number of crash reports");
   for(let i = 0; i < crashes.length; i++) {
-    is(crashes[i].id, crashlinks[i].firstChild.textContent, i + ": crash ID is correct");
+    is(crashlinks[i].firstChild.textContent, "bp-" + crashes[i].id, i + ": crash ID is correct");
   }
   cleanup_fake_appdir();
   gBrowser.removeTab(tab);

From 22d8776bdbb3fabbd1e86428100fec1eb316effd Mon Sep 17 00:00:00 2001
From: Walter Meinl <wuno@lsvw.de>
Date: Sat, 1 Aug 2009 21:55:07 +0300
Subject: [PATCH 148/175] [OS/2] Bug 501461 - remove os2Embed from the tree,
 r=pweilbacher

---
 embedding/tests/Makefile.in                   |    4 -
 embedding/tests/os2Embed/Makefile.in          |  115 --
 embedding/tests/os2Embed/SMALL.ICO            |  Bin 16 -> 0 bytes
 embedding/tests/os2Embed/WebBrowserChrome.cpp |  568 -------
 embedding/tests/os2Embed/WebBrowserChrome.h   |  121 --
 embedding/tests/os2Embed/WindowCreator.cpp    |   53 -
 embedding/tests/os2Embed/WindowCreator.h      |   48 -
 embedding/tests/os2Embed/os2Embed.ICO         |  Bin 16 -> 0 bytes
 embedding/tests/os2Embed/os2Embed.cpp         | 1479 -----------------
 embedding/tests/os2Embed/os2Embed.h           |   42 -
 embedding/tests/os2Embed/os2Embed.rc          |  141 --
 embedding/tests/os2Embed/resource.h           |   77 -
 toolkit/mozapps/installer/packager.mk         |    1 -
 xulrunner/build.mk                            |    7 -
 14 files changed, 2656 deletions(-)
 delete mode 100644 embedding/tests/os2Embed/Makefile.in
 delete mode 100644 embedding/tests/os2Embed/SMALL.ICO
 delete mode 100644 embedding/tests/os2Embed/WebBrowserChrome.cpp
 delete mode 100644 embedding/tests/os2Embed/WebBrowserChrome.h
 delete mode 100644 embedding/tests/os2Embed/WindowCreator.cpp
 delete mode 100644 embedding/tests/os2Embed/WindowCreator.h
 delete mode 100644 embedding/tests/os2Embed/os2Embed.ICO
 delete mode 100644 embedding/tests/os2Embed/os2Embed.cpp
 delete mode 100644 embedding/tests/os2Embed/os2Embed.h
 delete mode 100644 embedding/tests/os2Embed/os2Embed.rc
 delete mode 100644 embedding/tests/os2Embed/resource.h

diff --git a/embedding/tests/Makefile.in b/embedding/tests/Makefile.in
index c5415d6e2ec..c8b897fa007 100644
--- a/embedding/tests/Makefile.in
+++ b/embedding/tests/Makefile.in
@@ -35,10 +35,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(OS_ARCH),OS2)
-DIRS = os2Embed
-endif
-
 ifeq ($(OS_ARCH),WINNT)
 # disable winembed in non-libxul
 ifndef BUILD_STATIC_LIBS
diff --git a/embedding/tests/os2Embed/Makefile.in b/embedding/tests/os2Embed/Makefile.in
deleted file mode 100644
index 86b5b24292c..00000000000
--- a/embedding/tests/os2Embed/Makefile.in
+++ /dev/null
@@ -1,115 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: Mozilla-sample-code 1.0
-#
-# Copyright (c) 2002 Netscape Communications Corporation and
-# other contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this Mozilla sample software and associated documentation files
-# (the "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to permit
-# persons to whom the Software is furnished to do so, subject to the
-# following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-# Contributor(s):
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PROGRAM		= os2Embed$(BIN_SUFFIX)
-RESFILE		= os2Embed.res
-MOZILLA_INTERNAL_API = 1
-
-MODULE		= os2Embed
-
-REQUIRES	= xpcom \
-		  string \
-		  embed_base \
-		  webbrwsr \
-		  webshell \
-		  windowwatcher \
-		  profile \
-		  necko \
-		  docshell \
-		  dom \
-		  widget \
-		  uriloader \
-		  shistory \
-		  webbrowserpersist \
-		  gfx \
-		  $(NULL)
-
-CPPSRCS		= \
-		os2Embed.cpp \
-		WebBrowserChrome.cpp \
-		WindowCreator.cpp \
-		$(NULL)
-
-EXTRA_DSO_LIBS	= embed_base_s gkgfx
-
-LIBS		= \
-		$(EXTRA_DSO_LIBS) \
-		$(XPCOM_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NSPR_LIBS) \
-		$(NULL)
-
-#
-# Control the default heap size.
-# This is the heap returned by GetProcessHeap().
-# As we use the CRT heap, the default size is too large and wastes VM.
-#
-# The default heap size is 1MB on Win32.
-# The heap will grow if need be.
-#
-# Set it to 256k.  See bug 127069.
-#
-LDFLAGS += /HEAP:0x40000
-
-include $(topsrcdir)/config/config.mk
-
-# Force applications to be built non-statically
-# when building the mozcomps meta component
-ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
-BUILD_STATIC_LIBS=
-endif
-
-ifdef BUILD_STATIC_LIBS
-
-include $(topsrcdir)/config/static-config.mk
-
-EXTRA_DEPS     += $(STATIC_EXTRA_DEPS)
-EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIBS)
-EXTRA_LIBS     += -L$(DEPTH)/dist/lib/components
-EXTRA_LIBS     += $(EXTRA_DSO_LIBS) $(STATIC_EXTRA_LIBS)
-EXTRA_LIBS     += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
-DEFINES        += $(STATIC_DEFINES)
-CPPSRCS        += $(STATIC_CPPSRCS)
-
-endif # BUILD_STATIC_LIBS
-
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef BUILD_STATIC_LIBS
-include $(topsrcdir)/config/static-rules.mk
-endif # BUILD_STATIC_LIBS
-
diff --git a/embedding/tests/os2Embed/SMALL.ICO b/embedding/tests/os2Embed/SMALL.ICO
deleted file mode 100644
index 2f28f20e1466692053ba37c12ef4748d065095fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16
TcmZ>A)L>v>r~qORaP|ZM53T{Q

diff --git a/embedding/tests/os2Embed/WebBrowserChrome.cpp b/embedding/tests/os2Embed/WebBrowserChrome.cpp
deleted file mode 100644
index 8509506fb77..00000000000
--- a/embedding/tests/os2Embed/WebBrowserChrome.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Mozilla Includes
-#include "nsIGenericFactory.h"
-#include "nsIComponentManager.h"
-#include "nsString.h"
-#include "nsXPIDLString.h"
-#include "nsIURI.h"
-#include "nsIWebProgress.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIDOMWindow.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIRequest.h"
-#include "nsIChannel.h"
-#include "nsCWebBrowser.h"
-#include "nsWidgetsCID.h"
-#include "nsIProfileChangeStatus.h"
-#include "nsCRT.h"
-
-// Local includes
-#include "resource.h"
-
-#include "os2Embed.h"
-#include "WebBrowserChrome.h"
-
-
-WebBrowserChrome::WebBrowserChrome()
-{
-    mNativeWindow = nsnull;
-    mSizeSet = PR_FALSE;
-}
-
-WebBrowserChrome::~WebBrowserChrome()
-{
-    WebBrowserChromeUI::Destroyed(this);
-}
-
-nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY,
-                                         PRInt32 aCX, PRInt32 aCY,
-                                         nsIWebBrowser **aBrowser)
-{
-    NS_ENSURE_ARG_POINTER(aBrowser);
-    *aBrowser = nsnull;
-
-    mWebBrowser = do_CreateInstance(NS_WEBBROWSER_CONTRACTID);
-    
-    if (!mWebBrowser)
-        return NS_ERROR_FAILURE;
-
-    (void)mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(this));
-
-    nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(mWebBrowser);
-    dsti->SetItemType(nsIDocShellTreeItem::typeContentWrapper);
-
-    nsCOMPtr<nsIBaseWindow> browserBaseWindow = do_QueryInterface(mWebBrowser);
-
-    mNativeWindow = WebBrowserChromeUI::CreateNativeWindow(static_cast<nsIWebBrowserChrome*>(this));
-
-    if (!mNativeWindow)
-        return NS_ERROR_FAILURE;
-
-    browserBaseWindow->InitWindow( mNativeWindow,
-                             nsnull, 
-                             aX, aY, aCX, aCY);
-    browserBaseWindow->Create();
-
-    nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(this));
-    nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
-    (void)mWebBrowser->AddWebBrowserListener(thisListener, 
-        NS_GET_IID(nsIWebProgressListener));
-
-    // The window has been created. Now register for history notifications
-    mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsISHistoryListener));
-
-    if (mWebBrowser)
-    {
-      *aBrowser = mWebBrowser;
-      NS_ADDREF(*aBrowser);
-      return NS_OK;
-    }
-    return NS_ERROR_FAILURE;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsISupports
-//*****************************************************************************   
-
-NS_IMPL_ADDREF(WebBrowserChrome)
-NS_IMPL_RELEASE(WebBrowserChrome)
-
-NS_INTERFACE_MAP_BEGIN(WebBrowserChrome)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebBrowserChrome)
-   NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
-   NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
-   NS_INTERFACE_MAP_ENTRY(nsIEmbeddingSiteWindow)
-   NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener) // optional
-   NS_INTERFACE_MAP_ENTRY(nsISHistoryListener)
-   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
-   NS_INTERFACE_MAP_ENTRY(nsIObserver)
-   NS_INTERFACE_MAP_ENTRY(nsIContextMenuListener)
-   NS_INTERFACE_MAP_ENTRY(nsITooltipListener)
-NS_INTERFACE_MAP_END
-
-//*****************************************************************************
-// WebBrowserChrome::nsIInterfaceRequestor
-//*****************************************************************************   
-
-NS_IMETHODIMP WebBrowserChrome::GetInterface(const nsIID &aIID, void** aInstancePtr)
-{
-    NS_ENSURE_ARG_POINTER(aInstancePtr);
-
-    *aInstancePtr = 0;
-    if (aIID.Equals(NS_GET_IID(nsIDOMWindow)))
-    {
-        if (mWebBrowser)
-        {
-            return mWebBrowser->GetContentDOMWindow((nsIDOMWindow **) aInstancePtr);
-        }
-        return NS_ERROR_NOT_INITIALIZED;
-    }
-    return QueryInterface(aIID, aInstancePtr);
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsIWebBrowserChrome
-//*****************************************************************************   
-
-NS_IMETHODIMP WebBrowserChrome::SetStatus(PRUint32 aType, const PRUnichar* aStatus)
-{
-    WebBrowserChromeUI::UpdateStatusBarText(this, aStatus);
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::GetWebBrowser(nsIWebBrowser** aWebBrowser)
-{
-    NS_ENSURE_ARG_POINTER(aWebBrowser);
-    *aWebBrowser = mWebBrowser;
-    NS_IF_ADDREF(*aWebBrowser);
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::SetWebBrowser(nsIWebBrowser* aWebBrowser)
-{
-    mWebBrowser = aWebBrowser;
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::GetChromeFlags(PRUint32* aChromeMask)
-{
-    *aChromeMask = mChromeFlags;
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::SetChromeFlags(PRUint32 aChromeMask)
-{
-    mChromeFlags = aChromeMask;
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::DestroyBrowserWindow(void)
-{
-    WebBrowserChromeUI::Destroy(this);
-    return NS_OK;
-}
-
-
-// IN: The desired browser client area dimensions.
-NS_IMETHODIMP WebBrowserChrome::SizeBrowserTo(PRInt32 aWidth, PRInt32 aHeight)
-{
-  /* This isn't exactly correct: we're setting the whole window to
-     the size requested for the browser. At time of writing, though,
-     it's fine and useful for os2Embed's purposes. */
-  WebBrowserChromeUI::SizeTo(this, aWidth, aHeight);
-  mSizeSet = PR_TRUE;
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP WebBrowserChrome::ShowAsModal(void)
-{
-  if (mDependentParent)
-    EnableChromeWindow(mDependentParent, PR_FALSE);
-
-  mContinueModalLoop = PR_TRUE;
-  RunEventLoop(mContinueModalLoop);
-
-  if (mDependentParent)
-    EnableChromeWindow(mDependentParent, PR_TRUE);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::IsWindowModal(PRBool *_retval)
-{
-    *_retval = PR_FALSE;
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP WebBrowserChrome::ExitModalEventLoop(nsresult aStatus)
-{
-  mContinueModalLoop = PR_FALSE;
-  return NS_OK;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsIWebBrowserChromeFocus
-//*****************************************************************************
-
-NS_IMETHODIMP WebBrowserChrome::FocusNextElement()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP WebBrowserChrome::FocusPrevElement()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsIWebProgressListener
-//*****************************************************************************   
-
-NS_IMETHODIMP WebBrowserChrome::OnProgressChange(nsIWebProgress *progress, nsIRequest *request,
-                                                  PRInt32 curSelfProgress, PRInt32 maxSelfProgress,
-                                                  PRInt32 curTotalProgress, PRInt32 maxTotalProgress)
-{
-    WebBrowserChromeUI::UpdateProgress(this, curTotalProgress, maxTotalProgress);
-    return NS_OK;
-}
-
-NS_IMETHODIMP WebBrowserChrome::OnStateChange(nsIWebProgress *progress, nsIRequest *request,
-                                               PRUint32 progressStateFlags, nsresult status)
-{
-    if ((progressStateFlags & STATE_START) && (progressStateFlags & STATE_IS_DOCUMENT))
-    {
-        WebBrowserChromeUI::UpdateBusyState(this, PR_TRUE);
-    }
-
-    if ((progressStateFlags & STATE_STOP) && (progressStateFlags & STATE_IS_DOCUMENT))
-    {
-        WebBrowserChromeUI::UpdateBusyState(this, PR_FALSE);
-        WebBrowserChromeUI::UpdateProgress(this, 0, 100);
-        WebBrowserChromeUI::UpdateStatusBarText(this, nsnull);
-        ContentFinishedLoading();
-    }
-
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP WebBrowserChrome::OnLocationChange(nsIWebProgress* aWebProgress,
-                                                 nsIRequest* aRequest,
-                                                 nsIURI *location)
-{
-  PRBool isSubFrameLoad = PR_FALSE; // Is this a subframe load
-  if (aWebProgress) {
-    nsCOMPtr<nsIDOMWindow>  domWindow;
-    nsCOMPtr<nsIDOMWindow>  topDomWindow;
-    aWebProgress->GetDOMWindow(getter_AddRefs(domWindow));
-    if (domWindow) { // Get root domWindow
-      domWindow->GetTop(getter_AddRefs(topDomWindow));
-    }
-    if (domWindow != topDomWindow)
-      isSubFrameLoad = PR_TRUE;
-  }
-  if (!isSubFrameLoad)
-    WebBrowserChromeUI::UpdateCurrentURI(this);
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-WebBrowserChrome::OnStatusChange(nsIWebProgress* aWebProgress,
-                                 nsIRequest* aRequest,
-                                 nsresult aStatus,
-                                 const PRUnichar* aMessage)
-{
-    WebBrowserChromeUI::UpdateStatusBarText(this, aMessage);
-    return NS_OK;
-}
-
-
-
-NS_IMETHODIMP 
-WebBrowserChrome::OnSecurityChange(nsIWebProgress *aWebProgress, 
-                                    nsIRequest *aRequest, 
-                                    PRUint32 state)
-{
-    return NS_OK;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsISHistoryListener
-//*****************************************************************************   
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryNewEntry(nsIURI * aNewURI)
-{
-    return SendHistoryStatusMessage(aNewURI, "add");
-}
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryGoBack(nsIURI * aBackURI, PRBool * aContinue)
-{
-    // For now, let the operation continue
-    *aContinue = PR_TRUE;
-    return SendHistoryStatusMessage(aBackURI, "back");
-}
-
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryGoForward(nsIURI * aForwardURI, PRBool * aContinue)
-{
-    // For now, let the operation continue
-    *aContinue = PR_TRUE;
-    return SendHistoryStatusMessage(aForwardURI, "forward");
-}
-
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryGotoIndex(PRInt32 aIndex, nsIURI * aGotoURI, PRBool * aContinue)
-{
-    // For now, let the operation continue
-    *aContinue = PR_TRUE;
-    return SendHistoryStatusMessage(aGotoURI, "goto", aIndex);
-}
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryReload(nsIURI * aURI, PRUint32 aReloadFlags, PRBool * aContinue)
-{
-    // For now, let the operation continue
-    *aContinue = PR_TRUE;
-    return SendHistoryStatusMessage(aURI, "reload", 0 /* no info to pass here */, aReloadFlags);
-}
-
-NS_IMETHODIMP
-WebBrowserChrome::OnHistoryPurge(PRInt32 aNumEntries, PRBool *aContinue)
-{
-    // For now let the operation continue
-    *aContinue = PR_FALSE;
-    return SendHistoryStatusMessage(nsnull, "purge", aNumEntries);
-}
-
-nsresult
-WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRInt32 info1, PRUint32 aReloadFlags)
-{
-    nsCAutoString uriCStr;
-    if (aURI)
-    {
-        aURI->GetSpec(uriCStr);
-    }
-
-    nsString uriAStr;
-
-    if(!(nsCRT::strcmp(operation, "back")))
-    {
-        // Going back. XXX Get string from a resource file
-        uriAStr.AppendLiteral("Going back to url:");
-        AppendUTF8toUTF16(uriCStr, uriAStr);
-    }
-    else if (!(nsCRT::strcmp(operation, "forward")))
-    {
-        // Going forward. XXX Get string from a resource file
-        uriAStr.AppendLiteral("Going forward to url:");
-        AppendUTF8toUTF16(uriCStr, uriAStr);
-    }
-    else if (!(nsCRT::strcmp(operation, "reload")))
-    {
-        // Reloading. XXX Get string from a resource file
-        if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY && 
-            aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE)
-        {
-            uriAStr.Append(NS_LITERAL_STRING("Reloading url,(bypassing proxy and cache) :"));
-        }
-        else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY)
-        {
-            uriAStr.Append(NS_LITERAL_STRING("Reloading url, (bypassing proxy):"));
-        }
-        else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE)
-        {
-            uriAStr.Append(NS_LITERAL_STRING("Reloading url, (bypassing cache):"));
-        }
-        else
-        {
-            uriAStr.Append(NS_LITERAL_STRING("Reloading url, (normal):"));
-        }
-        AppendUTF8toUTF16(uriCStr, uriAStr);
-    }
-    else if (!(nsCRT::strcmp(operation, "add")))
-    {
-        // Adding new entry. XXX Get string from a resource file
-        AppendUTF8toUTF16(uriCStr, uriAStr);
-        uriAStr.AppendLiteral(" added to session History");
-    }
-    else if (!(nsCRT::strcmp(operation, "goto")))
-    {
-        // Goto. XXX Get string from a resource file
-        uriAStr.AppendLiteral("Going to HistoryIndex:");
-        uriAStr.AppendInt(info1);
-        uriAStr.AppendLiteral(" Url:");
-        AppendUTF8toUTF16(uriCStr, uriAStr);
-    }
-    else if (!(nsCRT::strcmp(operation, "purge")))
-    {
-        // Purging old entries
-        uriAStr.AppendInt(info1);
-        uriAStr.AppendLiteral(" purged from Session History");
-    }
-
-    WebBrowserChromeUI::UpdateStatusBarText(this, uriAStr.get());
-
-    return NS_OK;
-}
-
-void WebBrowserChrome::ContentFinishedLoading()
-{
-  // if it was a chrome window and no one has already specified a size,
-  // size to content
-  if (mWebBrowser && !mSizeSet &&
-     (mChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME)) {
-    nsCOMPtr<nsIDOMWindow> contentWin;
-    mWebBrowser->GetContentDOMWindow(getter_AddRefs(contentWin));
-    if (contentWin)
-        contentWin->SizeToContent();
-    WebBrowserChromeUI::ShowWindow(this, PR_TRUE);
-  }
-}
-
-
-//*****************************************************************************
-// WebBrowserChrome::nsIEmbeddingSiteWindow
-//*****************************************************************************   
-
-NS_IMETHODIMP WebBrowserChrome::SetDimensions(PRUint32 aFlags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP WebBrowserChrome::GetDimensions(PRUint32 aFlags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy)
-{
-    if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_POSITION)
-    {
-        *x = 0;
-        *y = 0;
-    }
-    if (aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_INNER ||
-        aFlags & nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_OUTER)
-    {
-        *cx = 0;
-        *cy = 0;
-    }
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setFocus (); */
-NS_IMETHODIMP WebBrowserChrome::SetFocus()
-{
-    WebBrowserChromeUI::SetFocus(this);
-    return NS_OK;
-}
-
-/* attribute wstring title; */
-NS_IMETHODIMP WebBrowserChrome::GetTitle(PRUnichar * *aTitle)
-{
-   NS_ENSURE_ARG_POINTER(aTitle);
-
-   *aTitle = nsnull;
-   
-   return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP WebBrowserChrome::SetTitle(const PRUnichar * aTitle)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute boolean visibility; */
-NS_IMETHODIMP WebBrowserChrome::GetVisibility(PRBool * aVisibility)
-{
-    NS_ENSURE_ARG_POINTER(aVisibility);
-    *aVisibility = PR_TRUE;
-    return NS_OK;
-}
-NS_IMETHODIMP WebBrowserChrome::SetVisibility(PRBool aVisibility)
-{
-    return NS_OK;
-}
-
-/* attribute nativeSiteWindow siteWindow */
-NS_IMETHODIMP WebBrowserChrome::GetSiteWindow(void * *aSiteWindow)
-{
-   NS_ENSURE_ARG_POINTER(aSiteWindow);
-
-   *aSiteWindow = mNativeWindow;
-   return NS_OK;
-}
-
-
-//*****************************************************************************
-// WebBrowserChrome::nsIObserver
-//*****************************************************************************   
-
-NS_IMETHODIMP WebBrowserChrome::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData)
-{
-    nsresult rv = NS_OK;
-    if (nsCRT::strcmp(aTopic, "profile-change-teardown") == 0)
-    {
-        // A profile change means death for this window
-        WebBrowserChromeUI::Destroy(this);
-    }
-    return rv;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsIContextMenuListener
-//*****************************************************************************   
-
-/* void OnShowContextMenu (in unsigned long aContextFlags, in nsIDOMEvent aEvent, in nsIDOMNode aNode); */
-NS_IMETHODIMP WebBrowserChrome::OnShowContextMenu(PRUint32 aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode)
-{
-    WebBrowserChromeUI::ShowContextMenu(this, aContextFlags, aEvent, aNode);
-    return NS_OK;
-}
-
-//*****************************************************************************
-// WebBrowserChrome::nsITooltipListener
-//*****************************************************************************   
-
-/* void OnShowTooltip (in long aXCoords, in long aYCoords, in wstring aTipText); */
-NS_IMETHODIMP WebBrowserChrome::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText)
-{
-    WebBrowserChromeUI::ShowTooltip(this, aXCoords, aYCoords, aTipText);
-    return NS_OK;
-}
-
-/* void OnHideTooltip (); */
-NS_IMETHODIMP WebBrowserChrome::OnHideTooltip()
-{
-    WebBrowserChromeUI::HideTooltip(this);
-    return NS_OK;
-}
diff --git a/embedding/tests/os2Embed/WebBrowserChrome.h b/embedding/tests/os2Embed/WebBrowserChrome.h
deleted file mode 100644
index 793ce3b8e7f..00000000000
--- a/embedding/tests/os2Embed/WebBrowserChrome.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __WebBrowserChrome__
-#define __WebBrowserChrome__
-
-#include "nsCOMPtr.h"
-#include "nsIGenericFactory.h"
-#include "nsString.h"
-#include "nsIWebBrowserChrome.h"
-#include "nsIWebBrowserChromeFocus.h"
-
-#include "nsIDocShell.h"
-#include "nsIContentViewer.h"
-#include "nsIContentViewerFile.h"
-#include "nsIBaseWindow.h"
-#include "nsIEmbeddingSiteWindow.h"
-#include "nsIWebNavigation.h"
-#include "nsIWebProgressListener.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIWebBrowser.h"
-#include "nsIObserver.h"
-#include "nsWeakReference.h"
-#include "nsISHistoryListener.h"
-#include "nsIContextMenuListener.h"
-#include "nsITooltipListener.h"
-
-class WebBrowserChromeUI
-{
-public:
-    static nativeWindow CreateNativeWindow(nsIWebBrowserChrome* chrome);
-    static void Destroy(nsIWebBrowserChrome* chrome);
-    static void Destroyed(nsIWebBrowserChrome* chrome);
-    static void SetFocus(nsIWebBrowserChrome *chrome);
-    static void UpdateStatusBarText(nsIWebBrowserChrome *aChrome, const PRUnichar* aStatusText);
-    static void UpdateCurrentURI(nsIWebBrowserChrome *aChrome);
-    static void UpdateBusyState(nsIWebBrowserChrome *aChrome, PRBool aBusy);
-    static void UpdateProgress(nsIWebBrowserChrome *aChrome, PRInt32 aCurrent, PRInt32 aMax);
-    static void GetResourceStringById(PRInt32 aID, char ** aReturn);
-    static void ShowContextMenu(nsIWebBrowserChrome *aChrome, PRUint32 aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode);
-    static void ShowTooltip(nsIWebBrowserChrome *aChrome, PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText);
-    static void HideTooltip(nsIWebBrowserChrome *aChrome);
-    static void ShowWindow(nsIWebBrowserChrome *aChrome, PRBool aShow);
-    static void SizeTo(nsIWebBrowserChrome *aChrome, PRInt32 aWidth, PRInt32 aHeight);
-};
-
-class WebBrowserChrome   : public nsIWebBrowserChrome,
-                           public nsIWebBrowserChromeFocus,
-                           public nsIWebProgressListener,
-                           public nsIEmbeddingSiteWindow,
-                           public nsIInterfaceRequestor,
-                           public nsISHistoryListener,
-                           public nsIObserver,
-                           public nsIContextMenuListener,
-                           public nsITooltipListener,
-                           public nsSupportsWeakReference
-
-{
-public:
-    WebBrowserChrome();
-    virtual ~WebBrowserChrome();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIWEBBROWSERCHROME
-    NS_DECL_NSIWEBBROWSERCHROMEFOCUS
-    NS_DECL_NSIWEBPROGRESSLISTENER
-    NS_DECL_NSIEMBEDDINGSITEWINDOW
-    NS_DECL_NSIINTERFACEREQUESTOR
-    NS_DECL_NSISHISTORYLISTENER
-    NS_DECL_NSIOBSERVER
-    NS_DECL_NSICONTEXTMENULISTENER
-    NS_DECL_NSITOOLTIPLISTENER
-
-    nsresult CreateBrowser(PRInt32 aX, PRInt32 aY, PRInt32 aCX, PRInt32 aCY,
-                           nsIWebBrowser **aBrowser);
-
-    void     SetParent(nsIWebBrowserChrome *aParent)
-               { mDependentParent = aParent; }
-   
-protected:
-    nsresult SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRInt32 info1=0, PRUint32 info2=0);
-
-    void ContentFinishedLoading();
-
-    nativeWindow mNativeWindow;
-    PRUint32     mChromeFlags;
-    PRBool       mContinueModalLoop;
-    PRBool       mSizeSet;
-
-    nsCOMPtr<nsIWebBrowser> mWebBrowser;
-    nsCOMPtr<nsIWebBrowserChrome> mDependentParent; // opener (for dependent windows only)
-};
-
-#endif /* __WebBrowserChrome__ */
diff --git a/embedding/tests/os2Embed/WindowCreator.cpp b/embedding/tests/os2Embed/WindowCreator.cpp
deleted file mode 100644
index 59ba412f138..00000000000
--- a/embedding/tests/os2Embed/WindowCreator.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIWebBrowserChrome.h"
-#include "WindowCreator.h"
-#include "os2Embed.h"
-
-WindowCreator::WindowCreator()
-{
-}
-
-WindowCreator::~WindowCreator()
-{
-}
-
-NS_IMPL_ISUPPORTS1(WindowCreator, nsIWindowCreator)
-
-NS_IMETHODIMP
-WindowCreator::CreateChromeWindow(nsIWebBrowserChrome *parent,
-                                  PRUint32 chromeFlags,
-                                  nsIWebBrowserChrome **_retval)
-{
-    NS_ENSURE_ARG_POINTER(_retval);
-    CreateBrowserWindow(PRInt32(chromeFlags), parent, _retval);
-    return *_retval ? NS_OK : NS_ERROR_FAILURE;
-}
diff --git a/embedding/tests/os2Embed/WindowCreator.h b/embedding/tests/os2Embed/WindowCreator.h
deleted file mode 100644
index d2c78e0cd9c..00000000000
--- a/embedding/tests/os2Embed/WindowCreator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __WindowCreator_h_
-#define __WindowCreator_h_
-
-#include "nsIWindowCreator.h"
-
-class WindowCreator :
-      public nsIWindowCreator
-{
-public:
-    WindowCreator();
-    virtual ~WindowCreator();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIWINDOWCREATOR
-};
-
-#endif
-
diff --git a/embedding/tests/os2Embed/os2Embed.ICO b/embedding/tests/os2Embed/os2Embed.ICO
deleted file mode 100644
index 2f28f20e1466692053ba37c12ef4748d065095fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16
TcmZ>A)L>v>r~qORaP|ZM53T{Q

diff --git a/embedding/tests/os2Embed/os2Embed.cpp b/embedding/tests/os2Embed/os2Embed.cpp
deleted file mode 100644
index e590cb6843f..00000000000
--- a/embedding/tests/os2Embed/os2Embed.cpp
+++ /dev/null
@@ -1,1479 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *   Doug Turner <dougt@netscape.com>
- *   Adam Lock <adamlock@netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <stdio.h>
-
-// OS/2 header files
-#define INCL_WIN
-#define INCL_DOS
-#include <os2.h>
-
-// Mozilla header files
-#include "nsEmbedAPI.h"
-#include "nsWeakReference.h"
-#include "nsIClipboardCommands.h"
-#include "nsXPIDLString.h"
-#include "nsIWebBrowserPersist.h"
-#include "nsIWebBrowserFocus.h"
-#include "nsIWindowWatcher.h"
-#include "nsIProfile.h"
-#include "nsIObserverService.h"
-#include "nsIObserver.h"
-#include "nsIProfileChangeStatus.h"
-#include "nsIURI.h"
-#include "plstr.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCRT.h"
-
-// Local header files
-#include "os2Embed.h"
-#include "WebBrowserChrome.h"
-#include "WindowCreator.h"
-#include "resource.h"
-#include "nsStaticComponents.h"
-
-// Printing header files
-#include "nsIPrintSettings.h"
-#include "nsIWebBrowserPrint.h"
-
-#define MAX_LOADSTRING 100
-
-
-#ifndef _BUILD_STATIC_BIN
-nsStaticModuleInfo const *const kPStaticModules = nsnull;
-PRUint32 const kStaticModuleCount = 0;
-#endif
-
-const CHAR *szWindowClass = "OS2EMBED";
-
-// Foward declarations of functions included in this code module:
-static void             MyRegisterClass();
-static MRESULT EXPENTRY BrowserWndProc(HWND, ULONG, MPARAM, MPARAM);
-static MRESULT EXPENTRY BrowserDlgProc(HWND hwndDlg, ULONG uMsg, MPARAM wParam, MPARAM lParam);
-
-static nsresult InitializeWindowCreator();
-static nsresult OpenWebPage(const char * url);
-static nsresult ResizeEmbedding(nsIWebBrowserChrome* chrome);
-
-// Profile chooser stuff
-static BOOL ChooseNewProfile(BOOL bShowForMultipleProfilesOnly, const char *szDefaultProfile);
-static MRESULT EXPENTRY ChooseProfileDlgProc(HWND, ULONG, MPARAM, MPARAM);
-
-// Global variables
-static UINT gDialogCount = 0;
-static BOOL gProfileSwitch = FALSE;
-static HMODULE ghInstanceResources = NULL;
-static char gFirstURL[1024];
-
-// A list of URLs to populate the URL drop down list with
-static const CHAR *gDefaultURLs[] = 
-{
-    ("http://www.mozilla.org/"),
-    ("http://www.netscape.com/"),
-    ("http://browsertest.web.aol.com/tests/javascript/javascpt/index.htm"),
-    ("http://127.0.0.1/"),
-    ("http://www.yahoo.com/"),
-    ("http://www.travelocity.com/"),
-    ("http://www.disney.com/"),
-    ("http://www.go.com/"),
-    ("http://www.google.com/"),
-    ("http://www.ebay.com/"),
-    ("http://www.shockwave.com/"),
-    ("http://www.slashdot.org/"),
-    ("http://www.quicken.com/"),
-    ("http://www.hotmail.com/"),
-    ("http://www.cnn.com/"),
-    ("http://www.javasoft.com/")
-};
-
-class ProfileChangeObserver : public nsIObserver,
-                              public nsSupportsWeakReference
-
-{
-public:
-	 ProfileChangeObserver();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIOBSERVER
-};
-
-
-int main(int argc, char *argv[])
-{
-    printf("You are embedded, man!\n\n");
-
-    // Sophisticated command-line parsing in action
-    char *szFirstURL = "http://www.mozilla.org/projects/embedding";
-    char *szDefaultProfile = nsnull;
-    int argn;
-    for (argn = 1; argn < argc; argn++)
-    {
-        if (stricmp("-P", argv[argn]) == 0)
-        {
-            if (argn + 1 < argc)
-            {
-                szDefaultProfile = argv[++argn];
-            }
-        }
-        else
-        {
-            szFirstURL = argv[argn];
-        }
-    }
-    strncpy(gFirstURL, szFirstURL, sizeof(gFirstURL) - 1);
-
-    // Initialize global strings
-    CHAR szTitle[MAX_LOADSTRING];
-    WinLoadString((HAB)0, ghInstanceResources, IDS_APP_TITLE, MAX_LOADSTRING, szTitle);
-    MyRegisterClass();
-
-    // Init Embedding APIs
-    NS_InitEmbedding(nsnull, nsnull, kPStaticModules, kStaticModuleCount);
-
-    // Choose the new profile
-    if (!ChooseNewProfile(TRUE, szDefaultProfile))
-    {
-        NS_TermEmbedding();
-        return 1;
-    }
-    MPARAM rv;
-    {    
-    	// Now register an observer to watch for profile changes
-        nsCOMPtr<nsIObserverService> observerService(do_GetService("@mozilla.org/observer-service;1"));
-
-        ProfileChangeObserver *observer = new ProfileChangeObserver;
-        observer->AddRef();
-        observerService->AddObserver(static_cast<nsIObserver *>(observer), "profile-approve-change", PR_TRUE);
-        observerService->AddObserver(static_cast<nsIObserver *>(observer), "profile-change-teardown", PR_TRUE);
-        observerService->AddObserver(static_cast<nsIObserver *>(observer), "profile-after-change", PR_TRUE);
-
-        InitializeWindowCreator();
-
-        // Open the initial browser window
-        OpenWebPage(gFirstURL);
-
-        // Main message loop.
-        // NOTE: We use a fake event and a timeout in order to process idle stuff for
-        //       Mozilla every 1/10th of a second.
-        PRBool runCondition = PR_TRUE;
-
-        rv = (MPARAM)RunEventLoop(runCondition);
-
-        observer->Release();
-    }
-    // Close down Embedding APIs
-    NS_TermEmbedding();
-
-    return (int)rv;
-}
-
-//-----------------------------------------------------------------------------
-// ProfileChangeObserver
-//-----------------------------------------------------------------------------
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(ProfileChangeObserver, nsIObserver, nsISupportsWeakReference)
-
-ProfileChangeObserver::ProfileChangeObserver()
-{
-}
-
-// ---------------------------------------------------------------------------
-//  CMfcEmbedApp : nsIObserver
-// ---------------------------------------------------------------------------
-
-NS_IMETHODIMP ProfileChangeObserver::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData)
-{
-    nsresult rv = NS_OK;
-
-    if (nsCRT::strcmp(aTopic, "profile-approve-change") == 0)
-    {
-		// The profile is about to change!
-
-        // Ask the user if they want to
-        int result = ::WinMessageBox(HWND_DESKTOP, NULL, "Do you want to close all windows in order to switch the profile?", "Confirm", 101, MB_YESNO | MB_ICONQUESTION);
-        if (result != MBID_YES)
-        {
-            nsCOMPtr<nsIProfileChangeStatus> status = do_QueryInterface(aSubject);
-            NS_ENSURE_TRUE(status, NS_ERROR_FAILURE);
-            status->VetoChange();
-        }
-    }
-    else if (nsCRT::strcmp(aTopic, "profile-change-teardown") == 0)
-    {
-		// The profile is changing!
-
-		// Prevent WM_QUIT by incrementing the dialog count
-		gDialogCount++;
-    }
-    else if (nsCRT::strcmp(aTopic, "profile-after-change") == 0)
-    {
-		// Decrease the dialog count so WM_QUIT can once more happen
-		gDialogCount--;
-        if (gDialogCount == 0)
-        {
-            // All the dialogs have been torn down so open new page
-            OpenWebPage(gFirstURL);
-        }
-        else
-        {
-		    // The profile has changed, but dialogs are still being
-            // torn down. Set this flag so when the last one goes
-            // it can finish the switch.
-            gProfileSwitch = TRUE;
-        }
-    }
-
-    return rv;
-}
-
-/* InitializeWindowCreator creates and hands off an object with a callback
-   to a window creation function. This is how all new windows are opened,
-   except any created directly by the embedding app. */
-nsresult InitializeWindowCreator()
-{
-    // create an nsWindowCreator and give it to the WindowWatcher service
-    WindowCreator *creatorCallback = new WindowCreator();
-    if (creatorCallback)
-    {
-        nsCOMPtr<nsIWindowCreator> windowCreator(static_cast<nsIWindowCreator *>(creatorCallback));
-        if (windowCreator)
-        {
-            nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
-            if (wwatch)
-            {
-                wwatch->SetWindowCreator(windowCreator);
-                return NS_OK;
-            }
-        }
-    }
-    return NS_ERROR_FAILURE;
-}
-
-//-----------------------------------------------------------------------------
-
-//
-//  FUNCTION: OpenWebPage()
-//
-//  PURPOSE: Opens a new browser dialog and starts it loading to the
-//           specified url.
-//
-nsresult OpenWebPage(const char *url)
-{
-    nsresult  rv;
-
-    // Create the chrome object. Note that it leaves this function
-    // with an extra reference so that it can released correctly during
-    // destruction (via Win32UI::Destroy)
-
-    nsCOMPtr<nsIWebBrowserChrome> chrome;
-    rv = CreateBrowserWindow(nsIWebBrowserChrome::CHROME_ALL,
-           nsnull, getter_AddRefs(chrome));
-    if (NS_SUCCEEDED(rv))
-    {
-        // Start loading a page
-        nsCOMPtr<nsIWebBrowser> newBrowser;
-        chrome->GetWebBrowser(getter_AddRefs(newBrowser));
-        nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(newBrowser));
-        return webNav->LoadURI(NS_ConvertASCIItoUTF16(url).get(),
-                               nsIWebNavigation::LOAD_FLAGS_NONE,
-                               nsnull,
-                               nsnull,
-                               nsnull);
-    }
-
-    return rv;
-}   
-
-//
-//  FUNCTION: GetBrowserFromChrome()
-//
-//  PURPOSE: Returns the HWND for the webbrowser container associated
-//           with the specified chrome.
-//
-HWND GetBrowserFromChrome(nsIWebBrowserChrome *aChrome)
-{
-    if (!aChrome)
-    {
-        return NULL;
-    }
-    nsCOMPtr<nsIEmbeddingSiteWindow> baseWindow = do_QueryInterface(aChrome);
-    HWND hwnd = NULL;
-    baseWindow->GetSiteWindow((void **) & hwnd);
-    return hwnd;
-}
-
-
-//
-//  FUNCTION: GetBrowserDlgFromChrome()
-//
-//  PURPOSE: Returns the HWND for the browser dialog associated with
-//           the specified chrome.
-//
-HWND GetBrowserDlgFromChrome(nsIWebBrowserChrome *aChrome)
-{
-    return WinQueryWindow(GetBrowserFromChrome(aChrome), QW_PARENT);
-}
-
-
-//
-//  FUNCTION: SaveWebPage()
-//
-//  PURPOSE: Saves the contents of the web page to a file
-//
-void SaveWebPage(HWND hDlg, nsIWebBrowser *aWebBrowser)
-{
-    // Use the browser window title as the initial file name
-    nsCOMPtr<nsIBaseWindow> webBrowserAsWin = do_QueryInterface(aWebBrowser);
-    nsXPIDLString windowTitle;
-    webBrowserAsWin->GetTitle(getter_Copies(windowTitle));
-    nsCString fileName; fileName.AssignWithConversion(windowTitle);
-
-	// Sanitize the title of all illegal characters
-    fileName.CompressWhitespace();     // Remove whitespace from the ends
-    fileName.StripChars("\\*|:\"><?"); // Strip illegal characters
-    fileName.ReplaceChar('.', L'_');   // Dots become underscores
-    fileName.ReplaceChar('/', L'-');   // Forward slashes become hyphens
-    fileName.ReplaceChar(' ', L'_');   // Spaces become underscores
-
-    // Initialize the file save as information structure
-    FILEDLG saveFileNameInfo;
-    memset(&saveFileNameInfo, 0, sizeof(saveFileNameInfo));
-    saveFileNameInfo.cbSize = sizeof(saveFileNameInfo);
-    PL_strncpyz(saveFileNameInfo.szFullFile, fileName.get(), CCHMAXPATH);
-    strcat(saveFileNameInfo.szFullFile, ".html");
-
-    PSZ *apszTypeList = (PSZ *)malloc(3 * sizeof(PSZ) + 1);
-    apszTypeList[0] = "Web Page, HTML Only (*.htm;*.html)";
-    apszTypeList[1] = "Web Page, Complete (*.htm;*.html)";
-    apszTypeList[2] = "Text File (*.txt)";
-    apszTypeList[3] = 0;
-    saveFileNameInfo.papszITypeList = (PAPSZ)apszTypeList; 
-    saveFileNameInfo.pszTitle = NULL; 
-    saveFileNameInfo.fl = FDS_SAVEAS_DIALOG | FDS_CENTER | FDS_ENABLEFILELB; 
-    saveFileNameInfo.pszIType = apszTypeList[0];
-
-    WinFileDlg(HWND_DESKTOP, hDlg, &saveFileNameInfo);
-    if (saveFileNameInfo.lReturn == DID_OK)  
-    {
-        char *pszDataPath = NULL;
-        static char szDataFile[_MAX_PATH];
-        char szDataPath[_MAX_PATH];
-        char drive[_MAX_DRIVE];
-        char dir[_MAX_DIR];
-        char fname[_MAX_FNAME];
-        char ext[_MAX_EXT];
-
-        _splitpath(saveFileNameInfo.szFullFile, drive, dir, fname, ext);
-        //add the extension to the filename if there is no extension already
-        if (strcmp(ext, "") == 0) {
-          if ((saveFileNameInfo.sEAType == 2) && (stricmp(ext, ".txt") != 0)) {
-            strcat(saveFileNameInfo.szFullFile, ".txt");
-            strcpy(ext, ".txt");
-          } else 
-            if ((stricmp(ext, ".html") != 0) && (stricmp(ext, ".htm") != 0)) {
-              strcat(saveFileNameInfo.szFullFile, ".html");
-              strcpy(ext, ".html");
-          }
-        }
-
-        // Does the user want to save the complete document including
-        // all frames, images, scripts, stylesheets etc. ?
-        if (saveFileNameInfo.sEAType == 1) //apszTypeList[1] means save everything
-        {
-            sprintf(szDataFile, "%s_files", fname);
-            _makepath(szDataPath, drive, dir, szDataFile, "");
-
-            pszDataPath = szDataPath;
-       }
-
-        // Save away
-        nsCOMPtr<nsIWebBrowserPersist> persist(do_QueryInterface(aWebBrowser));
-
-        nsCOMPtr<nsILocalFile> file;
-        NS_NewNativeLocalFile(nsDependentCString(saveFileNameInfo.szFullFile), TRUE, getter_AddRefs(file));
-
-        nsCOMPtr<nsILocalFile> dataPath;
-        if (pszDataPath)
-        {
-            NS_NewNativeLocalFile(nsDependentCString(pszDataPath), TRUE, getter_AddRefs(dataPath));
-        }
-
-        persist->SaveDocument(nsnull, file, dataPath, nsnull, 0, 0);
-    }
-    if (saveFileNameInfo.papszFQFilename) 
-       WinFreeFileDlgList(saveFileNameInfo.papszFQFilename);
-    for (int i = 0; i < 3; i++)
-       free(saveFileNameInfo.papszITypeList[i]);
-    free(saveFileNameInfo.papszITypeList);
-}
-
-
-//
-//  FUNCTION: ResizeEmbedding()
-//
-//  PURPOSE: Resizes the webbrowser window to fit its container.
-//
-nsresult ResizeEmbedding(nsIWebBrowserChrome* chrome)
-{
-    if (!chrome)
-        return NS_ERROR_FAILURE;
-    
-    nsCOMPtr<nsIEmbeddingSiteWindow> embeddingSite = do_QueryInterface(chrome);
-    HWND hWnd;
-	embeddingSite->GetSiteWindow((void **) & hWnd);
-    
-    if (!hWnd)
-        return NS_ERROR_NULL_POINTER;
-    
-    RECTL rect;
-    WinQueryWindowRect(hWnd, &rect);
-    
-    // Make sure the browser is visible and sized
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    chrome->GetWebBrowser(getter_AddRefs(webBrowser));
-    nsCOMPtr<nsIBaseWindow> webBrowserAsWin = do_QueryInterface(webBrowser);
-    if (webBrowserAsWin)
-    {
-        webBrowserAsWin->SetPositionAndSize(rect.xLeft, 
-                                            rect.yBottom, 
-                                            rect.xRight - rect.xLeft,
-                                            rect.yTop - rect.yBottom,
-                                            PR_TRUE);
-        webBrowserAsWin->SetVisibility(PR_TRUE);
-	}
-
-    return NS_OK;
-}
-
-
-//
-//  FUNCTION: MyRegisterClass()
-//
-//  PURPOSE: Registers the window class.
-//
-//  COMMENTS:
-//
-//
-void MyRegisterClass()
-{
-    WinRegisterClass((HAB)0, szWindowClass, BrowserWndProc, CS_SIZEREDRAW, sizeof(ULONG));
-}
-
-
-//
-//  FUNCTION: UpdateUI()
-//
-//  PURPOSE: Refreshes the buttons and menu items in the browser dialog
-//
-void UpdateUI(nsIWebBrowserChrome *aChrome)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    nsCOMPtr<nsIWebNavigation> webNavigation;
-    aChrome->GetWebBrowser(getter_AddRefs(webBrowser));
-    webNavigation = do_QueryInterface(webBrowser);
-
-    PRBool canGoBack = PR_FALSE;
-    PRBool canGoForward = PR_FALSE;
-    if (webNavigation)
-    {
-        webNavigation->GetCanGoBack(&canGoBack);
-        webNavigation->GetCanGoForward(&canGoForward);
-    }
-
-    PRBool canCutSelection = PR_FALSE;
-    PRBool canCopySelection = PR_FALSE;
-    PRBool canPaste = PR_FALSE;
-
-    nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-    if (clipCmds)
-    {
-        clipCmds->CanCutSelection(&canCutSelection);
-        clipCmds->CanCopySelection(&canCopySelection);
-        clipCmds->CanPaste(&canPaste);
-    }
-
-    HWND hmenu = WinWindowFromID(hwndDlg, FID_MENU);
-    if (hmenu)
-    {
-        MENUITEM goMenu, editMenu;
-        WinSendMsg(hmenu, MM_QUERYITEM, MPFROM2SHORT(MOZ_Go, TRUE), (MPARAM)&goMenu);
-        WinEnableMenuItem(goMenu.hwndSubMenu, MOZ_GoBack, canGoBack);
-        WinEnableMenuItem(goMenu.hwndSubMenu, MOZ_GoForward, canGoForward);
-
-        WinSendMsg(hmenu, MM_QUERYITEM, MPFROM2SHORT(MOZ_Edit, TRUE), (MPARAM)&editMenu);
-        WinEnableMenuItem(editMenu.hwndSubMenu, MOZ_Cut, canCutSelection);
-        WinEnableMenuItem(editMenu.hwndSubMenu, MOZ_Copy, canCopySelection);
-        WinEnableMenuItem(editMenu.hwndSubMenu, MOZ_Paste, canPaste);
-    }
-
-    HWND button;
-    button = WinWindowFromID(hwndDlg, IDC_BACK);
-    if (button)
-      WinEnableWindow(button, canGoBack);
-    button = WinWindowFromID(hwndDlg, IDC_FORWARD);
-    if (button)
-      WinEnableWindow(button, canGoForward);
-}
-
-
-//
-//  FUNCTION: BrowserDlgProc()
-//
-//  PURPOSE: Browser dialog windows message handler.
-//
-//  COMMENTS:
-//
-//    The code for handling buttons and menu actions is here.
-//
-MRESULT EXPENTRY BrowserDlgProc(HWND hwndDlg, ULONG uMsg, MPARAM wParam, MPARAM lParam)
-{
-    if (uMsg == WM_COMMAND && SHORT1FROMMP(wParam) == MOZ_SwitchProfile)
-    {
-       ChooseNewProfile(FALSE, NULL);
-       return (MRESULT)FALSE;
-    }
-
-    // Get the browser and other pointers since they are used a lot below
-    HWND hwndBrowser = WinWindowFromID(hwndDlg, IDC_BROWSER);
-    nsIWebBrowserChrome *chrome = nsnull ;
-    if (hwndBrowser)
-    {
-        chrome = (nsIWebBrowserChrome *) WinQueryWindowULong(hwndBrowser, QWL_USER);
-    }
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    nsCOMPtr<nsIWebNavigation> webNavigation;
-    nsCOMPtr<nsIWebBrowserPrint> webBrowserPrint;
-    if (chrome)
-    {
-        chrome->GetWebBrowser(getter_AddRefs(webBrowser));
-        webNavigation = do_QueryInterface(webBrowser);
-        webBrowserPrint = do_GetInterface(webBrowser);
-    }
-
-    // Test the message
-    switch (uMsg)
-    {
-    case WM_INITDLG:
-        return (MRESULT)TRUE;
-
-    case WM_INITMENU:
-        UpdateUI(chrome);
-        return (MRESULT)TRUE;
-
-    case WM_SYSCOMMAND:
-        if (SHORT1FROMMP(wParam) == SC_CLOSE)
-        {
-            WebBrowserChromeUI::Destroy(chrome);
-            return (MRESULT)TRUE;
-        }
-        break;
-
-    case WM_DESTROY:
-	    return (MRESULT)TRUE;
-
-    case WM_COMMAND:
-        if (!webBrowser)
-        {
-            return (MRESULT)TRUE;
-        }
-
-        // Test which command was selected
-        switch (SHORT1FROMMP(wParam))
-		{
-        case IDC_ADDRESS:
-            if (SHORT1FROMMP(wParam) == CBN_EFCHANGE || SHORT1FROMMP(wParam) == CBN_LBSELECT)
-            {
-                // User has changed the address field so enable the Go button
-                WinEnableWindow(WinWindowFromID(hwndDlg, IDC_GO), TRUE);
-            }
-            break;
-
-        case IDC_GO:
-            {
-                char szURL[2048];
-                memset(szURL, 0, sizeof(szURL));
-                WinQueryDlgItemText(hwndDlg, IDC_ADDRESS, sizeof(szURL) / sizeof(szURL[0]) - 1, szURL);
-                webNavigation->LoadURI(
-                    NS_ConvertASCIItoUTF16(szURL).get(),
-                    nsIWebNavigation::LOAD_FLAGS_NONE,
-                    nsnull,
-                    nsnull,
-                    nsnull);
-            }
-            break;
-
-        case IDC_STOP:
-            webNavigation->Stop(nsIWebNavigation::STOP_ALL);
-            UpdateUI(chrome);
-            break;
-
-        case IDC_RELOAD:
-            webNavigation->Reload(nsIWebNavigation::LOAD_FLAGS_NONE);
-            break;
-
-        case IDM_EXIT:
-            WinPostMsg(hwndDlg, WM_SYSCOMMAND, MPFROMSHORT(SC_CLOSE), 0);
-            break;
-
-        // File menu commands
-
-        case MOZ_NewBrowser:
-            OpenWebPage(gFirstURL);
-            break;
-
-        case MOZ_Save:
-            SaveWebPage(hwndDlg, webBrowser);
-            break;
-
-        case MOZ_Print:
-            {
-                // NOTE: Embedding code shouldn't need to get the docshell or
-                //       contentviewer AT ALL. This code below will break one
-                //       day but will have to do until the embedding API has
-                //       a cleaner way to do the same thing.
-              if (webBrowserPrint)
-              {
-                  nsCOMPtr<nsIPrintSettings> printSettings;
-                  webBrowserPrint->GetGlobalPrintSettings(getter_AddRefs(printSettings));
-                  NS_ASSERTION(printSettings, "You can't PrintPreview without a PrintSettings!");
-                  if (printSettings) 
-                  {
-                      printSettings->SetPrintSilent(PR_TRUE);
-                      webBrowserPrint->Print(printSettings, (nsIWebProgressListener*)nsnull);
-                  }
-              }
-            }
-            break;
-
-        // Edit menu commands
-
-        case MOZ_Cut:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->CutSelection();
-            }
-            break;
-
-        case MOZ_Copy:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->CopySelection();
-            }
-            break;
-
-        case MOZ_Paste:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->Paste();
-            }
-            break;
-
-        case MOZ_SelectAll:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->SelectAll();
-            }
-            break;
-
-        case MOZ_SelectNone:
-            {
-                nsCOMPtr<nsIClipboardCommands> clipCmds = do_GetInterface(webBrowser);
-                clipCmds->SelectNone();
-            }
-            break;
-
-        // Go menu commands
-        case IDC_BACK:
-        case MOZ_GoBack:
-            webNavigation->GoBack();
-            UpdateUI(chrome);
-            break;
-
-        case IDC_FORWARD:
-        case MOZ_GoForward:
-            webNavigation->GoForward();
-            UpdateUI(chrome);
-            break;
-
-        // Help menu commands
-        case MOZ_About:
-            {
-                char szAboutTitle[MAX_LOADSTRING];
-                char szAbout[MAX_LOADSTRING];
-                WinLoadString((HAB)0, ghInstanceResources, IDS_ABOUT_TITLE, MAX_LOADSTRING, szAboutTitle);
-                WinLoadString((HAB)0, ghInstanceResources, IDS_ABOUT, MAX_LOADSTRING, szAbout);
-                WinMessageBox(HWND_DESKTOP, NULL, szAbout, szAboutTitle, 0, MB_OK | MB_APPLMODAL);
-            }
-            break;
-		}
-
-	    return (MRESULT)TRUE;
-
-    case WM_ACTIVATE:
-        {
-            nsCOMPtr<nsIWebBrowserFocus> focus(do_GetInterface(webBrowser));
-            if(focus)
-            {
-                switch (SHORT1FROMMP(wParam))
-                {
-                case TRUE: //WA_ACTIVE:
-                    focus->Activate();
-                    break;
-                case FALSE: //WA_INACTIVE:
-                    focus->Deactivate();
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-        break;
-
-    case WM_ADJUSTWINDOWPOS: 
-        {
-            PSWP swp = (PSWP)wParam;
-            if (swp->fl & (SWP_SIZE)) {
-               UINT newDlgWidth = swp->cx;
-               UINT newDlgHeight = swp->cy;
-
-               // TODO Reposition the control bar - for the moment it's fixed size
-               // Reposition all buttons, combobox, status, progress bar, and browser
-               // Status bar gets any space that the fixed size progress bar doesn't use.
-               // Address combobox gets any space not used by buttons and 'Address:'
-               int progressWidth, statusWidth, addressWidth, goWidth, forwardWidth, reloadWidth, stopWidth, backWidth, staticWidth;
-               int statusHeight, backHeight, buttonHeight, addressHeight, comboboxHeight;
-
-               HWND hwndStatus = WinWindowFromID(hwndDlg, IDC_STATUS);
-               if (hwndStatus) {
-                 RECTL rcStatus;
-                 WinQueryWindowRect(hwndStatus, &rcStatus);
-                 statusHeight = rcStatus.yTop - rcStatus.yBottom;
-               } else
-                 statusHeight = 0;
-   
-               HWND hwndProgress = WinWindowFromID(hwndDlg, IDC_PROGRESS);
-               if (hwndProgress) {
-                 RECTL rcProgress;
-                 WinQueryWindowRect(hwndProgress, &rcProgress);
-                 progressWidth = rcProgress.xRight - rcProgress.xLeft;
-               } else
-                 progressWidth = 0;
-               statusWidth = newDlgWidth - progressWidth;
-   
-               HWND hwndBack = WinWindowFromID(hwndDlg, IDC_BACK);
-               if (hwndBack) {
-                 RECTL rcBack;
-                 WinQueryWindowRect(hwndBack, &rcBack);
-                 backHeight = rcBack.yTop - rcBack.yBottom;
-                 backWidth = rcBack.xRight - rcBack.xLeft;
-               } else {
-                 backHeight = 0;
-                 backWidth = 0;
-               }
-               buttonHeight = newDlgHeight - backHeight - 50;//24;
-
-               HWND hwndForward = WinWindowFromID(hwndDlg, IDC_FORWARD);
-               if (hwndForward) {
-                 RECTL rcForward;
-                 WinQueryWindowRect(hwndForward, &rcForward);
-                 forwardWidth = rcForward.xRight - rcForward.xLeft;
-               } else
-                 forwardWidth = 0;
-
-               HWND hwndReload = WinWindowFromID(hwndDlg, IDC_RELOAD);
-               if (hwndReload) {
-                 RECTL rcReload;
-                 WinQueryWindowRect(hwndReload, &rcReload);
-                 reloadWidth = rcReload.xRight - rcReload.xLeft;
-               } else
-                 reloadWidth = 0;
-
-               HWND hwndStop = WinWindowFromID(hwndDlg, IDC_STOP);
-               if (hwndStop) {
-                 RECTL rcStop;
-                 WinQueryWindowRect(hwndStop, &rcStop);
-                 stopWidth = rcStop.xRight - rcStop.xLeft;
-               } else
-                 stopWidth = 0;
-
-               HWND hwndStatic = WinWindowFromID(hwndDlg, IDC_ADDRESSLABEL);
-               if (hwndStatic) {
-                 RECTL rcStatic;
-                 WinQueryWindowRect(hwndStatic, &rcStatic);
-                 staticWidth = rcStatic.xRight - rcStatic.xLeft;
-               } else
-                 staticWidth = 0;
-
-               HWND hwndGo = WinWindowFromID(hwndDlg, IDC_GO);
-               if (hwndGo) {
-                 RECTL rcGo;
-                 WinQueryWindowRect(hwndGo, &rcGo);
-                 goWidth = rcGo.xRight - rcGo.xLeft;
-               } else
-                 goWidth = 0;
-
-               HWND hwndAddress = WinWindowFromID(hwndDlg, IDC_ADDRESS);
-               if (hwndAddress) {
-                 RECTL rcAddress;
-                 WinQueryWindowRect(hwndAddress, &rcAddress);
-                 addressHeight = rcAddress.yTop - rcAddress.yBottom;
-                 comboboxHeight = buttonHeight + backHeight - addressHeight;
-               } else {
-                 addressHeight = 0;
-                 comboboxHeight = 0;
-               }
-               addressWidth = newDlgWidth - goWidth - backWidth - forwardWidth - reloadWidth - stopWidth - staticWidth - 15;
-
-               if (hwndStatus)
-                 WinSetWindowPos(hwndStatus,
-                                 HWND_TOP,
-                                 0, 0, 
-                                 statusWidth,
-                                 statusHeight,
-                                 SWP_MOVE | SWP_SIZE | SWP_SHOW);
-               if (hwndProgress)
-                 WinSetWindowPos(hwndProgress,
-                                 HWND_TOP,
-                                 statusWidth, 0, 
-                                 0, 0,
-                                 SWP_MOVE | SWP_SHOW);
-               if (hwndBack)
-                 WinSetWindowPos(hwndBack,
-                                 HWND_TOP,
-                                 2, buttonHeight,
-                                 0, 0,
-                                 SWP_MOVE | SWP_SHOW);
-               if (hwndForward)
-                 WinSetWindowPos(hwndForward,
-                                 HWND_TOP,
-                                 2 + backWidth, buttonHeight, 
-                                 0, 0,
-                                 SWP_MOVE | SWP_SHOW);
-               if (hwndReload)
-                 WinSetWindowPos(hwndReload,
-                                 HWND_TOP,
-                                 4 + backWidth + forwardWidth, buttonHeight,
-                                 0, 0,
-                                 SWP_MOVE | SWP_SHOW);
-               if (hwndStop)
-                 WinSetWindowPos(hwndStop,
-                                 HWND_TOP,
-                                 5 + backWidth + forwardWidth + reloadWidth, buttonHeight, 
-                                 0, 0,
-                                 SWP_MOVE | SWP_SHOW);
-               if (hwndStatic)
-                 WinSetWindowPos(hwndStatic,
-                                 HWND_TOP,
-                                 9 + backWidth + forwardWidth + reloadWidth + stopWidth, buttonHeight + 3,
-                                 0, 0,
-                                 SWP_MOVE | SWP_SHOW);
-               if (hwndAddress)
-                 WinSetWindowPos(hwndAddress,
-                                 HWND_TOP,
-                                 12 + backWidth + forwardWidth + reloadWidth + stopWidth + staticWidth, comboboxHeight,
-                                 addressWidth, addressHeight,
-                                 SWP_MOVE | SWP_SIZE | SWP_SHOW);
-               if (hwndGo)
-                 WinSetWindowPos(hwndGo,
-                                 HWND_TOP,
-                                 13 + backWidth + forwardWidth + reloadWidth + stopWidth + staticWidth + addressWidth, buttonHeight,
-                                 0, 0,
-                                 SWP_MOVE | SWP_SHOW);
-
-               // Resize the browser area (assuming the browser is
-               // sandwiched between the control bar and status area)
-               WinSetWindowPos(hwndBrowser,
-                               HWND_TOP,
-                               2, statusHeight,
-                               newDlgWidth - 4,
-                               newDlgHeight - backHeight - statusHeight - 52,
-                               SWP_MOVE | SWP_SIZE | SWP_SHOW);
-            }
-        }
-        return (MRESULT)TRUE;
-    }
-    return WinDefDlgProc(hwndDlg, uMsg, wParam, lParam);
-}
-
-
-//
-//  FUNCTION: BrowserWndProc(HWND, unsigned, WORD, LONG)
-//
-//  PURPOSE:  Processes messages for the browser container window.
-//
-MRESULT EXPENTRY BrowserWndProc(HWND hWnd, ULONG message, MPARAM wParam, MPARAM lParam)
-{
-    nsIWebBrowserChrome *chrome = (nsIWebBrowserChrome *) WinQueryWindowULong(hWnd, QWL_USER);
-	switch (message) 
-	{
-    case WM_SIZE:
-        // Resize the embedded browser
-        ResizeEmbedding(chrome);
-        return (MRESULT)0;
-    case WM_ERASEBACKGROUND:
-        // Reduce flicker by not painting the non-visible background
-        return (MRESULT)1;
-    }
-    return WinDefWindowProc(hWnd, message, wParam, lParam);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Profile chooser dialog
-
-
-//
-//  FUNCTION: ChooseNewProfile()
-//
-//  PURPOSE: Allows the user to select a new profile from a list.
-//           The bShowForMultipleProfilesOnly argument specifies whether the
-//           function should automatically select the first profile and return
-//           without displaying a dialog box if there is only one profile to
-//           select.
-//
-BOOL ChooseNewProfile(BOOL bShowForMultipleProfilesOnly, const char *szDefaultProfile)
-{
-    nsresult rv;
-    nsCOMPtr<nsIProfile> profileService = 
-             do_GetService(NS_PROFILE_CONTRACTID, &rv);
-    if (NS_FAILED(rv))
-    {
-        return FALSE;
-    }
-
-    if (szDefaultProfile)
-    {
-        // Make a new default profile
-        nsAutoString newProfileName; newProfileName.AssignWithConversion(szDefaultProfile);
-        rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE);
-        if (NS_FAILED(rv)) return FALSE;
-        rv = profileService->SetCurrentProfile(newProfileName.get());
-        if (NS_FAILED(rv)) return FALSE;
-        return TRUE;
-    }
-
-    PRInt32 profileCount = 0;
-    rv = profileService->GetProfileCount(&profileCount);
-    if (profileCount == 0)
-    {
-        // Make a new default profile
-        NS_NAMED_LITERAL_STRING(newProfileName, "os2Embed");
-        rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE);
-        if (NS_FAILED(rv)) return FALSE;
-        rv = profileService->SetCurrentProfile(newProfileName.get());
-        if (NS_FAILED(rv)) return FALSE;
-        return TRUE;
-    }
-    else if (profileCount == 1 && bShowForMultipleProfilesOnly)
-    {
-        // GetCurrentProfile returns the profile which was last used but is not nescesarily
-        // active. Call SetCurrentProfile to make it installed and active.
-        
-        nsXPIDLString   currProfileName;
-        rv = profileService->GetCurrentProfile(getter_Copies(currProfileName));
-        if (NS_FAILED(rv)) return FALSE;
-        rv = profileService->SetCurrentProfile(currProfileName);
-        if (NS_FAILED(rv)) return FALSE;
-        return TRUE;
-    }
-
-    INT nResult;
-    nResult = WinDlgBox(HWND_DESKTOP, HWND_DESKTOP, (PFNWP)ChooseProfileDlgProc, NULL, IDD_CHOOSEPROFILE, (PVOID)ghInstanceResources);
-    return (nResult == DID_OK) ? TRUE : FALSE;
-}
-
-
-//
-//  FUNCTION: ChooseProfileDlgProc(HWND, unsigned, WORD, LONG)
-//
-//  PURPOSE:  Dialog handler procedure for the open uri dialog.
-//
-MRESULT EXPENTRY ChooseProfileDlgProc(HWND hDlg, ULONG message, MPARAM wParam, MPARAM lParam)
-{
-    nsresult rv;
-	switch (message)
-	{
-	case WM_INITDLG:
-        {
-            WinSetActiveWindow(HWND_DESKTOP, hDlg);
-            HWND hwndProfileList = WinWindowFromID(hDlg, IDC_PROFILELIST);
-
-            nsCOMPtr<nsIProfile> profileService = 
-                     do_GetService(NS_PROFILE_CONTRACTID, &rv);
-
-            // Get the list of profile names and add them to the list box
-            PRUint32 listLen = 0;
-            PRUnichar **profileList = nsnull;
-            rv = profileService->GetProfileList(&listLen, &profileList);
-            for (PRUint32 index = 0; index < listLen; index++)
-            {
-#ifdef UNICODE
-                WinSendMsg(hwndProfileList, LM_INSERTITEM, (MPARAM)LIT_END, (MPARAM) profileList[index]);
-#else
-                nsCAutoString profile; profile.AssignWithConversion(profileList[index]);
-                WinSendMsg(hwndProfileList, LM_INSERTITEM, (MPARAM)LIT_END, (MPARAM) profile.get());
-#endif
-            }
-
-            // Select the current profile (if there is one)
-
-            // Get the current profile
-#ifdef UNICODE
-            nsXPIDLString currProfile;
-            profileService->GetCurrentProfile(getter_Copies(currProfile));
-#else
-            nsXPIDLString currProfileUnicode;
-            profileService->GetCurrentProfile(getter_Copies(currProfileUnicode));
-            nsCAutoString currProfile; currProfile.AssignWithConversion(currProfileUnicode);
-#endif
-
-            // Now find and select it
-            LONG currentProfileIndex = LIT_ERROR;
-            currentProfileIndex = (LONG)WinSendMsg(hwndProfileList, LM_SEARCHSTRING, MPFROM2SHORT(LSS_CASESENSITIVE, LIT_FIRST), (MPARAM) currProfile.get());
-            if (currentProfileIndex != LIT_ERROR)
-            {
-                WinSendMsg(hwndProfileList, LM_SELECTITEM, (MPARAM)currentProfileIndex, (MPARAM)TRUE);
-            }
-        
-		return (MRESULT)TRUE;
-        }
-     case WM_COMMAND:
-        if (SHORT1FROMMP(wParam) == DID_OK)
-        {
-            HWND hwndProfileList = WinWindowFromID(hDlg, IDC_PROFILELIST);
-
-            // Get the selected profile from the list box and make it current
-            LONG currentProfileIndex = (LONG)WinSendMsg(hwndProfileList, LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0);
-            if (currentProfileIndex != LIT_ERROR)
-            {
-                nsCOMPtr<nsIProfile> profileService = 
-                         do_GetService(NS_PROFILE_CONTRACTID, &rv);
-                // Convert TCHAR name to unicode and make it current
-                INT profileNameLen = (INT)WinSendMsg(hwndProfileList, LM_QUERYITEMTEXTLENGTH, (MPARAM)currentProfileIndex, 0);
-                char *profileName = new char[profileNameLen + 1];
-                WinSendMsg(hwndProfileList, LM_QUERYITEMTEXT, MPFROM2SHORT(currentProfileIndex, profileNameLen + 1) ,(MPARAM)profileName);
-                nsAutoString newProfile; newProfile.AssignWithConversion(profileName);
-                rv = profileService->SetCurrentProfile(newProfile.get());
-            }
-	        WinDismissDlg(hDlg, DID_OK);
-        }
-		else if (SHORT1FROMMP(wParam) == DID_CANCEL)
-		{
-	        WinDismissDlg(hDlg, SHORT1FROMMP(wParam));
-		}
-        return (MRESULT)TRUE;
-	}
-
-    return WinDefDlgProc(hDlg, message, wParam, lParam);
-}
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-// WebBrowserChromeUI
-
-//
-//  FUNCTION: CreateNativeWindow()
-//
-//  PURPOSE: Creates a new browser dialog.
-//
-//  COMMENTS:
-//
-//    This function loads the browser dialog from a resource template
-//    and returns the HWND for the webbrowser container dialog item
-//    to the caller.
-//
-nativeWindow WebBrowserChromeUI::CreateNativeWindow(nsIWebBrowserChrome* chrome)
-{
-  // Load the browser dialog from resource
-  HWND hwndDialog;
-  PRUint32 chromeFlags;
-
-  chrome->GetChromeFlags(&chromeFlags);
-  if ((chromeFlags & nsIWebBrowserChrome::CHROME_ALL) == nsIWebBrowserChrome::CHROME_ALL)
-    hwndDialog = WinLoadDlg(HWND_DESKTOP, HWND_DESKTOP, BrowserDlgProc, ghInstanceResources, IDD_BROWSER, NULL);
-  else
-    hwndDialog = WinLoadDlg(HWND_DESKTOP, HWND_DESKTOP, BrowserDlgProc, ghInstanceResources, IDD_BROWSER_NC, NULL);
-  if (!hwndDialog)
-    return NULL;
-
-  // Stick a menu onto it
-  if (chromeFlags & nsIWebBrowserChrome::CHROME_MENUBAR) {
-    HWND hmenuDlg = WinLoadMenu(hwndDialog, 0, IDC_OS2EMBED);
-    WinSendMsg(hwndDialog, WM_UPDATEFRAME, MPFROMLONG(FCF_MENU), 0);
-  } else
-    WinSendMsg(hwndDialog, WM_UPDATEFRAME, 0, 0);
-
-  // Add some interesting URLs to the address drop down
-  HWND hwndAddress = WinWindowFromID(hwndDialog, IDC_ADDRESS);
-  if (hwndAddress) {
-    for (int i = 0; i < sizeof(gDefaultURLs) / sizeof(gDefaultURLs[0]); i++)
-    {
-      WinSendMsg(hwndAddress, LM_INSERTITEM, (MPARAM)LIT_SORTASCENDING, (MPARAM)gDefaultURLs[i]);
-    }
-  }
-
-  // Fetch the browser window handle
-  HWND hwndBrowser = WinWindowFromID(hwndDialog, IDC_BROWSER);
-  WinSetWindowULong(hwndBrowser, QWL_USER, (ULONG)chrome);  // save the browser LONG_PTR.
-  WinSetWindowULong(hwndBrowser, QWL_STYLE, WinQueryWindowULong(hwndBrowser, QWL_STYLE) | WS_CLIPCHILDREN);
-
-  // Activate the window
-  WinPostMsg(hwndDialog, WM_ACTIVATE, MPFROMSHORT(TRUE), (MPARAM)0);
-
-  gDialogCount++;
-
-  return (void *)hwndBrowser;
-}
-
-
-//
-// FUNCTION: Destroy()
-//
-// PURPOSE: Destroy the window specified by the chrome
-//
-void WebBrowserChromeUI::Destroy(nsIWebBrowserChrome* chrome)
-{
-  nsCOMPtr<nsIWebBrowser> webBrowser;
-  nsCOMPtr<nsIWebNavigation> webNavigation;
-
-  chrome->GetWebBrowser(getter_AddRefs(webBrowser));
-  webNavigation = do_QueryInterface(webBrowser);
-  if (webNavigation)
-    webNavigation->Stop(nsIWebNavigation::STOP_ALL);
-
-  chrome->ExitModalEventLoop(NS_OK);
-
-  HWND hwndDlg = GetBrowserDlgFromChrome(chrome);
-  if (hwndDlg == NULL)
-    return;
-
-  // Explicitly destroy the embedded browser and then the chrome
-
-  // First the browser
-  nsCOMPtr<nsIWebBrowser> browser = nsnull;
-  chrome->GetWebBrowser(getter_AddRefs(browser));
-  nsCOMPtr<nsIBaseWindow> browserAsWin = do_QueryInterface(browser);
-  if (browserAsWin)
-    browserAsWin->Destroy();
-
-      // Now the chrome
-  chrome->SetWebBrowser(nsnull);
-  NS_RELEASE(chrome);
-}
-
-
-//
-// FUNCTION: Called as the final act of a chrome object during its destructor
-//
-void WebBrowserChromeUI::Destroyed(nsIWebBrowserChrome* chrome)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(chrome);
-	if (hwndDlg == NULL)
-	{
-		return;
-	}
-
-    // Clear the window user data
-    HWND hwndBrowser = WinWindowFromID(hwndDlg, IDC_BROWSER);
-    WinSetWindowULong(hwndBrowser, QWL_USER, nsnull);
-    WinDestroyWindow(hwndBrowser);
-    WinDestroyWindow(hwndDlg);
-
-    --gDialogCount;
-    if (gDialogCount == 0)
-    {
-        if (gProfileSwitch)
-        {
-            gProfileSwitch = FALSE;
-            OpenWebPage(gFirstURL);
-        }
-        else
-        {
-            // Quit when there are no more browser objects
-            WinPostQueueMsg(0, WM_QUIT, 0, 0);
-        }
-    }
-}
-
-
-//
-// FUNCTION: Set the input focus onto the browser window
-//
-void WebBrowserChromeUI::SetFocus(nsIWebBrowserChrome *chrome)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(chrome);
-	if (hwndDlg == NULL)
-	{
-		return;
-	}
-    
-    HWND hwndBrowser = WinWindowFromID(hwndDlg, IDC_BROWSER);
-    ::WinSetFocus(HWND_DESKTOP, hwndBrowser);
-}
-
-//
-//  FUNCTION: UpdateStatusBarText()
-//
-//  PURPOSE: Set the status bar text.
-//
-void WebBrowserChromeUI::UpdateStatusBarText(nsIWebBrowserChrome *aChrome, const PRUnichar* aStatusText)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    nsCString status; 
-    if (aStatusText)
-        status.AssignWithConversion(aStatusText);
-    WinSetDlgItemText(hwndDlg, IDC_STATUS, status.get());
-}
-
-
-//
-//  FUNCTION: UpdateCurrentURI()
-//
-//  PURPOSE: Updates the URL address field
-//
-void WebBrowserChromeUI::UpdateCurrentURI(nsIWebBrowserChrome *aChrome)
-{
-    nsCOMPtr<nsIWebBrowser> webBrowser;
-    nsCOMPtr<nsIWebNavigation> webNavigation;
-    aChrome->GetWebBrowser(getter_AddRefs(webBrowser));
-    webNavigation = do_QueryInterface(webBrowser);
-
-    nsCOMPtr<nsIURI> currentURI;
-    webNavigation->GetCurrentURI(getter_AddRefs(currentURI));
-    if (currentURI)
-    {
-        nsCAutoString uriString;
-        currentURI->GetAsciiSpec(uriString);
-        HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-        WinSetDlgItemText(hwndDlg, IDC_ADDRESS, uriString.get());
-    }
-}
-
-
-//
-//  FUNCTION: UpdateBusyState()
-//
-//  PURPOSE: Refreshes the stop/go buttons in the browser dialog
-//
-void WebBrowserChromeUI::UpdateBusyState(nsIWebBrowserChrome *aChrome, PRBool aBusy)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    HWND button;
-    button = WinWindowFromID(hwndDlg, IDC_STOP);
-    if (button)
-        WinEnableWindow(button, aBusy);
-    button = WinWindowFromID(hwndDlg, IDC_GO);
-    if (button)
-        WinEnableWindow(button, !aBusy);
-    UpdateUI(aChrome);
-}
-
-
-//
-//  FUNCTION: UpdateProgress()
-//
-//  PURPOSE: Refreshes the progress bar in the browser dialog
-//
-void WebBrowserChromeUI::UpdateProgress(nsIWebBrowserChrome *aChrome, PRInt32 aCurrent, PRInt32 aMax)
-{
-    HWND hwndDlg = GetBrowserDlgFromChrome(aChrome);
-    HWND hwndProgress = WinWindowFromID(hwndDlg, IDC_PROGRESS);
-    if (aCurrent < 0)
-    {
-        aCurrent = 0;
-    }
-    if (aCurrent > aMax)
-    {
-        aMax = aCurrent + 20; // What to do?
-    }
-    if (hwndProgress)
-    {
-        ULONG value = (double)aCurrent/(double)aMax*(double)100;
-        WinSendMsg(hwndProgress, SLM_SETSLIDERINFO, MPFROM2SHORT(SMA_SLIDERARMPOSITION, SMA_INCREMENTVALUE), (MPARAM)(value == 100? value-1: value));
-    }
-}
-
-//
-//  FUNCTION: ShowContextMenu()
-//
-//  PURPOSE: Display a context menu for the given node
-//
-void WebBrowserChromeUI::ShowContextMenu(nsIWebBrowserChrome *aChrome, PRUint32 aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode)
-{
-    // TODO code to test context flags and display a popup menu should go here
-}
-
-//
-//  FUNCTION: ShowTooltip()
-//
-//  PURPOSE: Show a tooltip
-//
-void WebBrowserChromeUI::ShowTooltip(nsIWebBrowserChrome *aChrome, PRInt32 aXCoords, PRInt32 aYCoords, const PRUnichar *aTipText)
-{
-    // TODO code to show a tooltip should go here
-}
-
-//
-//  FUNCTION: HideTooltip()
-//
-//  PURPOSE: Hide the tooltip
-//
-void WebBrowserChromeUI::HideTooltip(nsIWebBrowserChrome *aChrome)
-{
-    // TODO code to hide a tooltip should go here
-}
-
-void WebBrowserChromeUI::ShowWindow(nsIWebBrowserChrome *aChrome, PRBool aShow)
-{
-  HWND win = GetBrowserDlgFromChrome(aChrome);
-  ::WinShowWindow(win, aShow);
-}
-
-void WebBrowserChromeUI::SizeTo(nsIWebBrowserChrome *aChrome, PRInt32 aWidth, PRInt32 aHeight)
-{
-  HWND hchrome = GetBrowserDlgFromChrome(aChrome);
-  HWND hbrowser = GetBrowserFromChrome(aChrome);
-  RECTL chromeRect, browserRect;
-
-  ::WinQueryWindowRect(hchrome,  &chromeRect);
-  ::WinQueryWindowRect(hbrowser, &browserRect);
-
-  PRInt32 decoration_x = (browserRect.xLeft - chromeRect.xLeft) + 
-                         (chromeRect.xRight - browserRect.xRight);
-  PRInt32 decoration_y = (chromeRect.yTop - browserRect.yTop) + 
-                         (browserRect.yBottom - chromeRect.yBottom);
-
-  ::WinSetWindowPos(hchrome, HWND_TOP, WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN)/2 - (aWidth+decoration_x)/2,
-                    WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN)/2 - (aHeight+decoration_y)/2, 
-                    aWidth+decoration_x, aHeight+decoration_y, SWP_SIZE | SWP_MOVE | SWP_SHOW);
-}
-
-//
-//  FUNCTION: GetResourceStringByID()
-//
-//  PURPOSE: Get the resource string for the ID
-//
-void WebBrowserChromeUI::GetResourceStringById(PRInt32 aID, char ** aReturn)
-{
-    char resBuf[MAX_LOADSTRING];
-    int retval = WinLoadString((HAB)0, ghInstanceResources, aID, sizeof(resBuf), (PSZ)resBuf );
-    if (retval != 0)
-    {
-        int resLen = strlen(resBuf);
-        *aReturn = (char *)calloc(resLen+1, sizeof(char *));
-        if (!*aReturn) return;
-            PL_strncpy(*aReturn, (char *) resBuf, resLen);
-    }
-    return;
-}
-
-//-----------------------------------------------------------------------------
-
-nsresult CreateBrowserWindow(PRUint32 aChromeFlags,
-                             nsIWebBrowserChrome *aParent,
-                             nsIWebBrowserChrome **aNewWindow)
-{
-  WebBrowserChrome * chrome = new WebBrowserChrome();
-  if (!chrome)
-    return NS_ERROR_FAILURE;
-
-  // the interface to return and one addref, which we assume will be
-  // immediately released
-  CallQueryInterface(static_cast<nsIWebBrowserChrome*>(chrome), aNewWindow);
-  // now an extra addref; the window owns itself (to be released by
-  // WebBrowserChromeUI::Destroy)
-  NS_ADDREF(*aNewWindow);
-
-  chrome->SetChromeFlags(aChromeFlags);
-  chrome->SetParent(aParent);
-
-  // Insert the browser
-  nsCOMPtr<nsIWebBrowser> newBrowser;
-  chrome->CreateBrowser(-1, -1, -1, -1, getter_AddRefs(newBrowser));
-  if (!newBrowser)
-    return NS_ERROR_FAILURE;
-
-  // Place it where we want it.
-  ResizeEmbedding(static_cast<nsIWebBrowserChrome*>(chrome));
-
-  // Subscribe new window to profile changes so it can kill itself when one happens
-  nsCOMPtr<nsIObserverService> observerService(do_GetService("@mozilla.org/observer-service;1"));
-  if (observerService)
-    observerService->AddObserver(static_cast<nsIObserver *>(chrome),
-                                 "profile-change-teardown", PR_TRUE);
-
-  // if opened as chrome, it'll be made visible after the chrome has loaded.
-  // otherwise, go ahead and show it now.
-  if (!(aChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME))
-    WebBrowserChromeUI::ShowWindow(*aNewWindow, PR_TRUE);
-
-  return NS_OK;
-}
-
-void EnableChromeWindow(nsIWebBrowserChrome *aWindow,
-                        PRBool aEnabled)
-{
-  HWND hwnd = GetBrowserDlgFromChrome(aWindow);
-  ::WinEnableWindow(hwnd, aEnabled ? TRUE : FALSE);
-}
-
-PRUint32 RunEventLoop(PRBool &aRunCondition)
-{
-  QMSG msg;
-  HEV hFakeEvent = 0; 
-  ::DosCreateEventSem(NULL, &hFakeEvent, 0L, FALSE);
-
-  while (aRunCondition ) {
-    // Process pending messages
-    while (::WinPeekMsg((HAB)0, &msg, NULL, 0, 0, PM_NOREMOVE)) {
-      if (!::WinGetMsg((HAB)0, &msg, NULL, 0, 0)) {
-        // WM_QUIT
-        aRunCondition = PR_FALSE;
-        break;
-      }
-
-      PRBool wasHandled = PR_FALSE;
-      ::NS_HandleEmbeddingEvent(msg, wasHandled);
-      if (wasHandled)
-        continue;
-
-      ::WinDispatchMsg((HAB)0, &msg);
-    }
-
-    // Do idle stuff
-    ::DosWaitEventSem(hFakeEvent, 100);
-  }
-  ::DosCloseEventSem(hFakeEvent);
-  return LONGFROMMP(msg.mp1);
-}
diff --git a/embedding/tests/os2Embed/os2Embed.h b/embedding/tests/os2Embed/os2Embed.h
deleted file mode 100644
index 201ee947c49..00000000000
--- a/embedding/tests/os2Embed/os2Embed.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prtypes.h"
-
-class nsIWebBrowserChrome;
-
-nsresult CreateBrowserWindow(PRUint32 aChromeFlags,
-                             nsIWebBrowserChrome *aParent,
-                             nsIWebBrowserChrome **aNewWindow);
-
-void     EnableChromeWindow(nsIWebBrowserChrome *aWindow, PRBool aEnabled);
-
-PRUint32 RunEventLoop(PRBool &aRunCondition);
-
diff --git a/embedding/tests/os2Embed/os2Embed.rc b/embedding/tests/os2Embed/os2Embed.rc
deleted file mode 100644
index efd366e2722..00000000000
--- a/embedding/tests/os2Embed/os2Embed.rc
+++ /dev/null
@@ -1,141 +0,0 @@
-
-#include "resource.h"
-#include "os2.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-ICON            IDI_OS2EMBED    DISCARDABLE     "os2Embed.ICO"
-ICON               IDI_SMALL    DISCARDABLE     "SMALL.ICO"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MENU IDC_OS2EMBED DISCARDABLE 
-BEGIN
-    SUBMENU "~File", MOZ_File
-    BEGIN
-        MENUITEM "New Browser...",              MOZ_NewBrowser
-        MENUITEM SEPARATOR
-        MENUITEM "Switch Profile...",           MOZ_SwitchProfile
-        MENUITEM SEPARATOR
-        MENUITEM "~Save As...",                 MOZ_Save
-        MENUITEM "Print Page",                  MOZ_Print
-        MENUITEM "E~xit",                       IDM_EXIT
-    END
-    SUBMENU "~Edit", MOZ_Edit
-    BEGIN
-        MENUITEM "Cu~t",                        MOZ_Cut
-        MENUITEM "~Copy",                       MOZ_Copy
-        MENUITEM "~Paste",                      MOZ_Paste
-        MENUITEM SEPARATOR
-        MENUITEM "Select All",                  MOZ_SelectAll
-        MENUITEM "Select None",                 MOZ_SelectNone
-    END
-    SUBMENU "~Go", MOZ_Go
-    BEGIN
-        MENUITEM "~Back",                       MOZ_GoBack
-        MENUITEM "~Forward",                    MOZ_GoForward
-    END
-    SUBMENU "~Debug", MOZ_Debug
-    BEGIN
-        MENUITEM "~This space for rent",        ID_DEBUG_THISSPACEFORRENT
-,         ,MIA_DISABLED
-    END
-    SUBMENU "~Help", MOZ_Help
-    BEGIN
-        MENUITEM "~About os2Embed...",          MOZ_About
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_APP_TITLE           "os2Embed"
-    IDS_HELLO               "Embedding Mozilla is so much fun!!"
-    IDS_ABOUT               "os2Embed - Gecko embedding sample"
-    IDS_ABOUT_TITLE         "About os2Embed"
-    IDS_HIST_BACK           "Going Back to: "
-    IDS_HIST_FORWARD        "Going Forward to: "
-    IDS_HIST_RELOAD_NORMAL  "Reloading url, (normal) :"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_HIST_RELOAD_BYPASSPROXY "Reloading url, (bypassing Proxy) :"
-    IDS_HIST_RELOAD_BYPASSCACHE "Reloading url, (bypassing cache) :"
-    IDS_HIST_ADDURL         " added to Session History"
-    IDS_HIST_RELOAD_BYPASSPROXYANDCACHE 
-                            "Reloading url, (bypassing Proxy and cache) :"
-    IDS_HIST_PURGE          "purged from session history"
-    IDS_HIST_GOTO           "Going to history index : "
-    IDS_HIST_URL            " URL : "
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-DLGTEMPLATE IDD_BROWSER DISCARDABLE  
-BEGIN
-  DIALOG "os2Embed sample - UNSUPPORTED", IDD_BROWSER, 0, 90, 500, 217,
-  WS_VISIBLE | WS_CLIPSIBLINGS | NOT FS_DLGBORDER | FS_SIZEBORDER | FS_SCREENALIGN,
-  FCF_TITLEBAR | FCF_SYSMENU | FCF_MINBUTTON | FCF_MAXBUTTON 
-  BEGIN
-    PUSHBUTTON    "Back",           IDC_BACK,   2, 193,  27,  13
-    PUSHBUTTON    "Forward",     IDC_FORWARD,  29, 193,  41,  13
-    PUSHBUTTON    "Reload",       IDC_RELOAD,  72, 193,  35,  13
-    PUSHBUTTON    "Stop",           IDC_STOP, 108, 193,  32,  13             
-    LTEXT         "Address:",     IDC_ADDRESSLABEL, 144, 196,  35,   8, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
-    COMBOBOX      "",            IDC_ADDRESS, 182, 154, 242,  52, CBS_DROPDOWN | WS_TABSTOP
-    DEFPUSHBUTTON "Go",               IDC_GO, 425, 193,  32,  13
-    CONTROL       "Embedded Browser",IDC_BROWSER,0,  9, 500, 182, "OS2EMBED", WS_TABSTOP | WS_VISIBLE
-    CONTROL       "Status",       IDC_STATUS,   0,   0, 395,   9, WC_STATIC, SS_TEXT | DT_LEFT | WS_GROUP | DT_MNEMONIC | WS_VISIBLE
-    SLIDER                      IDC_PROGRESS, 395,   0, 105,   9, SLS_RIBBONSTRIP | SLS_READONLY | WS_VISIBLE
-                                              CTLDATA 12, 0, 100, 0, 0, 0
-  END
-END
-
-DLGTEMPLATE IDD_BROWSER_NC DISCARDABLE  
-BEGIN
-  DIALOG "os2Embed chromeless sample", IDD_BROWSER_NC, 0, 90, 500, 217,
-  WS_VISIBLE | WS_CLIPCHILDREN | NOT FS_DLGBORDER | FS_SIZEBORDER | FS_SCREENALIGN,
-  FCF_TITLEBAR | FCF_SYSMENU | FCF_MINBUTTON | FCF_MAXBUTTON | FCF_NOMOVEWITHOWNER
-  BEGIN
-    CONTROL       "Embedded Browser",IDC_BROWSER,0,  0, 500, 217, "OS2EMBED", WS_TABSTOP | WS_VISIBLE
-  END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-DLGTEMPLATE IDD_CHOOSEPROFILE DISCARDABLE  
-BEGIN
-  DIALOG "Choose Profile", IDD_CHOOSEPROFILE, 0, 182, 233, 154,
-  WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
-  FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER
-  BEGIN
-    LTEXT         "Available Profiles:",IDC_STATIC,9,139,78,   8, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
-    LISTBOX                  IDC_PROFILELIST,   9,   7, 147, 129, LS_NOADJUSTPOS | WS_TABSTOP
-    DEFPUSHBUTTON "Select",           DID_OK, 162, 122,  63,  14
-    PUSHBUTTON    "Cancel",       DID_CANCEL, 162, 104,  63,  14
-  END
-END
-
-
diff --git a/embedding/tests/os2Embed/resource.h b/embedding/tests/os2Embed/resource.h
deleted file mode 100644
index 673b5922224..00000000000
--- a/embedding/tests/os2Embed/resource.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by winEmbed.rc
-//
-#define IDC_MYICON                      2
-#define IDD_OS2EMBED_DIALOG             102
-#define IDD_ABOUTBOX                    103
-#define IDS_APP_TITLE                   103
-#define IDM_ABOUT                       104
-#define MOZ_OpenURI                     104
-#define MOZ_GetURI                      104
-#define IDM_EXIT                        105
-#define IDS_HELLO                       106
-#define IDI_OS2EMBED                    107
-#define IDS_ABOUT                       107
-#define IDI_SMALL                       108
-#define IDS_ABOUT_TITLE                 108
-#define IDC_OS2EMBED                    109
-#define IDS_HIST_BACK                   109
-#define IDS_HIST_FORWARD                110
-#define IDS_HIST_RELOAD_NORMAL          111
-#define IDS_HIST_RELOAD_BYPASSPROXY     112
-#define IDS_HIST_RELOAD_BYPASSCACHE     113
-#define IDS_HIST_ADDURL                 114
-#define IDS_HIST_RELOAD_BYPASSPROXYANDCACHE 115
-#define IDS_HIST_PURGE                  116
-#define IDS_HIST_GOTO                   117
-#define IDS_HIST_URL                    118
-#define IDR_MAINFRAME                   128
-#define IDD_BROWSER                     130
-#define IDD_BROWSER_NC                  131
-#define IDD_CHOOSEPROFILE               132
-#define MOZ_EDIT_URI                    1001
-#define IDC_GO                          1003
-#define IDC_BROWSER                     1004
-#define IDC_ADDRESS                     1005
-#define IDC_STOP                        1006
-#define IDC_STATUS                      1007
-#define IDC_BACK                        1008
-#define IDC_FORWARD                     1009
-#define IDC_PROGRESS                    1010
-#define IDC_RELOAD                      1011
-#define IDC_PROFILELIST                 1011
-#define IDC_ADDRESSLABEL                1012
-#define MOZ_File                        201
-#define MOZ_Edit                        202
-#define MOZ_Go                          203
-#define MOZ_Debug                       204
-#define MOZ_Help                        205
-#define MOZ_Open                        32771
-#define MOZ_Print                       32772
-#define MOZ_NewBrowser                  32773
-#define MOZ_NewEditor                   32774
-#define MOZ_Save                        32775
-#define MOZ_Cut                         32776
-#define MOZ_Copy                        32777
-#define MOZ_Paste                       32778
-#define MOZ_Delete                      32779
-#define MOZ_SelectAll                   32780
-#define MOZ_SelectNone                  32781
-#define MOZ_GoBack                      32782
-#define MOZ_GoForward                   32783
-#define MOZ_About                       32784
-#define ID_DEBUG_THISSPACEFORRENT       32786
-#define MOZ_SwitchProfile               32787
-#define IDC_STATIC                      -1
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        133
-#define _APS_NEXT_COMMAND_VALUE         32788
-#define _APS_NEXT_CONTROL_VALUE         1012
-#define _APS_NEXT_SYMED_VALUE           110
-#endif
-#endif
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 7a266d31688..82a1cfa1e53 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -249,7 +249,6 @@ NO_PKG_FILES += \
 	certutil* \
 	pk12util* \
 	winEmbed.exe \
-	os2Embed.exe \
 	chrome/chrome.rdf \
 	chrome/app-chrome.manifest \
 	chrome/overlayinfo \
diff --git a/xulrunner/build.mk b/xulrunner/build.mk
index 0db945b2c4c..c50bf1efaa0 100644
--- a/xulrunner/build.mk
+++ b/xulrunner/build.mk
@@ -62,13 +62,6 @@ tier_app_dirs += embedding/tests
 endif
 endif
 
-# os2embed
-ifeq ($(OS_ARCH),OS2)
-ifdef ENABLE_TESTS
-tier_app_dirs += embedding/tests
-endif
-endif
-
 ifdef MOZ_JAVAXPCOM
 tier_app_dirs += extensions/java
 endif

From 897d469207bec2c16d48734b20b84067ee75bb0b Mon Sep 17 00:00:00 2001
From: Peter Weilbacher <mozilla@weilbacher.org>
Date: Sat, 1 Aug 2009 22:21:08 +0300
Subject: [PATCH 149/175] [OS/2] Bug 413529 - enable WPS icons again for all
 apps, r=wuno@lsvw

---
 modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp b/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp
index 55d04e845b3..803a5f54eb4 100644
--- a/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp
+++ b/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp
@@ -81,12 +81,7 @@ void    ConvertMaskBitMap(PRUint8 *inBuf, PBITMAPINFO2 pBMInfo,
 //------------------------------------------------------------------------
 
 // reduces overhead by preventing calls to nsRws when it isn't present
-#ifdef MOZ_PHOENIX  // should work fine in Firefox
 static PRBool sUseRws = PR_TRUE;
-#else // XXX causes duplicate attachment icons and crashes in apps that
-      //     use mailnews, so off now for other apps
-static PRBool sUseRws = PR_FALSE;
-#endif
 
 //------------------------------------------------------------------------
 // nsIconChannel methods

From 62af18f88cf33b07e83145f793174dcdb8f0466a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Sat, 1 Aug 2009 16:21:58 -0700
Subject: [PATCH 150/175] Bug 506132 - write session data to disk less often in
 WinCE, r=vlad

---
 browser/app/profile/firefox.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 8a611fb0dee..32b7cb79d0d 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -885,6 +885,9 @@ pref("content.sink.interactive_time", 750000); /* default 750000 */
 pref("content.sink.initial_perf_time", 500000); /* default 2000000 */
 pref("content.sink.enable_perf_mode", 0); /* default 0; 0 == switch, 1 == stay interactive, 2 == stay perf */
 
+// Write sessionstore.js less often
+pref("browser.sessionstore.interval", 60000);
+
 #endif /* WINCE */
 
 // Whether to use a panel that looks like an OS X sheet for customization

From 327a19dfc6267ff25da840cd1b4d7db116e16fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Sat, 1 Aug 2009 16:21:58 -0700
Subject: [PATCH 151/175] Bug 506394 - ExpandEnvironmentStringsW in CE shunt
 isn't quite right, r=vlad

---
 build/wince/shunt/environment.cpp | 46 +++++++++++++++++++------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/build/wince/shunt/environment.cpp b/build/wince/shunt/environment.cpp
index 5aef9be6c63..53242d23695 100644
--- a/build/wince/shunt/environment.cpp
+++ b/build/wince/shunt/environment.cpp
@@ -198,43 +198,53 @@ SetEnvironmentVariableW(const unsigned short* name,
 
 
 unsigned int ExpandEnvironmentStringsW(const unsigned short* lpSrc,
-				       unsigned short* lpDst,
-				       unsigned int nSize)
+                                       unsigned short* lpDst,
+                                       unsigned int nSize)
 {
   if ( NULL == lpDst )
     return 0;
-  
+
   unsigned int size = 0;
   unsigned int index = 0;
   unsigned int origLen = wcslen(lpSrc);
 
   const unsigned short *pIn = lpSrc;
   unsigned short *pOut = lpDst;
-  
+
   while ( index < origLen ) {
-    
+
     if (*pIn != L'%') {  // Regular char, copy over
-      if ( size < nSize ) *pOut = *pIn, pOut++;
-      index++, size++, pIn++;
+      if ( size++ < nSize ) *pOut = *pIn, pOut++;
+      index++, pIn++;
       continue;
     }
-    
+
     // Have a starting '%' - look for matching '%'
     int envlen = 0;
-    const unsigned short *pTmp = ++pIn;                    // Move past original '%'
-    while ( L'%' != *pTmp ) {
+    const unsigned short *pTmp = pIn + 1;
+    while ( *pTmp != L'%' && *pTmp != L' ' ) {
       envlen++, pTmp++;
       if ( origLen < index + envlen ) {    // Ran past end of original
-        SetLastError(ERROR_INVALID_PARAMETER); // buffer without matching '%'
-        return -1;
+        while ( envlen-- ) {
+          if ( size++ < nSize ) *pOut = *pIn, pOut++;
+          index++, pIn++;
+        }
+        break;
       }
     }
-    
+
+    if ( *pTmp == L' ' ) { // Need to append through space
+      while ( envlen-- ) {
+        if ( size++ < nSize ) *pOut = *pIn, pOut++;
+        index++, pIn++;
+      }
+      continue;
+    }
+
+    pIn++; // Move past original %
     if ( 0 == envlen ) {  // Encountered a "%%" - mapping to "%"
-      size++;
-      if ( size < nSize ) *pOut = *pIn, pOut++;
-      pIn++;
-      index += 2;
+      if ( size++ < nSize ) *pOut = *pIn, pOut++;
+      index += 2, pIn++;
     } else {
       // Encountered a "%something%" - mapping "something"
       char key[256];
@@ -252,7 +262,7 @@ unsigned int ExpandEnvironmentStringsW(const unsigned short* lpSrc,
       pIn = ++pTmp;
     }
   }
-  
+
   if ( size < nSize ) lpDst[size] = 0;
   return size;
 }

From a261155c6d6cc05f5af242809bed555ae1acea59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Sat, 1 Aug 2009 16:21:58 -0700
Subject: [PATCH 152/175] Bug 507032 - "Set As Desktop Background..." doesn't
 work on Windows CE, r=robert.bugzilla

---
 .../shell/content/setDesktopBackground.xul    |  2 ++
 .../shell/src/nsWindowsShellService.cpp       | 32 ++++++++++++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/browser/components/shell/content/setDesktopBackground.xul b/browser/components/shell/content/setDesktopBackground.xul
index cc96733bc19..fe74424f529 100644
--- a/browser/components/shell/content/setDesktopBackground.xul
+++ b/browser/components/shell/content/setDesktopBackground.xul
@@ -77,7 +77,9 @@
         <menupopup>
           <menuitem label="&center.label;"  value="CENTER"/>
           <menuitem label="&tile.label;"    value="TILE"/>
+#ifndef WINCE
           <menuitem label="&stretch.label;" value="STRETCH"/>
+#endif
         </menupopup>
       </menulist>
       <spacer flex="1"/>
diff --git a/browser/components/shell/src/nsWindowsShellService.cpp b/browser/components/shell/src/nsWindowsShellService.cpp
index 5b44692cd05..664d9840d81 100644
--- a/browser/components/shell/src/nsWindowsShellService.cpp
+++ b/browser/components/shell/src/nsWindowsShellService.cpp
@@ -26,6 +26,7 @@
  *  Robert Strong  <robert.bugzilla@gmail.com>
  *  Asaf Romano    <mano@mozilla.com>
  *  Ryan Jones     <sciguyryan@gmail.com>
+ *  Paul O'Shannessy <paul@oshannessy.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -215,9 +216,11 @@ typedef struct {
 #define APP_REG_NAME L"Firefox"
 #define CLS_HTML "FirefoxHTML"
 #define CLS_URL "FirefoxURL"
+#define CPL_DESKTOP L"\\Control Panel\\Desktop"
 #define VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
 #define VAL_FILE_ICON "%APPPATH%,1"
 #else
+#define CPL_DESKTOP L"\\ControlPanel\\Desktop"
 #define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\""
 #define VAL_FILE_ICON "%APPPATH%,-2"
 #endif
@@ -656,12 +659,12 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
      PRBool result = PR_FALSE;
      DWORD  dwDisp = 0;
      HKEY   key;
-     // Try to create/open a subkey under HKLM.
-     DWORD res = ::RegCreateKeyExW(HKEY_CURRENT_USER,
-                                   L"Control Panel\\Desktop",
+     // Try to create/open a subkey under HKCU.
+     DWORD res = ::RegCreateKeyExW(HKEY_CURRENT_USER, CPL_DESKTOP,
                                    0, NULL, REG_OPTION_NON_VOLATILE,
                                    KEY_WRITE, NULL, &key, &dwDisp);
     if (REG_SUCCEEDED(res)) {
+#ifndef WINCE
       PRUnichar tile[2], style[2];
       switch (aPosition) {
         case BACKGROUND_TILE:
@@ -688,8 +691,25 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
                        0, REG_SZ, (const BYTE *)style, size);
       ::SystemParametersInfoW(SPI_SETDESKWALLPAPER, 0, (PVOID)path.get(),
                               SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
+#else
+      DWORD tile = (aPosition == BACKGROUND_TILE);
+      ::RegSetValueExW(key, L"Tile",
+                       0, REG_DWORD, (const BYTE *)&tile, sizeof(DWORD));
+      // On WinCE SPI_SETDESKWALLPAPER isn't available, so set the registry
+      // entry ourselves and then broadcast UI change
+      PRInt32 size = (path.Length() + 1) * sizeof(PRUnichar);
+      ::RegSetValueExW(key, L"Wallpaper",
+                       0, REG_SZ, (const BYTE *)path.get(), size);
+      ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, NULL, 0);
+#endif
+
       // Close the key we opened.
       ::RegCloseKey(key);
+
+#ifdef WINCE
+      // Ensure that the writes are flushed in case of hard reboot
+      ::RegFlushKey(HKEY_CURRENT_USER);
+#endif
     }
   }
   return rv;
@@ -815,10 +835,13 @@ nsWindowsShellService::SetDesktopBackgroundColor(PRUint32 aColor)
 
   ::SetSysColors(sizeof(aParameters) / sizeof(int), aParameters, colors);
 
+  // SetSysColors is persisting across sessions on Windows CE, so no need to
+  // write to registry
+#ifndef WINCE
   PRBool result = PR_FALSE;
   DWORD  dwDisp = 0;
   HKEY   key;
-  // Try to create/open a subkey under HKLM.
+  // Try to create/open a subkey under HKCU.
   DWORD rv = ::RegCreateKeyExW(HKEY_CURRENT_USER,
                                L"Control Panel\\Colors", 0, NULL,
                                REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL,
@@ -836,6 +859,7 @@ nsWindowsShellService::SetDesktopBackgroundColor(PRUint32 aColor)
   
   // Close the key we opened.
   ::RegCloseKey(key);
+#endif
   return NS_OK;
 }
 

From 095d8576979e3d7a7c6611944d6400381ddc80a0 Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Sat, 1 Aug 2009 16:21:59 -0700
Subject: [PATCH 153/175] Bug 507513 - Need ABI defined for WinCE / WinMo,
 r=ted.mielczarek

---
 configure.in        | 8 +++++++-
 js/src/configure.in | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index f743c752cca..538f1c436e9 100644
--- a/configure.in
+++ b/configure.in
@@ -1385,6 +1385,12 @@ sun4u | sparc*)
 x86_64 | ia64)
     CPU_ARCH="$OS_TEST"
     ;;
+
+arm)
+    if test "$OS_TARGET" == "WINCE"; then
+        CPU_ARCH="$OS_TEST"
+    fi
+    ;;
 esac
 
 if test -z "$OS_TARGET"; then
@@ -2008,7 +2014,7 @@ case "$target" in
     ;;
 
 *-wince*)
-
+    TARGET_COMPILER_ABI=msvc
     MOZ_TOOLS_DIR=`echo $MOZ_TOOLS`
     AR_LIST="$AR -list"
     AR_EXTRACT="$AR -extract"
diff --git a/js/src/configure.in b/js/src/configure.in
index 73c0e03ea51..f81e5ff00ef 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1191,6 +1191,12 @@ sun4u | sparc*)
 x86_64 | ia64)
     CPU_ARCH="$OS_TEST"
     ;;
+
+arm)
+    if test "$OS_TARGET" == "WINCE"; then
+        CPU_ARCH="$OS_TEST"
+    fi
+    ;;
 esac
 
 if test -z "$OS_TARGET"; then
@@ -1809,7 +1815,7 @@ case "$target" in
     ;;
 
 *-wince*)
-
+    TARGET_COMPILER_ABI=msvc
     MOZ_TOOLS_DIR=`echo $MOZ_TOOLS`
     AR_LIST="$AR -list"
     AR_EXTRACT="$AR -extract"

From d0d7e1cb0594d9c366a7a515a8b173ee8c177e61 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Sat, 1 Aug 2009 17:30:21 -0700
Subject: [PATCH 154/175] Bug 504675 - default sans serif font on Windows CE
 shouldn't be Tahoma. r=vladimir

---
 modules/libpref/src/init/all.js | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 4bd02803f00..bab5b9b4d40 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1219,31 +1219,23 @@ pref("font.minimum-size.x-user-def", 0);
 
 #ifdef XP_WIN
 
-// On Windows CE, Arial sometimes isn't available;
-// so we'll use Tahoma instead
-#ifdef WINCE
-#define WINDOWS_SANS_SERIF_FONT Tahoma
-#else
-#define WINDOWS_SANS_SERIF_FONT Arial
-#endif
-
 pref("font.name.serif.ar", "Times New Roman");
-#expand pref("font.name.sans-serif.ar", "__WINDOWS_SANS_SERIF_FONT__");
+pref("font.name.sans-serif.ar", "Arial");
 pref("font.name.monospace.ar", "Courier New");
 pref("font.name.cursive.ar", "Comic Sans MS");
 
 pref("font.name.serif.el", "Times New Roman");
-#expand pref("font.name.sans-serif.el", "__WINDOWS_SANS_SERIF_FONT__");
+pref("font.name.sans-serif.el", "Arial");
 pref("font.name.monospace.el", "Courier New");
 pref("font.name.cursive.el", "Comic Sans MS");
 
 pref("font.name.serif.he", "Narkisim");
-#expand pref("font.name.sans-serif.he", "__WINDOWS_SANS_SERIF_FONT__");
+pref("font.name.sans-serif.he", "Arial");
 pref("font.name.monospace.he", "Fixed Miriam Transparent");
 pref("font.name.cursive.he", "Guttman Yad");
 pref("font.name-list.serif.he", "Narkisim, David");
 pref("font.name-list.monospace.he", "Fixed Miriam Transparent, Miriam Fixed, Rod, Courier New");
-#expand pref("font.name-list.cursive.he", "Guttman Yad, Ktav, __WINDOWS_SANS_SERIF_FONT__");
+pref("font.name-list.cursive.he", "Guttman Yad, Ktav, Arial");
 
 pref("font.name.serif.ja", "ＭＳ Ｐ明朝"); // "MS PMincho"
 pref("font.name.sans-serif.ja", "ＭＳ Ｐゴシック"); // "MS PGothic"
@@ -1268,32 +1260,32 @@ pref("font.name.monospace.th", "Tahoma");
 pref("font.name.cursive.th", "Tahoma");
 
 pref("font.name.serif.tr", "Times New Roman");
-#expand pref("font.name.sans-serif.tr", "__WINDOWS_SANS_SERIF_FONT__");
+pref("font.name.sans-serif.tr", "Arial");
 pref("font.name.monospace.tr", "Courier New");
 pref("font.name.cursive.tr", "Comic Sans MS");
 
 pref("font.name.serif.x-baltic", "Times New Roman");
-#expand pref("font.name.sans-serif.x-baltic", "__WINDOWS_SANS_SERIF_FONT__");
+pref("font.name.sans-serif.x-baltic", "Arial");
 pref("font.name.monospace.x-baltic", "Courier New");
 pref("font.name.cursive.x-baltic", "Comic Sans MS");
 
 pref("font.name.serif.x-central-euro", "Times New Roman");
-#expand pref("font.name.sans-serif.x-central-euro", "__WINDOWS_SANS_SERIF_FONT__");
+pref("font.name.sans-serif.x-central-euro", "Arial");
 pref("font.name.monospace.x-central-euro", "Courier New");
 pref("font.name.cursive.x-central-euro", "Comic Sans MS");
 
 pref("font.name.serif.x-cyrillic", "Times New Roman");
-#expand pref("font.name.sans-serif.x-cyrillic", "__WINDOWS_SANS_SERIF_FONT__");
+pref("font.name.sans-serif.x-cyrillic", "Arial");
 pref("font.name.monospace.x-cyrillic", "Courier New");
 pref("font.name.cursive.x-cyrillic", "Comic Sans MS");
 
 pref("font.name.serif.x-unicode", "Times New Roman");
-#expand pref("font.name.sans-serif.x-unicode", "__WINDOWS_SANS_SERIF_FONT__");
+pref("font.name.sans-serif.x-unicode", "Arial");
 pref("font.name.monospace.x-unicode", "Courier New");
 pref("font.name.cursive.x-unicode", "Comic Sans MS");
 
 pref("font.name.serif.x-western", "Times New Roman");
-#expand pref("font.name.sans-serif.x-western", "__WINDOWS_SANS_SERIF_FONT__");
+pref("font.name.sans-serif.x-western", "Arial");
 pref("font.name.monospace.x-western", "Courier New");
 pref("font.name.cursive.x-western", "Comic Sans MS");
 
@@ -1307,7 +1299,7 @@ pref("font.name-list.monospace.zh-CN", "MS Song, SimSun");
 // Per Taiwanese users' demand. They don't want to use TC fonts for
 // rendering Latin letters. (bug 88579)
 pref("font.name.serif.zh-TW", "Times New Roman"); 
-#expand pref("font.name.sans-serif.zh-TW", "__WINDOWS_SANS_SERIF_FONT__"); 
+pref("font.name.sans-serif.zh-TW", "Arial");
 pref("font.name.monospace.zh-TW", "細明體");  // MingLiU
 pref("font.name-list.serif.zh-TW", "PMingLiu, MingLiU"); 
 pref("font.name-list.sans-serif.zh-TW", "PMingLiU, MingLiU");
@@ -1316,7 +1308,7 @@ pref("font.name-list.monospace.zh-TW", "MingLiU");
 // hkscsm3u.ttf (HKSCS-2001) :  http://www.microsoft.com/hk/hkscs 
 // Hong Kong users have the same demand about glyphs for Latin letters (bug 88579) 
 pref("font.name.serif.zh-HK", "Times New Roman"); 
-#expand pref("font.name.sans-serif.zh-HK", "__WINDOWS_SANS_SERIF_FONT__"); 
+pref("font.name.sans-serif.zh-HK", "Arial");
 pref("font.name.monospace.zh-HK", "細明體_HKSCS"); 
 pref("font.name-list.serif.zh-HK", "MingLiu_HKSCS, Ming(for ISO10646), MingLiU"); 
 pref("font.name-list.sans-serif.zh-HK", "MingLiU_HKSCS, Ming(for ISO10646), MingLiU");  

From cefd82cafea0a88ccf03d7bfd7560208de817aa8 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Sat, 1 Aug 2009 17:30:23 -0700
Subject: [PATCH 155/175] Bug 507064 - Clicking on selected text doesn't 
 deselect + move caret on Windows CE. r=vladimir

---
 widget/src/windows/nsWindow.cpp | 15 +++++++++------
 widget/src/windows/nsWindowCE.h |  1 -
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 3bd7c73bd86..55b280d430b 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -2737,7 +2737,11 @@ void nsWindow::InitEvent(nsGUIEvent& event, nsIntPoint* aPoint)
     event.refPoint.y = aPoint->y;
   }
 
+#ifndef WINCE
   event.time = ::GetMessageTime();
+#else
+  event.time = PR_Now() / 1000;
+#endif
 
   mLastPoint = event.refPoint;
 }
@@ -3037,7 +3041,11 @@ PRBool nsWindow::DispatchMouseEvent(PRUint32 aEventType, WPARAM wParam,
 
   // Doubleclicks are used to set the click count, then changed to mousedowns
   // We're going to time double-clicks from mouse *up* to next mouse *down*
+#ifndef WINCE
   LONG curMsgTime = ::GetMessageTime();
+#else
+  LONG curMsgTime = PR_Now() / 1000;
+#endif
 
   if (aEventType == NS_MOUSE_DOUBLECLICK) {
     event.message = NS_MOUSE_BUTTON_DOWN;
@@ -3052,11 +3060,6 @@ PRBool nsWindow::DispatchMouseEvent(PRUint32 aEventType, WPARAM wParam,
   }
   else if (aEventType == NS_MOUSE_BUTTON_DOWN) {
     // now look to see if we want to convert this to a double- or triple-click
-
-#ifdef NS_DEBUG_XX
-    printf("Msg: %d Last: %d Dif: %d Max %d\n", curMsgTime, sLastMouseDownTime, curMsgTime-sLastMouseDownTime, ::GetDoubleClickTime());
-    printf("Mouse %d %d\n", abs(sLastMousePoint.x - mp.x), abs(sLastMousePoint.y - mp.y));
-#endif
     if (((curMsgTime - sLastMouseDownTime) < (LONG)::GetDoubleClickTime()) && insideMovementThreshold &&
         eventButton == sLastMouseButton) {
       sLastClickCount ++;
@@ -6463,4 +6466,4 @@ DWORD ChildWindow::WindowStyle()
     style |= WS_CHILD; // WS_POPUP and WS_CHILD are mutually exclusive.
   VERIFY_WINDOW_STYLE(style);
   return style;
-}
\ No newline at end of file
+}
diff --git a/widget/src/windows/nsWindowCE.h b/widget/src/windows/nsWindowCE.h
index b01812c9354..aff3630e697 100644
--- a/widget/src/windows/nsWindowCE.h
+++ b/widget/src/windows/nsWindowCE.h
@@ -77,7 +77,6 @@
 
 // No-ops for non-existent ce global apis.
 inline void FlashWindow(HWND window, BOOL ignore){}
-inline int  GetMessageTime() {return 0;}
 inline BOOL IsIconic(HWND inWnd){return false;}
 
 class nsWindowCE {

From 8717b3d0e7fe883af25e08cf72e9899ee7c77833 Mon Sep 17 00:00:00 2001
From: MattN <mnoorenberghe@mozilla.com>
Date: Sat, 1 Aug 2009 17:30:26 -0700
Subject: [PATCH 156/175] Bug 446247 - Autocomplete should match any part of
 the string. r=dolske

---
 modules/libpref/src/init/all.js               |   4 +-
 .../satchel/src/nsFormAutoComplete.js         | 214 +++++++++++++-----
 .../satchel/test/test_form_autocomplete.html  |  63 +++++-
 .../satchel/test/unit/formhistory_1000.sqlite | Bin 0 -> 164864 bytes
 .../satchel/test/unit/perf_autocomplete.js    | 173 ++++++++++++++
 5 files changed, 392 insertions(+), 62 deletions(-)
 create mode 100644 toolkit/components/satchel/test/unit/formhistory_1000.sqlite
 create mode 100644 toolkit/components/satchel/test/unit/perf_autocomplete.js

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index bab5b9b4d40..1c041b107b9 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -2730,9 +2730,11 @@ pref("signon.debug",                        false); // logs to Error Console
 pref("browser.formfill.debug",            false);
 pref("browser.formfill.enable",           true);
 pref("browser.formfill.agedWeight",       2);
-pref("browser.formfill.bucketSize",       5);
+pref("browser.formfill.bucketSize",       1);
 pref("browser.formfill.maxTimeGroupings", 25);
 pref("browser.formfill.timeGroupingSize", 604800);
+pref("browser.formfill.boundaryWeight",   25);
+pref("browser.formfill.prefixWeight",     5);
 
 // Zoom prefs
 pref("browser.zoom.full", false);
diff --git a/toolkit/components/satchel/src/nsFormAutoComplete.js b/toolkit/components/satchel/src/nsFormAutoComplete.js
index 8d69652dfbf..fc5e6d3aa3f 100644
--- a/toolkit/components/satchel/src/nsFormAutoComplete.js
+++ b/toolkit/components/satchel/src/nsFormAutoComplete.js
@@ -75,14 +75,16 @@ FormAutoComplete.prototype = {
         return this.__observerService;
     },
 
-    _prefBranch        : null,
-    _debug             : false, // mirrors browser.formfill.debug
-    _enabled           : true,  // mirrors browser.formfill.enable preference
-    _agedWeight        : 2,
-    _bucketSize        : 5,
-    _maxTimeGroupings  : 25,
-    _timeGroupingSize  : 7 * 24 * 60 * 60 * 1000 * 1000,
-    _expireDays        : null,
+    _prefBranch         : null,
+    _debug              : false, // mirrors browser.formfill.debug
+    _enabled            : true,  // mirrors browser.formfill.enable preference
+    _agedWeight         : 2,
+    _bucketSize         : 1,
+    _maxTimeGroupings   : 25,
+    _timeGroupingSize   : 7 * 24 * 60 * 60 * 1000 * 1000,
+    _expireDays         : null,
+    _boundaryWeight     : 25,
+    _prefixWeight       : 5,
 
     init : function() {
         // Preferences. Add observer so we get notified of changes.
@@ -136,6 +138,12 @@ FormAutoComplete.prototype = {
                     case "bucketSize":
                         self._bucketSize = self._prefBranch.getIntPref(prefName);
                         break;
+                    case "boundaryWeight":
+                        self._boundaryWeight = self._prefBranch.getIntPref(prefName);
+                        break;
+                    case "prefixWeight":
+                        self._prefixWeight = self._prefBranch.getIntPref(prefName);
+                        break;
                     default:
                         self.log("Oops! Pref not handled, change ignored.");
                 }
@@ -164,46 +172,56 @@ FormAutoComplete.prototype = {
      * autoCompleteSearch
      *
      * aInputName    -- |name| attribute from the form input being autocompleted.
-     * aSearchString -- current value of the input
+     * aUntrimmedSearchString -- current value of the input
      * aPreviousResult -- previous search result, if any.
      *
      * Returns: an nsIAutoCompleteResult
      */
-    autoCompleteSearch : function (aInputName, aSearchString, aPreviousResult) {
+    autoCompleteSearch : function (aInputName, aUntrimmedSearchString, aPreviousResult) {
+        function sortBytotalScore (a, b) {
+            let x = a.totalScore;
+            let y = b.totalScore;
+            return ((x > y) ? -1 : ((x < y) ? 1 : 0));
+        }
+
         if (!this._enabled)
             return null;
 
-        this.log("AutoCompleteSearch invoked. Search is: " + aSearchString);
-
+        this.log("AutoCompleteSearch invoked. Search is: " + aUntrimmedSearchString);
+        let searchString = aUntrimmedSearchString.trim().toLowerCase();
         let result = null;
 
-        if (aPreviousResult &&
-                aSearchString.substr(0, aPreviousResult.searchString.length) == aPreviousResult.searchString) {
+        // reuse previous results if:
+        // a) length greater than one character (others searches are special cases) AND
+        // b) the the new results will be a subset of the previous results
+        if (aPreviousResult && aPreviousResult.searchString.trim().length > 1 &&
+            searchString.indexOf(aPreviousResult.searchString.trim().toLowerCase()) >= 0) {
             this.log("Using previous autocomplete result");
             result = aPreviousResult;
-            result.wrappedJSObject.searchString = aSearchString;
+            result.wrappedJSObject.searchString = aUntrimmedSearchString;
 
+            let searchTokens = searchString.split(/\s+/);
             // We have a list of results for a shorter search string, so just
-            // filter them further based on the new search string.
-            // Count backwards, because result.matchCount is decremented
-            // when we remove an entry.
-            for (let i = result.matchCount - 1; i >= 0; i--) {
-                let match = result.getValueAt(i);
-
-                // Remove results that are too short, or have different prefix.
+            // filter them further based on the new search string and add to a new array.
+            let entries = result.wrappedJSObject.entries;
+            let filteredEntries = [];
+            for (let i = 0; i < entries.length; i++) {
+                let entry = entries[i];
+                // Remove results that do not contain the token
                 // XXX bug 394604 -- .toLowerCase can be wrong for some intl chars
-                if (aSearchString.length > match.length ||
-                    aSearchString.toLowerCase() !=
-                        match.substr(0, aSearchString.length).toLowerCase())
-                {
-                    this.log("Removing autocomplete entry '" + match + "'");
-                    result.removeValueAt(i, false);
-                }
+                if(searchTokens.some(function (tok) entry.textLowerCase.indexOf(tok) < 0))
+                    continue;
+                this._calculateScore(entry, searchString, searchTokens);
+                this.log("Reusing autocomplete entry '" + entry.text +
+                         "' (" + entry.frecency +" / " + entry.totalScore + ")");
+                filteredEntries.push(entry);
             }
+            filteredEntries.sort(sortBytotalScore);
+            result.wrappedJSObject.entries = filteredEntries;
         } else {
             this.log("Creating new autocomplete search result.");
-            let entries = this.getAutoCompleteValues(aInputName, aSearchString);
-            result = new FormAutoCompleteResult(this._formHistory, entries, aInputName, aSearchString);
+            let entries = this.getAutoCompleteValues(aInputName, searchString);
+            result = new FormAutoCompleteResult(this._formHistory, entries, aInputName, aUntrimmedSearchString);
         }
 
         return result;
@@ -211,6 +229,46 @@ FormAutoComplete.prototype = {
 
     getAutoCompleteValues : function (fieldName, searchString) {
         let values = [];
+        let searchTokens;
+
+        let params = {
+            agedWeight:         this._agedWeight,
+            bucketSize:         this._bucketSize,
+            expiryDate:         1000 * (Date.now() - this._expireDays * 24 * 60 * 60 * 1000),
+            fieldname:          fieldName,
+            maxTimeGroupings:   this._maxTimeGroupings,
+            now:                Date.now() * 1000,          // convert from ms to microseconds
+            timeGroupingSize:   this._timeGroupingSize
+        }
+
+        // only do substring matching when more than one character is typed
+        let where = ""
+        let boundaryCalc = "";
+        if (searchString.length > 1) {
+            searchTokens = searchString.split(/\s+/);
+
+            // build up the word boundary and prefix match bonus calculation
+            boundaryCalc = "MAX(1, :prefixWeight * (value LIKE :valuePrefix ESCAPE '/') + (";
+            // for each word, calculate word boundary weights for the SELECT clause and
+            // add word to the WHERE clause of the query
+            let tokenCalc = [];
+            for (let i = 0; i < searchTokens.length; i++) {
+                tokenCalc.push("(value LIKE :tokenBegin" + i + " ESCAPE '/') + " +
+                                "(value LIKE :tokenBoundary" + i + " ESCAPE '/')");
+                where += "AND (value LIKE :tokenContains" + i + " ESCAPE '/') ";
+            }
+            // add more weight if we have a traditional prefix match and
+            // multiply boundary bonuses by boundary weight
+            boundaryCalc += tokenCalc.join(" + ") + ") * :boundaryWeight)";
+            params.prefixWeight = this._prefixWeight;
+            params.boundaryWeight = this._boundaryWeight;
+        } else if (searchString.length == 1) {
+            where = "AND (value LIKE :valuePrefix ESCAPE '/') ";
+            boundaryCalc = "1";
+        } else {
+            where = "";
+            boundaryCalc = "1";
+        }
         /* Three factors in the frecency calculation for an entry (in order of use in calculation):
          * 1) average number of times used - items used more are ranked higher
          * 2) how recently it was last used - items used recently are ranked higher
@@ -220,27 +278,18 @@ FormAutoComplete.prototype = {
          * with a very similar frecency are bucketed together with an alphabetical sort. This is
          * to reduce the amount of moving around by entries while typing.
          */
+
         let query = "SELECT value, " +
                     "ROUND( " +
                         "timesUsed / MAX(1.0, (lastUsed - firstUsed) / :timeGroupingSize) * " +
                         "MAX(1.0, :maxTimeGroupings - (:now - lastUsed) / :timeGroupingSize) * "+
                         "MAX(1.0, :agedWeight * (firstUsed < :expiryDate)) / " +
                         ":bucketSize "+
-                    ") AS frecency " +
+                    ", 3) AS frecency, " +
+                    boundaryCalc + " AS boundaryBonuses " +
                     "FROM moz_formhistory " +
-                    "WHERE fieldname=:fieldname AND value LIKE :valuePrefix ESCAPE '/' " +
-                    "ORDER BY frecency DESC, UPPER(value) ASC";
-
-        let params = {
-            agedWeight:         this._agedWeight,
-            bucketSize:         this._bucketSize,
-            expiryDate:         1000 * (Date.now() - this._expireDays * 24 * 60 * 60 * 1000),
-            fieldname:          fieldName,
-            maxTimeGroupings:   this._maxTimeGroupings,
-            now:                Date.now() * 1000,          // convert from ms to microseconds
-            timeGroupingSize:   this._timeGroupingSize,
-            valuePrefix:        null                        // set below...
-        }
+                    "WHERE fieldname=:fieldname " + where +
+                    "ORDER BY ROUND(frecency * boundaryBonuses) DESC, UPPER(value) ASC";
 
         let stmt;
         try {
@@ -248,10 +297,29 @@ FormAutoComplete.prototype = {
 
             // Chicken and egg problem: Need the statement to escape the params we
             // pass to the function that gives us the statement. So, fix it up now.
-            stmt.params.valuePrefix = stmt.escapeStringForLIKE(searchString, "/") + "%";
+            if (searchString.length >= 1)
+                stmt.params.valuePrefix = stmt.escapeStringForLIKE(searchString, "/") + "%";
+            if (searchString.length > 1) {
+                for (let i = 0; i < searchTokens.length; i++) {
+                    let escapedToken = stmt.escapeStringForLIKE(searchTokens[i], "/");
+                    stmt.params["tokenBegin" + i] = escapedToken + "%";
+                    stmt.params["tokenBoundary" + i] =  "% " + escapedToken + "%";
+                    stmt.params["tokenContains" + i] = "%" + escapedToken + "%";
+                }
+            } else {
+                // no addional params need to be substituted into the query when the
+                // length is zero or one
+            }
 
-            while (stmt.step())
-                values.push(stmt.row.value);
+            while (stmt.step()) {
+                let entry = {
+                    text:           stmt.row.value,
+                    textLowerCase:  stmt.row.value.toLowerCase(),
+                    frecency:       stmt.row.frecency,
+                    totalScore:     Math.round(stmt.row.frecency * stmt.row.boundaryBonuses)
+                }
+                values.push(entry);
+            }
 
         } catch (e) {
             this.log("getValues failed: " + e.name + " : " + e.message);
@@ -290,6 +358,31 @@ FormAutoComplete.prototype = {
             return prefsBranch.getIntPref("browser.formfill.expire_days");
         else
             return prefsBranch.getIntPref("browser.history_expire_days");
+    },
+
+    /*
+     * _calculateScore
+     *
+     * entry    -- an nsIAutoCompleteResult entry
+     * aSearchString -- current value of the input (lowercase)
+     * searchTokens -- array of tokens of the search string
+     *
+     * Returns: an int
+     */
+    _calculateScore : function (entry, aSearchString, searchTokens) {
+        let boundaryCalc = 0;
+        // for each word, calculate word boundary weights
+        for each (let token in searchTokens) {
+            boundaryCalc += (entry.textLowerCase.indexOf(token) == 0);
+            boundaryCalc += (entry.textLowerCase.indexOf(" " + token) >= 0);
+        }
+        boundaryCalc = boundaryCalc * this._boundaryWeight;
+        // now add more weight if we have a traditional prefix match and
+        // multiply boundary bonuses by boundary weight
+        boundaryCalc += this._prefixWeight *
+                        (entry.textLowerCase.
+                         indexOf(aSearchString) == 0);
+        entry.totalScore = Math.round(entry.frecency * Math.max(1, boundaryCalc));
     }
 
 }; // end of FormAutoComplete implementation
@@ -303,11 +396,6 @@ function FormAutoCompleteResult (formHistory, entries, fieldName, searchString)
     this.entries = entries;
     this.fieldName = fieldName;
     this.searchString = searchString;
-
-    if (entries.length > 0) {
-        this.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
-        this.defaultIndex = 0;
-    }
 }
 
 FormAutoCompleteResult.prototype = {
@@ -332,16 +420,25 @@ FormAutoCompleteResult.prototype = {
 
     // Interfaces from idl...
     searchString : null,
-    searchResult : Ci.nsIAutoCompleteResult.RESULT_NOMATCH,
-    defaultIndex : -1,
     errorDescription : "",
+    get defaultIndex() {
+        if (entries.length == 0)
+            return -1;
+        else
+            return 0;
+    },
+    get searchResult() {
+        if (this.entries.length == 0)
+            return Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
+        return Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
+    },
     get matchCount() {
         return this.entries.length;
     },
 
     getValueAt : function (index) {
         this._checkIndexBounds(index);
-        return this.entries[index];
+        return this.entries[index].text;
     },
 
     getCommentAt : function (index) {
@@ -364,11 +461,8 @@ FormAutoCompleteResult.prototype = {
 
         let [removedEntry] = this.entries.splice(index, 1);
 
-        if (this.defaultIndex > this.entries.length)
-            this.defaultIndex--;
-
         if (removeFromDB)
-            this.formHistory.removeEntry(this.fieldName, removedEntry);
+            this.formHistory.removeEntry(this.fieldName, removedEntry.text);
     }
 };
 
diff --git a/toolkit/components/satchel/test/test_form_autocomplete.html b/toolkit/components/satchel/test/test_form_autocomplete.html
index 76b40dec950..b147be11314 100644
--- a/toolkit/components/satchel/test/test_form_autocomplete.html
+++ b/toolkit/components/satchel/test/test_form_autocomplete.html
@@ -45,6 +45,12 @@ Form History test: form field autocomplete
     <button type="submit">Submit</button>
   </form>
 
+  <!-- normal form for testing word boundary filtering -->
+  <form id="form6" onsubmit="return false;">
+    <input  type="text" name="field4">
+    <button type="submit">Submit</button>
+  </form>
+
 </div>
 
 <pre id="test">
@@ -74,6 +80,10 @@ fh.addEntry("field3", "aaz");
 fh.addEntry("field3", "aa\xe6"); // 0xae == latin ae pair (0xc6 == AE)
 fh.addEntry("field3", "az");
 fh.addEntry("field3", "z");
+fh.addEntry("field4", "a\xe6");
+fh.addEntry("field4", "aa a\xe6");
+fh.addEntry("field4", "aba\xe6");
+fh.addEntry("field4", "bc d\xe6");
 
 // Restore the form to the default state.
 function restoreForm() {
@@ -436,7 +446,7 @@ function runTest(testNum) {
         break;
 
     case 205:
-        checkMenuEntries(["az"]);
+        ok(getMenuEntries().length > 0, "checking typing in middle of text");
         doKey("left");
         sendChar("a", input);
         break;
@@ -460,6 +470,57 @@ function runTest(testNum) {
         checkMenuEntries([]);
         doKey("escape");
 
+        // Look at form 6, try to trigger autocomplete popup
+        input = $_(6, "field4");
+        restoreForm();
+        testNum = 249;
+        sendChar("a", input);
+        break;
+
+    /* Test substring matches and word boundary bonuses */
+
+    case 250:
+        // alphabetical results for first character
+        checkMenuEntries(["aa a\xe6", "aba\xe6", "a\xe6"]);
+        sendChar("\xc6", input);
+        break;
+
+    case 251:
+        // prefix match comes first, then word boundary match
+        // followed by substring match
+        checkMenuEntries(["a\xe6", "aa a\xe6", "aba\xe6"]);
+
+        restoreForm();
+        sendChar("b", input);
+        break;
+
+    case 252:
+        checkMenuEntries(["bc d\xe6"]);
+        sendChar(" ", input);
+        break;
+
+    case 253:
+        // check that trailing space has no effect after single char.
+        checkMenuEntries(["bc d\xe6"]);
+        sendChar("\xc6", input);
+        break;
+
+    case 254:
+        // check multi-word substring matches
+        checkMenuEntries(["bc d\xe6", "aba\xe6"]);
+        doKey("left");
+        sendChar("d", input);
+        break;
+
+    case 255:
+        // check inserting in multi-word searches
+        checkMenuEntries(["bc d\xe6"]);
+        sendChar("z", input);
+        break;
+
+    case 256:
+        checkMenuEntries([]);
+
         SimpleTest.finish();
         return;
 
diff --git a/toolkit/components/satchel/test/unit/formhistory_1000.sqlite b/toolkit/components/satchel/test/unit/formhistory_1000.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..5eeab074fd85b693b505047adc189ce8d52c6216
GIT binary patch
literal 164864
zcmeEvcbF4Z`}Rz-f=H8I#n5~2on={;F1;yiCYebx*(4KYl3f-N97R+>v4a)6V#5w9
z3Kr}NDk?UV?VyMi#n<xP&t!3qug|_e-{1GwcU|9JUWSx&X6Bsp)cZcqnKNsep3;0F
z!;C8_-#{r#l4WU}&nL<64V3=+*BozU;UoIDM|fZ3KkMV0Ecpq^JJR!tCma9x|9}5?
zBVgCbs@-B}PuU)=Csb{D+*pxM6ByC0lwlU<7b>x|_HQ4ak~2Fudv308@{9?&3w<5_
z?b}R~4!*Ny{Ozj_zHS{tx)xItN?hyU%bt_d%h$oVg7c=k?e*4fF&X!ACVMY2#Y&|u
zP0i=N&HBqt{rf%rwJF`(zx~43jear@y>~Y~nE`3YU5353_dj0S>4v@JpJUP89xvB!
z(X*#~!N`;ni2eJ3|J%KKsxLP;d;GNAzdwksVrJ&%=H<@z&73`XdiLx^zNxv3dinmm
zns3@!GxFwV&(4{YJ-e6B8UMe2l+xpxMPqTYBWi4BhR6Nr<ba+0r28pYiDNx^v>tQ4
zC%oTzzx0-QKl6Uz-RphT`@HvQ?_=HvymxtT@ow^7;l0#*f%jZ*${Y8Fy!qaR-dWx$
z-W=~J?_h5qZ&$C++sfP6Ti2WA`OS0ObIeoaIpq1+^PcBT&mPZnp6#B8JzG7udv5ex
z<GIYU*0b8P+_TIR^#ncVc;<O#c=7_8<%=l^HD;J<SF4VcmA~xvtb4~vS<wq;UAI3m
z&@Ne6Tk6|hu2sv@6f+nJC}!{K6>llALM4p$Rz0EF)~_FLKWwaBvH;D7bIp>bk<x-G
zy--VN78<9FLd};N<#rL$hFs9z7+{yoM;B*uT?BB$IxZZX>9*45*iZg^**Lpo9$Jm$
zT1Av#0VXPGYC$bY*N+wZLNUef_E9jXaPs{5BkYp7=%X*!hiWQeUx5y>O!`u3GZm}t
zwhkTnVUB*NpItHst=n*|Q%a)1XBA;|PmZ$M^iK1RnS<?;*=W<5YlGXhEIkpnd<mnj
z+c2`C!aD}bXM%mCGhTA+BhBzK-ab+bFWL6tLcEN#4{LZCYagD6mofI?iFg@pA0CRA
zQTE|(co}IQZi$x>_Tf5s8E#iC$ICFgO2^AkyJ{g`hS*h;@iN%18iAKVc2!Tj4797-
z;$?tcMP{bIUAYP`{p`vFUi#XVOYqXiuAGjS-gf0^y!5gwd*h|2UD*yVJ?zQ`c<F9e
zP`hq+g@Ko@c7-1=UF?dPc<F3cjKfPOyP`i{I@%Q-@Y2DqXo8pac7+!&KD*q)%b9k0
z5HIcQ@;P`p!!DnIm$r8KAiT7(%RAwvwOvlb)5<O<$!lqsrSa0jE(_tMxm~sZFU{<-
zNqA{$mkq;96T6Itr?Fi|!_&wvI~6ad+od!-4einhUK-e?G(7d~QfgPvE**}Sx^`)I
zyqsp2w!%vtyOf6YRJ&vaUTWJVQM}Z$OBRy>ZzFfb|E1f!<=)r5+q~C!i@i%B*WJAJ
zJ>Pjg^z8K926-*;%=8TQw3h#n%jDPOhvci}<?<4FyxdiuArF;(avkYA=@aQC=|Sl_
zX|+VR^_Rcq-oBo{$?Y<e|9BbyagzVo;6G0AAIJHRWBkVj)gR+oZe@RwZiKJ4uwSLV
z!&kTPU%id5Zsxzb4`1EHf3+50-N=6xz*jf$Uy*QL&wte#Uu|Z;vX0}cP5f8y;;ZZU
zuO7lz*YaPj!&levU(w>fn*VA%zPgJ4ip2Ly_AB!je02r?)d%=$BmdQ-`08^0tIP4#
zW&BqpNgMdDNXxC~zaky7j{R!c@A&Fc{;QAi)g}B_PvWbK`LC|RS8MsN5+whPJhU98
zi@aZZKZOR^;k_F=-~w+FT40)Y1oS|2*!1r_UwGbzP5&77{5jb2+hNDo!iGm-zh`*H
zc?Nhod767pm4A`Hk`K!J<QL?}<-6t0@;Z5?oRIzUY<Yq_MD8ZHmg`BsOW#N((thb>
zX@_*5bdyA*>-^RC*78VM{*i^AZ)YsqUj1%F!~E;_q@?P10~hVeddvKx`rUxQ)o0&j
z2CLuoesRX!6;@UCyPgfBKYOgL)$h6_j^F>D)v5Yj`)g}gb+pbn`EJ6pkqykn)$iJV
za>~seQx8<XYc{#tqfO1ntKT(x`oMXYrk<{TSNGg~9p;!PuTVF9`Iep5=<4rIIj7D2
zJIwCY?>tQ}u64*<Uj0s9+4$-S)~L+8{GYe~YhgI;J^3!%|JpXQN%gz$FZ>~J+*GUI
zeS6!nAI@8LZ}q!x8cU^m>R|P|ua<0BJs{P(`rVOMsV9$_tE=A~o_{QVsP#hiyQ&@g
zZ=Gz_I{9uw+0!>JySVyY<*KTXWzDUAS21bhhuy8p>UU-9KVGqF*?raTK0fcgjiJ<+
z)$cx9`h8DNs&n<b1N&au-_E+F`rQZD=dSjqdsV-C@4Gw88>cR-ez#YN-2R0*srud9
z6FwYWFZF2kyFK3E)a|LCs^7hI%S+F0H$SL;_u^y22ga?D)$d-oukMUK=B)Z;iq~X5
zi&mEYzWP^l2R^y5`jfoPlYFOJ3O>0Y^NId={{E*vuvX&}yZV#UE}x)pTb9Hp=Vv~N
zoD<D|<PEbJpHz=#_`!FM9j%?(gHKjveiLp`kk$P*>s5SmUgncfVckK=cTyYh$;!+p
z+6xcgvGMBk8TjPf>Q8+4?RYQGdIX=W$b6#upV+zPXzD_IQk?lDcuV~@^G)kCd{Vu3
z0xuuj@OFOMhfj(!zX^0b?Zo@p%Vyz|!ptYiEeDtMYij<0PtuuB{6GG(_5m|hiceD2
zpH#~O$-nHSTbGu=<G%}1Kf>D(-ur8wt037UJzn`8`9`@wo-DVNewJR7u8{KO1M+V9
zUik`m0DgIr+)r+aR6v!qPuebBB9VhPAggaq#@ge}qFz~jhyLC6hv96S33$%wlo1N~
ztaJdePKtE;!a-Sm^Zwo-ls3uJ))FaGNd)0O7i&gbOCV;jtgg$*G%o0o)psD%&@f`U
z6@ibPGL3Y~7g16sjq&_8S$&%^KUY-Ex&YtL<8NF`q!U41N$Ezyr=(Tgh#6tsDno<0
zXJqwl_4f`nB^=YbTIb^zb9!d=9sKuSsJaz&21Ac4VLgE$#7vtF@%!2Rv-)N;zt<85
zZUUoW1T4)gR1ztKln5jglPtun-dTNz|GibvOveKl1&p9>YAG5_MUAG;M2ndNv-;*T
zEsTU^m?=FS_k}U|g&1_)YD!N8Q!$I$oz*t0ZwsznEFE7q13#F-KLDN<@p3{}V(2iQ
zj3KJ<X=*yCq*BkI)pU0OiD6zKjd<4b1x!Ux6e(83M^Spvh$jsz^%|N@YoFD({on5<
zU>F6I7||><8^4;$PkTU5bhRjin9?PyZ%?KdB@~J|L#9$3l%nj{Wd7+8oyPP6&8MbK
zXPI=hd`Uc+X6mWVXf>%{R^PFIzkrg!7}NB`16qt0tY-R@WKvU>O+%x+j#+&>GmX?J
zmLSFrKRJh=#E6kFOvNmwa5JuJCPZkt2C1X<n`%N&e7ZDR^1kA=y~ALBpZ8qkndE6G
ze<I&3FOoY-Ur1Y}7=FP0^+W)HXt5C&Eoy~1Zj4yaa_!V}+7Gu&7UAc;xt|A={~!PV
zKOFxr!Q9TOX>N;jq&rMs(ow?@p=@_yWQ^A^yJRLB_v97^^c-}ZlVS4(^k4(GZT^!h
zuL~T_woA@J+tFNG%C8`00WIb$iWrby#nCk3j&3K~!)xF2ywk@nnSoAPaGeAVD6=_k
z3#Dyd?S*o#T{0ala@iJ&RY0O^8c7p|0*b(Z@ELS3+9J0jz1}J3{?Kf^T`~<FjpaJ3
zQ6&s>dr`cTm)u%`yv<bf!scyax|U992^a~>*V1hm-TzVcrL{BiKUeZT;Z1mld4Bgi
z=2_*L<>??Fh5v5LbLEE80qI(4E+_sqeKs2D1>DSF_K{Qr87~96)~6(tSh1DrYE5)+
zDpYsjx<lt8X{VzDHfd)nA!t%qA{~wZbRR57ycizRpNTAG*q1rC)<wE7f-cx}VO)vA
z8c_bNo7+r(eDX~#j$t*0(X58m6jPEG8D}M7#T?BJ`xP*1xt#>o_PC<K-tKlu2%XgD
zo_~Sx<GIqpcOL3%muUELEAGdJnT#lj=57;x%av=dDZpf_Xu?jms+%caARR1-Y3d}m
zVL{$S-}Sz^zg-eU!!x*RX-K8R2k~`v8|AOR^sP5;hLR7U5v$|_${Fs@m9?kV+tVEn
zui)qG!}oB1tlr*Y{ls0kA%9IbM26keE$vL9(b9UaT~jO1F3Cru$=p-u2}_6j=1XcR
zI5?(H3x)Kc4v)tNPeEVkb`?nWn6qu>5W8e4y6Vbx6;sl1FHEF`vC;(999?<hqY2%S
z6kdXsd{Q{(w6uIp-0P_?b?nfyD#tE42d%QX>-}k`gAqjs8kg`DX}YQUl;zFbZbDB_
zedg#p7=g2E8i6D-(vT0RTLqpQ6ke*>7mR62CPCg*=<25HZ{Ia6BmWa6?+e~F-m|<-
zJ@0z1Mn1l^TnYKVSY9Zfjwt;?i82}g;Sbt>1#XD7><LX%L+O~$(w6I1+^2SOZz0@h
zbt7pZq`er8S!u^uK;ob?NX{*EwSp$KmD`2#`Ig)7y=bCcvK(FHapRhT4o<)W#|nt0
z$r$*QcmN*-HH=F;x2M2sZT@(**95zy2tDO+Jp~jUkC9GT5%STMSjq@%DRR@|>44jh
z5}AANCG8<Kh3JQu8biptN6P-ycWV$*lg7_ksc9|refW_^-+m31k;0Ezl>uZ(OZj@c
zO(J>oo?Ch?npib8N$M~RQ--)r0vo>iJ>6)iU1Fk1cWxvQ0l=tg%hHgnSn)i!Y4Gvn
zyWQFXw^)XzEN+ohVhTkr0fZAV%NJJ!ix@pUTTi?&(k@A&b${-{aV2OPFdbGZ5?6fb
zgtmN%dvV=~-pAM_2AU7$np;o{<iy8~m<q8lHE8jKfMo>kJJ2Nd6rMa$)01bS6k3h6
zuKK$dSFMj9`FJK2S{zMT4I5I@F$kj}_{Hi2=iPAq+ZZmOH~eq~jXzZwVgp29qRD!F
z!I5@@(7K?e)*%z1ZINLX09s3%aKgs8HynBJO?~(}lK+O%Ig)p`ceOXyD|ue^Z1PO=
zw2%+WTjT|Ded$B#27LX$`Wpezp{6^7u~C4WnV3UUi|I;0FjmomAtxr54Yx~AMQc{4
zB-4n&Qj|1M^+H|M&vqXx9ILnIjdcU;(%NXus%Hz!R>9IU1;d(OMQN~!c4;lNV%5lh
zOg{+XA66Hi-u<-+cIheTiB%(!G-5job7`nZ3-}^HGwERv%%*3!&!PUZJ~yu6j<RaH
zqlgxZ`+^1(kOpZ&$QU%N43eoT#e%5~FI!#v`no;rQZIUH$caUGq<h`qftOd-+0oxF
z_2Ad+I(EWv%$z7UZ#JG-(k{;~mC=Yb%mF~27RC3D@0Ohor>&HN{7K3H??e|SKe%oF
zMH{T%cBzD}nsIkqh)jo|t@4ZSdg|&Q2iYa7(V!#OfC3Ln7zJbLhVFy<SN`zj-D~0S
ztwKB2;e(QJR#`$ZLy&ljSTb7JNC@^=x%0@8;^uH8&O;}x8xb^Ut)&nG#k9Zpn|CdH
zeB0Y_l~<xA?<zZkgs_S7O;9+{R>7&l{V$BqYdU<CU2-lu7|1<$25-|$EV4L~WYmWM
zt7{((?KJU%jQyV{dG{daAM~Dy{QhR-^Upy1zg3ROJ*D5I7o`iFtlmG@0o?&Q;-*+@
zCWJ2PH79PqeZ*+Hv}H|05Jc*R@>G*nKs+d-f)khJ4uRf%bn_$U46#dFpaXXFV}=rf
zpO5KB-b1*wrc7Kn{%*)bbF^e-B67NWozT8%uN8lR8*Nt8jbe!@NbeLwoxyWU&?1j{
z-46Vt5AJ>bd}y?$=z!H|WKWT5!zx9(3N}j6D4{dfx19fQAG@>(8nYp)se!{a-o0Gt
zp4%4WM#tEtjnRTNgm4pd)d^w1dx)fA6|p+{x;;cMzPW7NGDu+~^uS7?k|<6IQ=uGu
zJg3LSP*<m;0jof*G-wKVK5aQ{Za9qu7X}L<oRxxs%5yKRResP(I*yxfSkuibF+=l_
z7Nr%fC9JfD)gf3mt>FE0Q$4fo(gx^(m24#z%Y=>r6E}jJD$*TCPFNw~Q@d{HJ87I<
zS|6RTEDnV9RucRX153+DCNX>PM`Fc70Hs}Y>m|N}7{z+%gB`_b%3Mu|AH$&+uNhf}
z26by{pz5KJaE0L9`Q20XhuWp5p+OC<8W>`<`jduX#@e{!9K8Iq9*2fx<bS#Z-0uqS
zVs9_cub$UE>yQCBU49qX-E6t3v{%|JP5(#24+GF0_rV$f8Xrpc!tBFHA*@Oxw@IqW
zDgXy&vU^{F<Hb{-Jv`7Z?S`({_&t;I)saRJ{I7fm9K)n{MKgBNtq7bUL?ZB`0(vS)
zHaG<0mOjC~w)(H{^WXHsZ|Q<gc=y%OB?t;l@NQHsr3jg!KzG^yZi7K~X=k)%Em0t?
zI&>i=t_w+z$n#2c&3d>DozRYT8A8<or4kH6UI2Tj4r2)}v?=(%fo)d~*w!3(-?65<
z4;sm0Qx8W-0udnUiL=~iS5_W-H~lb_TnDsf4N?FeFD)dbvSM(%QpK1(A(By^{C(2?
z*@NxU_UM33P7rnjm)jRmVg-V-QQGQ#?x;1&F7=@yYsruTOj6(m+yXZcgoZT)AqX@b
zeP+k$P>^S$J*yz+YReT%Q0V^OKl|#l5xwlvc4*OrwVe^8mpeA$Cm)>iqXBbq27b?)
z3q$Zol&5bx`zaMJXj}Z6cR_<nEQzI`5L$&AMO$}U2V>R-t$1Swj~Vj@QxQy?g3BAN
zH)_`feq670P1l2@LEmDr4|1O=_-N~*hxcdXUzfbQyz9M7yzPPTZ}Xh*nFOBCYw~(I
z7g+sX=@v=<NAmxleguzlIBt*iDB%JIBZ$ky#dOI7U9bBdns68zv8oeUI8{jGs%sZ7
zmw)PMmkvdP8p7^V-KWoR407z!A^16)j|mqiEghx-IF(img;k^!YQ(bjMLM|MXzzr#
z&c1!TT{;-uusK{XLqQS5v;`=Q?QjK+ID7=v=k}r=+4JzlUqWyPp%+%|sE|Adurp22
z1x;UUmfJemb;S8y_G9`7qBXnR$j(CUG*w6?6wH!-+x}gyT{-}**fh4boOCuWrfP)<
zxG9kxRxHxkDXp`6dH?QZp{Hj<>-9%Rtk$y>6*`~TooRue>7O_7m#^Q#g!Mx^cEW;&
zkU&#D9v_(UIJ8S&{G8P;lM^W|20S?y*Arqs`0kR^Ck{u$J~cHg)WbTMrzseOl#p7A
zls~ldyR(MbrM=OR#U=tuDq<Q&9AkofuqFssc-qpswep}adZ8_=Fd~9`7+!NYy}M68
zyR;{M&GI#saM(l&Pn`9M_Z~a38S1(R+OX<cH%&4SmX0Op)8jhLpm5QAhtEOs-%wI1
z|6k-C;Q7Y$qUT!A68QgR^6hd|9wr?HLr48jg8e^#2l1GMn`FfU2(*z#+L<8mH1H7%
zt{jEhN_}^Qg??T4#n*3)wM+BR3!5e^PR9w_M2JKrRhSvLwuM?Bw+sL1ZO!&<gMTs+
zU9kR%lO>^cgcjirFsJxPB}5huVtco%@VUG0nDYs&O)k1(t&OF{w4e}aYBSp0xOV^~
zWCB{S5@Mz?MG+*NQ@Q|fMX#(o<NkZ#3Fn|4>&6#r!C=HU9q2AGr*X?bvBLs^S$Sg5
z>m72j_Q#_KR%npL3IH9Vr&WZtAO5n<M?da_NzO(?)+EP)F;KLkX}$z`6k(%C&@SOM
zTi2d=7LPoxrbmuzCaf6gw4{(oC>VRmwUL`3H)GL`m7Abo#<fVF-lN7M+8l#lv(cuo
z1k|hjckgVE(HxB*v!kgRMTrnX11v_^BgD)JJ*0JUXFhb!t|ra5!NnYf9#|I>s}D#U
zG7UzNg0+Jbb6kPO)`XmQbkz^Xj(-DPKN6j=x*oA=N(XFFy%uBX0q!lRfkxSNuE07T
zf!6Fgj_V*NK+>U-G}swvYf=Ifn!*Q)pW=2ESylFSrv@4OKV0%Y33mT9@cdp!{y*Sp
z1@C{ee2#pE^a1ey6%sLu|M~~bvk>>dY90&$CFp$Nm_evMFs!iQcdx8mv1sYJr$h4-
zGoRJ`mM(;I>hd;`PugOZiG|P3vaoQ~!3)-3e?ROxk?&c%PTD4!L1@S<W4@ewMLZ&c
zBlGVr-uwJWyOj9%Y$n=?03bFXXao)9wtT9P7SgvIShzR_(?JA$)^xy&PbRTv0V*pF
zKU{W4C%R0oIy?b>AQACdKQN-lfITE}agcum7fAc;klJY&o}G|*_Sv-rJQybxM(KM3
zgn<$%FfB<T2rcOF#rdI2;2F$BH>_uXY$MoPs;|%pDuFa*J}}F`MF?qI>^_NhadJ)V
z)8NAqK+pPch-XY81PP6fOnzn#LcbYkz=nR>a##tPHg&Lj9rc3|KcDv#MvM@7cEl*b
zN~|F~uqmci0)wJ6-v0oR7eVlB<b_a+xL)MHnTDbU;RxXk90e^Q#0SAeFaJK#Kz@fn
zcs9R-etZR_PkaEa5daHMt$h84eEDLm?<r`^u5Tg6i%hyweWw%hER*qLHqU~fls2{C
zj?*;TFoz(?B@MC;Y0)pz`%k|mcSJ`1{gnT^1o&SQ&j;9{v&hp_eiQlskUT&-A-y48
zE&2Z{{Qvx2Uu;ppow8V!mI%fSOE6b~TK)PBY67bfMibUhMnLr<jubFXVF85a?OnIz
zM_3Jl-C3)l&UKedz~7=`;7}Mv!rfV;2xkrnTg;eMkQSV}Xvx(VHrxd_jnH@2P16%m
zC=;LH+H1?gYxdrTixKe7UJM>khQbBUL&#@DhaPA@`c<ro02;EZLeS;PW39ew+8FDY
zpm%m1tHl~PFnZjAU5WY3NHG93JqQgFF$D-e6uRuv>w3Y$5h~AGIArh;glE=QLUDF6
z0bI5eVK$<<lfKWR>?5J{tf56LpTVe!mtp}_r9eaIA@t!7+um7;tQLXuY*q_~)<7-<
zv^w(F=DCv_x^%&d>pp`d5<1UHVi9E?K{^C)Qa938LJVczcxY^SZ>Vho=~=Z+Y4mV{
zge#5_6uAk0vxjl7iisv<o}Fmmo<N=mnh%<SsR?&IFTK!<J0>a}d&de990|kl0R~6j
zN_brVgjJKrjKfF~v5p-n<V+le1)UQw?%Ki~Db>F5&~IZi@;_hlJ`2Ww9(MeE>Ujv9
z{=V{$*y9tGM@YX&uOt6A|DQ`d{SuSE95=*HKGZ1XaFE2v!12&a0YgZ4hp#?7YWb`1
zuL*~5!R2PciWyS`E=T^hJMLN31=$=z-1%%yO7H1Dd0_bFgB5W&w*<Mf&MnLgl9EsW
z@aHlhad@oTUK`N5|HJ3wdW6FB*NbV5h2Ou{W$fCSNF@^l&!&=%Kw-6&S(XOL0OmzW
z!ej|CL}2A3*S_^UY&&7{tZffQ;D%sv!8TXp@>pkS4Un^7sMPEU+us50rIhe_)>Ojj
zg$o&nYoV`53u)QtkeBN|y%Q@fiI(h2JBjQgJ&Su6aO%*&y7z3Hh36++o_+oR&}q;z
zKm-mIlW>KUpoQBIvIT(-@xnQWq2d$hgH`cC0nQC~D|uzqb?`h0jAuQM`S5<ayHgbT
zp?u>n9*heC@$9(7LG>_HhwQCcLdv+H?Sj6aU5arb5S|^EkRC$bClx{7G8Rk=;Y+07
z;x|kBp((ND*rr7hK#xwM7I_#;5Z=(szJ=?5M@U>FPp(J_!R>dv08-GD?Z(6idPg5s
z_l7q8GV(u$_`jEXb3MO!p7IoW24WY_8}dfr|DC0S@c&mzw1<rO8-eYJxOX;;0nTG8
z6hQ+%r6^j-b%$F|yq2?cdUw05Hd?dBE$IGOdv<4?hNJu2WrWT1`9tVpvTLIGw7w75
z`zXgQBN(2Q7h*#vh<NW1=`Emc5%Q-&rWZigP=_h)TOI3Tmk|ojDkBS#UR+3AM(6hH
z{a(c&yNu9w)`u}QBEAsZZ?$!wGI(g%jWd24W|w);j<r1*<N>6cj6W(&WiV$??!eVO
z?J|Pj*?=l&&UY`RpWW$<tKS`Lmr3|JYpRl<uOsgVuD_BHbb$Yx+MkWP9;=R^b~X`X
zVb!G^5e`sN05WZ80i}_9?a1*#A9d}8E(mpJyKqc1?F^t%3hKxb=qV#DB+A39?)q`e
zG{m2TxwG*nm|kcbLRf<B<lt&ybGIf;ks=Li5Izk-G(qo^ISXT@O@xT#FbB{D?e0es
z)Ipyq3o67)(bE^5dEQrul?a5-<+`Gjl!2`c)udObI2xCbk&Y!aVZADcd+r!=DclF*
z(Xn#^)B|Z)Oba4aLDl6K_vy3h1R4^Dj%^6E1)MOLS!C7(l^4DJyicmm%E<pT$@?zk
zf3mlkr_^(|M+5)wJ?!vZEO(W@l%A5-OSA>yfBYMXJ<7NVHe4nOVgd%0m^;pd6rSTQ
z3jL9S_ZzqCVV4n(&nowT5HE#xZQS0dD`b+edsZgn7+o>f9of^Qbk2p4EyC|v*>X7M
z$VkOtL*XC_npQh^?eShq`r2g#-Lqj#gtpa)oWz15&#r2|4)R5SJv$}veh5k+^{fhP
z`23$~^WP}DjBtC_F;QY+4f|gx2M@m_j>WADu2Z1Hp$=ES52e=#?OCM<uNTx<Y)gST
zz-}RuR8q~LR10FRjed4mhd`cPb~?IY<%8610j2Z_#Rb1y^~DULW&5BDLur9j8ST^N
zy3kpp?J@%Md0A!lJ_+>2K;O*|?0ImwUDf~{u--AnyEK#}rL?kYyXz`k@IXmdq-x6u
z!)I3thC<cygcct(N*zk~v&#svXG1(l6Jd~o1nP6^uD$=<Y`cs=dp2kS!x9WPC=qy8
z)EEJjfhZy+sBr!3HLYhoGtMp}AfNS-oUF22tRn8{I8#JoB2yol)TTYeh*)>57$t>7
zr1oXOE1z!3$p0h>wLUg@=X*P%a>r}f*&9R#@E!Rwd5U}r{Qrw3DlG6H{~-H>*R!&p
zAxb#Th)UbOtd!tPE5F_Q{njI6?Xs?D&Km?|#eooFbxlcwUP1Z9c>FIBL$h_ew%jt*
zE+f>Q^`l^N9Slwd2f|7T(5c$&p@#FZhop=kdv@-u1c8&7IhYbMBoU<;inP!WycuOv
z=Q^MNj7R8H(<302Oe_&6(1&S*$U%BdVKUUW)=rC`hw1N#F4*bMRjshYmq5&G8VQnG
zAXbXN`qAPYK5DpNf?Y-cKAQxn-ZY4O-wMb-va<#e2;+dUbiqA{9J^-Jr58@L%LvD3
zQ%r~vECY9u1d~EB@gL~am=~~3^;k+k0YZm<{Qdrgz3nm|dScyh4O=RvxZ<bRS=RXW
zYvAe;lFzz&FvIZEqQ)S%QQ*2(W15+8CJD@Eok<~q9-Mi~z_l~*V?y%T9}9{wbcOQM
zT@OO{6Ohm9{tVpI(!H7Ju)akLHV?4N2*qc?SjxyzXc-hJn)<wl@2k}g&rJwE``k!8
zq^ZP>Fj$d-e%C#HDg=+XcC6qb;YnEztw<w)2iTB0+`Ut+cjLA5Kg-DfS(N{~+PlEp
z9rFL8=R!}8r-^(>zCoTTx061?{-3k{qwu?5jz`fF+zku$SsA~TYWIMy76cp2k%W*b
z%w;ID;@+ofK@JGTXXSu0Fmb@OPKFbVQdl2g^SY2dQs4Of=}UitOcS)v%5)J%0)50V
zD5Q!LAw3MY#PkU{g~%f-2d|C8bP%x5nhru)(t<w~=+^3yQyN2T2*hW_2KiV$<v2gM
zI6`C)3mmD@L4h)-xih0QxcKmH6=r-OdScBu?VTnz9h##XQ;Q&xMQ@aNGq)T6@mbSa
z|A9v!gr9u`DCW2!K*CzDrDskl>SdSpM+-Kwp`?u2?iIq?n+tyJ2!Dkj{2Kff%nz^;
z5T)RUQ$8grV)`wI&GD>3d&2bD_7s4uQ1E29Rs26{=m|lX3nn)#{>XxS6130CXJ${6
z5KO9XUj1rzCo~~YpKk(}#xVQ2PpN-(Q{O*Y!mQSa<p+g~T-bm5HNOpquSr-w>uZwr
zLdG-c04J$p0l>*mUo$SJA7+d&eRjqiL|>SJ;Dy64cx(+!AMx&3(-%m`X~P{7on*ZP
ztL1kpRAl7;Y{|RNd%M@~^`XwkPE_?6>B&L`kBj6yxry|ibhC7}E8_q7Ut>_m2zND<
zi;67J5hCP12BOde<Uhhi64;mdPGJbB(LD6Ps!`fEfPls@g*YPo@)P|g(0U@2pIuL?
zlZpVU5B&i`nWn16LSPs=@WAW=GvWOaw9k8gMhqB|a*De;3TmAy)i;p{nSeHIA|#?Y
zAs-UANa|7U*yFYicItGz@0D<GbI_V~Z-KSxv}wgePB07+5CS3fl>5JVXcLB+(0z88
z5liDik?I2XT~AO<kEFlgUF+Qo=bq39+GPaux929x-8?TCxzMwRn^!5g>v1*RHRc6-
zqrk!NDFK4s1U5&Y?W6DAIs_`7AbwWG1D!wy5xRnM?U{)pmqo}ZhPz$W@U6SCJP7z_
zmj}FU#i4i#;-$CvwAKi0geW5h0P7!HqA4n|Hh=5KVj{GkT}<$wFr)+lBc`Qd2C-sc
z14m@j2bFckVs;4VXJ-e_Lorku0BKk;s%${%CqY+*u9(%M;(6RJf&J|LYJ$ZImR~+>
zMhwcEXm(Awxx^p}z5Abt<_Fi1{5O=Q694x)?`&@i&s&}i4*vHM;{RFlY0^8=Rrva!
z{J~%mpwAktA_Kd&a*#bmyk#K!fgL|ouMZg}Ve3cWm%!V{pMpa}KtJoy6j32cCu-KT
zBwXNtd73Lr+KZ3vd2=GdZi4>Vup8=zxWj3p`3NJS1eX5vOH157f&J|56BR@WLi)g0
zM{=BYuLTvDT%RUp@ala&Vrc>sJ_p^f6P`{)u;CeLS;F8zuZv*^kSS1$l+`O=yy`{x
zPz3$6K9oa!rM*H4Y$u0UhrvPy#iT$J{6b~Ysv-I}unDu!3u_aIIiE?35%EZH{qvnl
zI&hr``e$7yWJ|FL8m7z9pV)l`0RUM=69^2ty||?FR+w0V{aF)>g%93=Fm=%*LsHpY
zktQJEpG^~_C_f9fz7@eNpgn3frk1*MA39_0f@yES`63Dc>wLk@BU9t}d1xQhovonA
z!x0oY+U-f}wQ}K1A4ZQT0qp375lzCFrpR}UrAN3;1L+QXu6qlbjaUGzW{YAwi<5D&
zoHStO-zswWf9_rn40v_+tfMeNL<V3@kW(*3Qw2OLTI;gImp>0}I2mnNZ3vGW+8^1s
zq3)HUSFb((_2P{DWB(uVfAYMi!TZ0)GX?cOK9o1e^W-+D>38G*cK;tFnE-iKl0z}0
z2%CGcSsfEY>`;Aydu#c3rB^im9jccQdRFy9<yuKSn1)~D1I9qkrRZ1A&-$t5RcNo)
z)IMN@u_YLrtC1QF8xTleM92!{J7u?q*kwVqXVD;VP#o3ouy?ZDJNFNuf@CnLgxa$P
zHJykmajFiX2(&jPl|R~Ef{YvC_mer@4NXbU40&_>xI*|ou;wA!wU1RKWTQe?-n4MZ
z1mF*TbX5cX5GL0X>NA+*-g)@Q(q4@|z`7^Yo?Z9Y_h%Y#AZYu5W_jJFp@zYY>&qd0
z1lO~|=OoXaN*s`0sNgtu%0P)xS}diD6E}D9clV<-XBnaQjks|zH32}=Q*R&Ic>@$T
z;q|QIPNox7_{Ipq`NedrMmhjH8w4p&&^{4k_gm+G2X}^`d)5iFP~!<jA5i!d&Ws-G
zDj1KzvX6#8bT_m<!S}4z2VCtKJ5b?t4U8`s`$8=2KSkc(p32W5B|#WIo01SXRgwE9
z-?8^N#+t}?>{u7+fR3?4+SyKqB?3<jD+E>|rl_KSqW7HJXv)Ei{G<NI^WK%-f!P21
z5~})*lTXM`%IC{x$)`%sVfX)kRsDlXtCkV6&dy)b6wqk>{hxN#*^D(uKsvkTG~~LW
zvNIG@UBFA!<F~y(w++St`Cfh;2)n^jtJbmbqOoqV1Q0V|;R&lZ=+maIx(bV^Mr1vS
z#Bxf5s&Vpm*b`b!0a3(q!=Vp<FL`4La$U=CLwv3a8wdp7JDmO7t!)%&Z35JJtqorV
zPISr;c5SIAVoh!yj$9*Q>BBh*(G%DatOFiESv1E~#;JanAnDrmdzTD*5D!dHIx974
zl-HsSQrH(qND62t$_gh6Hw9VM@89s%<^gb42xDiR70euv7-Vk==5SbP2GOcjk@BZa
zX_C71T7*voytCm`A`PmrLb)2qF>J3TD7(n2IsNP<2(}4)XM=6HI&c|D^x?ND#R8)s
zv~>49XFU!#h0u4_O$j5#uBkI!NmZwR(PpNRYnQ=d^JrfYc9v6Mi^Z1?0f5JawFJp~
z!j~3e@9;b0pLpd4_*uk_WBn{u4<p^{E5b}hG>R}Rr)F0|K#O$WCHr$`z{rNt32S7X
zG?P#RC1?m*PdO3zt!ML0{6AarzU93V`+xg;4uk&__Vhs&&->++JP}p@4uJnR`=0~=
zncs{?X=B_F>%|2$@DQ+XKcZvzQ}sd>p2#2lE}8#Zwq2f8)35}Q`2rf8NoK(M(Oxnn
zqf?FDNs8|5(byh1$}ab!6V`bM{k<Tda1#Y>+dOl{uRZK?0^-@ID=l!s{jor!R-N%{
zg5KF*i~Bp3*Gldkx@(|aF5%a#dq727fR$orypZS8T2}TS9fNyJxH~(rDZ>HX<A_Pp
z2v1N<Je?5JDNa357%4*CStDg>MB2fMLuDh{?S#aeZgy}-RlQ@4v9B?LD+1lw;0jx4
z$u+@>Pl)AE0!z+ZSo#OF4T0^fwt-}#5(nzmfIbWptA*hc6q3#e3uaciS#2{c7p8)M
zcGgrlb)hUGL6NKr*h-|`sJrK00$hZkbru(a3rg_>R7@1vGFq8Y?74R$oX+kLMDF~h
zM|uIWbA+_F;8icwoDhj+iiaYACo&wnIP_U=|9+=PER-1$-*{!FVOu#y#!-byqpRCC
zSn+G?MwdaE5e1G_W(g`Yp^DU&uP%AF!H*gF$Nv9!y&Dn#H}~xITnGHWqkIe=z;Zbo
z^}h~6{;8_xKmQwnBImddR-Ic=k;s|AiempM{-FrBq;!1Yc+)HM>~g}|SvMF30iX-9
zK(IVARjv?|>ojvAeYu#wR}XEvc;wH$?eZq*iZ#b56_pkjc;tAGHJA6X%L#k0VRo@=
zUYIYvm-oJ{qae(LwzI+<K)IO=2}{6TRPVuqcmIMRB6OV{B1NUu=wyU4HPYs~6CJqD
zo8|94*e)kPos~lsDg?s{R&gRIY<N`9oVjbqEB);92586zmN2a-j%o<8uu|uv1Gnm9
z>~g}-S+zm?7(x7pXG5M9l_F7nDdDP0)eXMJK1>7Q>FhLsg`f*AVe~*ByJHrfkHB>H
z`4SW_Vp!qXiEdo}jzc%MFU+ya2|#D{3^3%AUJ?Eo!M+QqS|noPX~Cli2fsWtV&yQq
zybiiyh0ws3aZ*u89~<$6?ic3f)u{)5xp}x<PMkP4j!-l}w<vnzTo)N^pW8UH;h{C^
z=CO8pZ8T;byG-1KrcPdUW)21(KAI4=24_v5GT>jZMYYfct8UW5P6B<1nOym5#{VBl
z^?%Mo{ZFd@bG|3nBgs4EBDuG89QFKD(nwbHF-Zh?vy%jK0!9Xi=9+2_5gu}N{kQ+f
zLBozUHOw&2pd`TH5|W#tNiWNnot0~s6Skep>E0mf04Hhn(LN8d04G&A6ojC}{l6~N
zo_!QTOW-yuv|$BgO)BIO5|)MjuSXYL_2xvooRDlb><S|=M?r|pu6UsPFdxpj9#rDS
z6w)sK(3VY2&xemg5I5`k;Rdk0kqwUNNibm(l=VlRK@)w~>6bNoeCs&7oFH#D(}bHr
z^4-krSavEbQNgpY0F!EWzP#tanYa-`!r2>vVAD=UikgUlPEiGN21Y_aKSG<XebV@F
zs9jD7Ict_3{+naYp&bGOJQ>ZY-|61c33fRl<*Zo-wSY!~{C=l)CWfSd97lLJ0)fOo
zz5h);rVp~q2|H&K9zfb+8WBfKkp&o;aAM14-O-NVbG9AT+Mv`vvJ^t9F|en5qpmYC
zZp3wC$Bpt@x<N)Mi9D&Mr17svu@V$+Ix_Ohe#`np+KKVTN;^tEI35VH1sHV|`DUtX
z*vOTo@PuY}uec0;F45pvKbLmbVE6(CqzT#?v6CvGN0GJr4<0Zx_P;m9|7*O{y)8Xu
zo_jqZ`2Xed!>HTeS^7$PQi@Bx9Swks5xC7>44X@^HHYjnkteBeW7mLtvwo+HKIE4m
zZB~9Yu)i}-tix9XTL>(-6iCD%s^q&Jsh*x^ZvAb5T~44j8#M#rf*d0B7eHBc&585Q
z>H@vfAFWu0g<W3A@!*PZV+DLpe_;EJ-7nz23E^h%+e#QfB`By#X-O2}#wsTk94KEt
zUC7(yZyWvNl*KTm1a-5fGz77apgf6FOopO&8cQMBrPTfEv{P30x6AvWhch@8h(;Qj
ze!+rAKTUSd-h%rlxSPNKbim2s!<<o+i5H4Ak#d3VnC_0dGHu{b{+^H)0>N2nLETMA
z3ZMYfCoJ^fb8^G{gLrO&!`bJyKp=GLTZIiZGky>kfq)r`y(^9R0~VP;an>S(Q|ge*
zGT9yx<JK39?etv?PEU8VWt|?dw^2wU)x&*KzjLYs#+mqR>^LK(2641ff>Re6S(^3b
z^)M^MVq?t;a0Uu*Q0rdU)e)L@{Gb_y$Iu1MSdW2>K6t6bhsM_Azhub+dac)w-!RfH
z?~KN5{BOWv^(mw|u=NLe(<l<a?!ax0u6e0_M*inW-Z#AK!2jv&IqKQvxd0VF8(|0V
z)$)9~0pkB#Bs$ONpZ>vrCoG)x-{FE$uHHmKFGyAv1F6AIQd%gbm;$jOJg3f}OZpA5
z%X82bn}Wx#C<q%YE@fMUh&=el_s@NGFEj+9;;e=^3EqiXU3oEHepwRMh>&pB8U>I*
zN`rfb?ebK>26m9<6Ubmf6XMk9gX8bJ!N82x2#q_t<$>9uF&0t8r?^Wm@atT^^(<zT
zpmBCao#l|JCqf$tP<%?*;U4+=mCt(|Msq^N`Q}))j*c!s{VSxRgNl&Q3mh|Ee*YMp
z3WCR3rvi{A=<qs$Xk<(sdKs`Z0lCpjE1y66s_u3<f#z&3TOihiFL|`VP2Dk8gpjkV
zKSb1O$EE=6fo2gE>I*%F5AO?Sw?=S0E<|^s&#RtOpMd%zaGX_N$VpL|Ok!3Ec1!tk
z;@;eWhzg0-#zuuG5@CrBX6E3LzIHh=*w{!MB;bgW6xaH#?YmpgAa6#5H8#Bil7N$(
zAvcVMLqRbaLCHqHs_cC61yET;R%2Bb4!%ItWTk{h(^|D{F|td>|6eS5w|isWLCF3+
z=~?L+E`N;^J~o2=Q(t;T+8{0dr=l<Z4ueKOI6G(%o}ezM&ww}az=+;(BMJCs-AF<`
zp?0zAsEoltL1soDIpfj}<L&ZUXv(Ic5$Fd^-Kjc`q6jp>G=xC21hEZ0{Mmqh??c@X
z@Xe|lRY5U@0v}j|IPODmqm*{t+8yl<#X)E{t2i**<hoVk{W#x&934mHi90!!=j6Uk
zFGZw01O2d(au_5L!5@h3+&yjM4hR52-fXmIwGxJD@Q!iY-h*l;SesSN+H%y@3{v8c
zVq5t9K~fPYa1PdprV0xu@=4`S-;IRtN-#I;ySlz0kQ304f=<{VLSFOg9X&D#!%ZkR
zKisIr;Z!OkBul_Qf(82{bsIsv2<v9WD?@q}VwC*H;uX`9cywZ;v5yYfLTNZ)Wq<nI
z#Kln@XUGUna7Qr|Kdtdcey9<mrLk&+t`0C8v6n8p?E(*-e|aMxZee0gw}4YWK;xi=
z=>Sy@p%bngcpfw#LL?mCeg8#GX2GM&MOVB>m+_*|I#Wjkz5|625tNlI7OKlcF1=&)
zfUJ!D?@9H)FY=B@{J+z)!rA}#oNUP>fd732{68eoNsAEAAg;-Zr$b1^c5qx2#Rdgd
zY`Duy+pbsw)kJ_etD30H6vAd*2(iM;)*ebfhZGsX;cSWwbyz9hc2Xfg<>HEvhKas0
zHMJnGr(I46cq86X7Sh9h=R`4RD+0b*ZIv4<)GZ-%5_;jLpT4b!XoB!=Hkv^FAb{KC
zMO$fssG<Gq`fbySunY*^W>+E<W2RCC<PVv6+GIm(0?|nr*s~DPD94nYUu}g~Owc#$
z6;t$%y(%ct16M0)2|N|G<NBxiM{xgyceD3TW%LuY&k*5&Ahz0bue3SrMUIWIZZ^k;
z7@&HS!M~qOBrxmr=NCWz^S6iz2=HcO0zkC5aU^lD9}9OuQlW@GUiiXa&R+8^ToppW
zSyx4&^7jr^0)TG}(oNiBJt1h4P>1ywH3VI&oJeczU4SlTr3pX==>bZR3WrB@A%jtn
z^P+ZqHWVT8)mTM{Y73bebdY0M9)xGADJX_~=U6kiK*U*NU7%DXjgT5!s*y_wg5xbb
zf&ZqgLyaGVm=JG`6_XeygJ8snQA7;VU`$MD{r=^BSDl-Y|3#AbJ@00(>h0k9-tz>`
z<?W9Q;Pdh|U;s5l{g3t1BGIz{qklu72%2XFDhW5#5L|Zssfr!`N@N!Zf@iY}U~D9C
zycH@%=njVq1iV~Vy=uw97rs-7<**Fx+2tTI|FEV5TBdZxc()H_!ejdiCc%#&IG*(*
zD3j$F7sMNJ>}E_+fiU6%3KT~F>&sg`wihlq!Sk#O?%=|-q@6q#<;w+}PJ8Y9M?d)%
z?sEdoS@&5`Lt3-;_cdyaYY_m?UMo{)gBEZ)fg~C@v4Suc40-+29}3}c5c1AC9N07-
z>*$V9Xx8#6S6+u%BCwsEC4?kM0@3kcVA@bEH!I!EZ67#x?e4ZQ%n||a>@49dFfyKw
z_c7Bn3Jhcu3Vq5%p^vdUi^hz?k|zY7UGhi<P|_<5kJmXgA}&0Ef1mHrcWYr82zF;J
zgCa)A(N}Jtx}+I21Oe=<hH#dHlOv=f4XBbk#9bhyN7~+VTfOs;e+Z$6HoPe!VekpQ
zu=3oM?QVP!#uk&s8(Zh9NHCL%)D$6*2rauWJ^FSmAL6~S%STwMVSm3Zmrl*de-8=u
zKUaElJbys?FYrwDoF?zW=^t|u{l6<+CM}VA&|%6IUUbX)Tq%d)F5o_q-@L=V_V%(X
z2t;qfJvfy}bLTZQf769IFJ{{n1f!4Ueh;P|S|Eu{)zzTX;IqL*rcEKE5q^D9@}(<>
z*%cBxVQnI5bZ09xDq~=E3)(Qa`q&u#D~LZq?5y|$JEDEQ@T$P3geoT@8@NPPPzZk`
z*Y|JyVrO`#gtN0Fg?vFeqzE^y9^HF%$Ioyn30P-cN;>Y4xHzCG3SO;Juk^D9`{7Fv
zuFm=rPVOFf6M;>zKg8rO0BxG?9AYYjkN(XI9{F@G;!ncX+4vLw00}1H^6(_nNX=Th
zAXkBIqfUFkK=z9eb~gK!@us1_aopga#5Z+7`i4Q%F<Jzuv!jLG_ZaNXZWBH0xaX3i
zz+nhcXK@(t2N1^~?M{122+T)W5;|X9#iRR#gr+}U_WgbDK^qa;&T1o!6ykKS0Z>~q
zf!roK2?2W)R&BJR&AZA9I8ubVvyK$)k9LZvBC{Yg4E;W4$yqnSb0D4^>p76R&iG&8
zPLd-JC2mE8oz>ye-4~V}#iS8;j-52*iYOhNhT}jSXDnAEDcG9KDWMtp$NvA<yf@;!
z-#)1S`-msz=_Y@R3_x1W!7+#1rFH*o|NjV_iH@6L)p9zS2_)%s8b^Wze>7COu5EdH
z9KlY|JFB*G+!dgXGUTVe&$TNW;m2(J1NbG5(t2Q+BJ76CMGKy4UDNhmA;<_maBGiR
zJI2}-gu}CQV5LFb#JnM*^MNEBCJJCe1Y9G>SG>A-Xdk<Rz<Acv!3M>Ih=&(+|82!P
z@8;PR4bXy>TGZzQd_>jSuyC9mED%;`8e|!<rUlA}{>kX4Zv42nT|wYHYrpA8OQAvN
z*@DMk{C=QaL0CL1rMTIkb10A2-W~9Q5nGev&lzV|5F*bC3LU6|gPAbg3F2E~k02?>
zv=C$I<2Psr`#`-DIM1qgq#kfU1~L0pE#v(sQQgb(39_F#3>WuL&^&+tnav&0(t>7>
zzFAq-;+yey1)=h+X3r4F5kw-#LzR57ITVH*T2esU0%tXU#<~Cojo|qj3|d0aso{(J
zO<cQqxLr{Tzh@nLKzd+dI}t2gK`kcmz4DzSntRw4r=W2|&Kkyqylu4C@<nIV#<&n`
zjvW{5cXQ7Bw0w=-c@1@FdTQS7B>xRT?*ae+BG~`maQ@!~p4q7W|B1Xwo`K!}FG-jF
zm+T)&>StFFPR~0$bOi5Th=}>;Puev0<)L;3LGo;NAr4JOwHt8+E9{w&@ecM{*Y50%
zqwNYrsk{;_(24^nI0mLaj_5$<PQkSWE$ZLV?*5H8Lz@s9&ubGz<j~;k8Mt%Y(NypJ
zeCv}V&=Dc>Y)3={2pXu#T)lVMDLp}2IS>%N?BKUQ-u#pfaU)os6*oFS5taLp)yXiL
z3AzM)A|ze>&hh5`?FvHW*`&*~Vmgx87ZCQVsn1;Z&7Jec*cF7wv)(SKt<Lr*pPKQ*
zaLBEm=-`e)u<12TU#JBcAtaua5ws8zHA?fGpD#ZQ4Mqq&tHFr9D_kIa%=%5~J<+Zp
z=$*Cx*qJ~f7085$uOMHL=jzffFrY#TBKl;peA^l*1;XE1rGP!z849$Xz=kn0zZoD+
zAL%}DXvzH()>#-bg5cR91Be=<L(-^XCGIJcdKUa-{j<~e)zdKq#Ft}-fRbYZpc{O&
z`;yCb3;|K(*dc%t!@<6U`D2Y_%7#069OM^Mni!j${m9my-7@lz`hUB<7ka078++dL
zT#wT~8p^NWeD7IuU7Y`Q<9}QIPm-YN`{VvtO&>PWwDk{}75F4@bBquHcveK<0Y)Zn
z@r?Nejy$36tRoMbi0mvaL&upF)V<#IhH<-pf(9a>oz+0daKqA=LjEE0eY<lbpI|lg
zK^t~8Kv^RnOg<%1T!E3tz(b_nfMeX%5S_ni`1?g8?Fz!$*?1g$K%nGUktS?A+zMaX
z>oyP0y1H4tYoW#oVQ1BN0jLHTH*9?JxXl7%F3dar#{|2A0CpCCpp(H7Qd5CFln=uH
zGR~v|n;=-%=+{r(^Kt}hnP7HyEfbR;r{+<->HvT-9d^I9dne(ywiI=I7<WQoJ9{To
zP0`^g(?dWa$TL$^oQn6CgX#Qt9scIZ4G1?0fak-4v{mdY6b2z8b!pJc!UPih&Q74S
zSC23>%we$>gKtko-f{U+?gOY<b9=wAX^>sf1--DL7{x*G#;KN1uF!7IZ(r5^Y_MI?
z8SU6GAd;rcAI@h3bS!KE(Zkas+kS$RKs-9uNuVSyDtJ)T3;U&+`R-NyT@uIde{Yms
zL0mdE9dmMrDM2W-Y$0?l-S&F_f3-R0)c<HG4VJtwde2AwulnHst?`VMf57QqMX3J&
z3-<pM;_JWu!QhU=McJqWF&AaYkSV1aYzp`lny<fm)#z{1bDdAcA|Z&IT_l-}6STz^
zK{i#$won`rwhAG;0J{ZW^=>$D94dmaZdOGgW+PEWEEx0U=4ID$?;$YyF3*vfh*k*b
zW}_7YrL1Gsdt40!kX;wKt^IYwmv7k#F(-(d6>}U4p@E1VBPX5=fEE-$Z@;{<@zoO$
zGZ5&_#tg_{B@H2|kpJRi!w1F@GZ50v#tgvNK<=~PJOgROrV$P71j=|*W$}<H=$Ozm
zm+!v1PL5qcFnBiSSmKNy@+zEK9R>mj@=TF<fgu*|D0tEPZ3DI7><}u>J3Bb5P019y
z!jYYHUaC_g9ME?<A#iQ9w_Cr_(t@)?U^(mT(8)*0-s40EtR`rE?BRhejtQQZUV6>f
z->!tkA@rQJICR=4(UL&TGJtRrH4}k~mKx$ts{U~4iC`&~6CvpAa>D5ws2UN_9W2dC
z34*9y`SXZRPlMtnZXBz)DX5`MW4^GE_)!9fKW}#y;!mQ)vGFGW=ZwO_@g$VKM;(3D
zG6c03zGZLd-czAJhzwVQ{=g0{I*=e!N6`}ey}<kON^@-{{vRlL_hSF=M4bP<+q2#?
zUj9{n73`mBsQytdJtmpbKtTau=@UxMF8!oa-JG^Yhbfnv^2G#hx4Lodm%YoOJP0ah
zm4~w(H*+@cvb4U!hYHOxLFo1RIbT1}7qUYbIV(FjRCBpL)1BAQ8Hu;1_z_9f43Z0Z
zEWJg`(~j4NA}5fXRphXsAfg}-0OwNB30nMc?>nYIt_Tum<qC?th%`C;$biG!Mm~==
z2UtEqJOgiT9Nsk#emlY9tly5}pQ?$B&Kd3_M%&uc65qn%Aw-;Yc;IBEfPD%4VfECK
z!G0g?B|+k>y@V29K{uN+aF{5C<ryllFDQf=%G<+EJopUM0HNWm8VDe?&iK4kZy<$z
z^GIt{=O6_yIPlgV?<{!?&polG=Z=E^0xM{Zcb_|4ujkQEPC$$2q7kdbP1qhJ?Xbg}
zcEDoFWVf|{XWiRk8(@css>a(Pg>t7b9&yyHqr;|XV^zjD1%-YpPmCX)3n|V)KdcnP
zU$S7vD1S?}aKYn45-}#|kAU9%$-{>+8AMoPCxfaTI9O&JIJ+ZOs5(n(S;!e^t<9sI
z<{^?G0vj7iz=zd^*$eDl@BjAgjQo$K^M8uH{X9Q;UdH~PuxAMJe_Q2cazE*N@PE&j
z#tQN;{u9FN$MslYMpbVRL7Y>SK)-?9!0{9^D*Cb?#ywbXfL%ej`<a|AB0rVbUonC9
z6+R%p@Zf5wJi^{tl?M+uvqwITva7J+V(@gw_?c=I8WaA`Hl}m!5=b4QR8leRt#9GZ
zbiuGYr%$~L4@`(V|G?OS;D|IuS|*hVOld-zQ+e5{ozoWXCBg2jdl|$sqcRPF;*_8j
z^z94O{q?X^33X?eD%lsO$`g6{kX1ShiH@Er(9!~BK;J$(PhJ5-Nw7O>C=oJhMYM^B
zj<=}B;ZSGN5S;w{r@Qz6@B=I}Lf+YBhI2AR%c{<QuzcZpJ?#pD*;&lZN{OtL#mAOJ
z79xj0m^z<BP}23?S<yef@!XxuaX$p0v-g8i2{FO!23If4KX@*5Jb~t{jt>yC69^)l
zCri*6`IW1xLKd_gvD#Q|r<&M<=nKNx$2<^&DC{^c6n%9S46l-Z`KqGT@HL3+#`+pL
z5%A~XxI$Y}3S00V!=D~$b{|R?SIk0N))$<OL@NAF>*V%hD1V38PRGo|#B{2*vg>vG
zOEU34@c*6Q|7Uxf;{1=BJ!gB`%OA_Pq5gM$={;2c`|r_zNy76H2F^a8hP?>RmNC@X
zhhHTStfF-~t!y#?N}T|3R;gooBOC6phE-IYG{l2n^~D2**;PaA3PQwLS{V>pkcP3n
z9cx_4ahFl>gPFY+?L}IJz;HIL;#9vV!oa40F3_p7<j*+?a|9=XnuzqTb8+HP^h78*
z+fxB@7l_3u^@|h+QW3B$kXUq$4L^co>wmiE-ex~yr4nAwu2cn844q&U3TwXmF#f8B
zANU8t8zGRK^+xireU4Ta?J)o%gA^wyB1mXhNg+KKxFdA?Z3i)$gqE|T30h@<)*3>y
zWK2kYN0vUB>U$1y2{i)e*w;ZrNO&sXsSF!ZJe)hwXkTkR2hSd=>Dj>sb>b@nuCahL
zD1&$3(XSE<NJB$*0p%I$3JUIU;29Ep7yv>0=y&hBe|t+HQ8fbS!UlT(eaD_SRtnP}
z#HCo%4|JZ20n9@f>Y&c4bR5YJ0fP(nd^7vdc9;ZW$FU{>HpD4@3qMA{?)6^x^xO6|
z;wB=<v2hcXho;IIME@!@(n=66IjScL`M+r1=1IQOGx87q{|@iP-tjp7_j%7M&rDBS
zxdigB%3Y*NRR8;L*#DA*wNLOjyY`U}a7d1E#qlmt3@mvvRbXj?jw~4UdBeH0(G#KK
zY)`7;*gBM<#d%8b?Vxpo*kom@C~U2DbA=(g^p+RC_8?{<oScnW09PfbDj9iM=o2oM
zKsX7V{(i@HQ?Z^18)w%O&_>7r;#3@IkF9Cia>3-PQmvim{04`EfN|F0fc(Q*P%*t)
z0)eSd(1itycemQN91aJ;<E+C$y8+UK?-SasEr+kAicFHo*PDCPei8yqU^y$m79HYe
z!coCl1Suh&@vndDh6NoFQxG`L#uNdi8279Tds);Mj2~hP5o!?_-jMU>VuRgj(fk*s
z&5aPAnh|iwP6ECh1{X;QEriVym}kKi2`?LS`n4N@8xaD|;znRzQz5|&j+zqi_vnK|
zLUki>xrw62y4)CAZ1YJuRlB3<<v5Q8geKLOojlWhhQO5l^Rxa1hl*%xtV0EdkTeYP
zU;#Q9%Jk791u83O`N*8j#@(O5fmw!5SO+Fxs8|7ivL?cJwyUsCfjdY<HP#)(hIrzA
zA{IunIROJp^bgv${Fn1TmD{8%*H@qaJA>-~ZSsb_Lp;YkkAnX<SpG?VNxmHTe{Jb`
zX{|Ivboy)l_aM8HfNfTjrHJ^hA*9!eeD2fu=bm_|C#c1hgkrOksG-<)F-8zf5HMgw
z0{qg?#^u)?Z&wnY%}yfnMTj9z?!>Jo8XNG;g)qo}@TKqaJ{e|L61>fNE3j_WyHIF{
zu_-Ko@O!`a^*o<vR}!qvdSek_W(0C%Sh3^|Vmae1C!}-XiZpe{A^60(Q(t{-fL%%8
zHX9A46EPe>hczU?mw_oe-u<~@U%Qg9Z8lX-93{gPq(++^JnNS8N7$9M(S%iK$kID;
zD&orw?Lmmt!^itHeQzg5s}@?bqh%$L9l@H%X=4;fh?@9=)jL;tN86QzYP0$bNxlNz
zsdke&ts1hc2uZqvaSOjKtvB4RB%qtsra0UWx)7yOP3+XdUP>W~(uRJrFF7&CuJocY
z>lC2~iG#)y^*@C!DAGp3FjRdKy76yQ_rCE>Z@ZF+ZLGM4FiAoUkie)%KODWHmt6@-
z;sY9(FJYAYC+yDS4NNJK*w`u66!>i7NnU}MUhj9P7?Ct_*Vwg#y`_jnfj$VMsXv~-
z|EUi$@juT0+=u$#GrV;@dps9;vOSIEw^09Yq1;~jSb9JzV$T1>3L>bRT|tY}G1~JS
zFj09N`;Qf~mAlaM5A1tsKT4ff628smxS+C$?iLiBYVER@x6I7yVOJ8M&DxfL0A)q?
z7v+7Nhp8qco1N++g5gk&*D0cn7>i1R;qYiAx`w)Usx-2qo*xF<l>}$E=L{P7h-7jT
zn%38C7O7YJ-6z8R?8;VX#@bHg0%>c2z~nAyf8X|>c0)7>*k(l|fZf6Ha%i6gt_bHH
zVj_%csK+fWPuY@fR}!Ahnj&nQqSD1EUk4nTsO%Z9T|5z58S?t&-Rt+XD+$hKL-mO0
zKn5FqSHHugadstP*Q^tYz0?uHK^zlE=chY6uf$zX;kvoQpYV;cD+$hKK`bmHI06K_
zI$4=QB`DT<_b*s?VT-3>1BiIW+5j*JkOzd-&9ERtF`b||5J5Y*Qx+_rcxTh&W9>>J
zps}7j<z4AGXoP=M6o9sS8-==<jr4AQX{H|&K(sV=0#H;91r&%&1~NO)Pv|LHJBE-6
z^uKaN<L7RIf+I>AtKd+46$1bcCU&`_`s{MSpAUSkG~M+a6b+Hl*vtv`#S1bOj17A8
z$DJAfAN4<92L3nN>-FsS+>ZFajr=}N|M1JLApdv#Z|i?T0tpIdB`^dqh0LKZoet7T
zwi<~2ju)K}IGT~8J+HgvF-TyIkT`k3NX<eHg+!bG`7a)LZ_r4)k|1%`<)=-hDyk4u
zVK}1jA}i~z2KCo=>2;%U^Mr)6H(yQsB?KSJn+oyb32?B9krWKA(tOwtRZF_tl>~>^
z=hTOQ<oJ6wjQ;GIU{@06%{q1Dje>Yf=~Pkzn9CyQ0bRv*Vu8sJ==|Zj>-s<*x}qOe
z9$*?#A&ZjI$UcDFs_RIQD-cmZ9r^X-r#)_iRCYlxtW*M(ri=v*zmpwDDnp<QMjz?)
zxV{}DNPsv$f=~tu<d8fx=LGT$vlx4;XSov*Fgjb4n)b0P2_9$R9+dagEkS^kO@kv{
z&W8r;h!(5{3#7B%3xu!z>gn&h46!STtyWWjM5RZ-_lEWnnf7gd?7pcVG)8;0WHkoX
z2toHwk_W4U<_tA&1w*eDc{k;>!c-A=jh!k$=}1@6!U9)@5KyNVkS_!lpa1C9?{<D3
zk3a-A_7O;B1Yp{rZ&JFDz6h<kV0`k|jQt-kd0#^QZ;IFBc?0KvPw~{3_rUvKBzJJ|
zztz(Cntgt#E5gxPb(KkLIg|;fXpy*5wJBxajDVRW7@akfnW~dM!TSsx`q}Qa0}G-?
z?3{Lx{G|-o#YfHwO~Wk`cFx`+D)ACGizrE$vJ}!re@0r-$Qhd+ib4GhM`P9jz!5rT
z=BRcdE>Rm@Tw%3`hePN%>*3H|Z0s6WgyD#)FYNr}Yg~(vaQ0es_67OXNkzz$gr1#s
z{O}a$4FbPey@8WfB8lo_D;+T3XF*{)9SQv?mxTf^S74k7|7OQ&1t>(=LqME3<hJ9A
zm~;Ci_tfXIa_ve2z}d_=str(87N>$LbOz$U<&HI1bk#cB9dKpu<|g4m2qFm*XM;#;
zjN&@resvW*HFZtNM*jf}9^v5Z;DJ+(JR>4+v2Jm6OPwaQc4P2}tHusqky4CQF=c0n
zONgVp359e-+E>@TZOwPzj`#8)gG5(jWzZ=iL~}<KOa<nU-hZAlw+R$2k=0m5i=(C>
z`cB<cJOkEEOx!3NO&mRb;b??oL|kLTv0@-fSTb-sC@vBY#S7o|>M8m6W#oUN<bB#(
z=*@HZziYt%Z6|*&Z<f!ITS%qS6VgS}#G2)wzJaYJfSt9qfR4#YrYa_B$7qO$5c%f~
z`n1g#a9Rj)XPp+f<^swYn0L!tt#3mhKtMYi2!w=UdExi>|LA`SI)?CcR>!1qdKDb9
zKJH|O5-+EY7r~JuIGuImAUiO=D3^nj1Z7#lRKi(UsYnC2li){B-gfH^m>0s=*?FnX
z(U40_C3A#?P`E)sR`=UrJoC_&HJ(&Wn|7FES)k&Xfy^!<R@y6IX1TWzezpA_Q}<(H
zCZZd5Vo)9m)|aFiijUH4YS3-2FI(09+}AO5xoFM~9f6Lha3<`i2(`Fu`pie5o(WTD
z?KP_I|Am7ZjZCZi#x1bdgr2kZI<5=z8R|IiXp>$O?Mgz*^Ej6ZnG4!R05Qe6gjn!}
z20SD}b7_nOe=Gm+{A2k;(NlI!Jz2%jG^t22Jan9P2-$_9$Y9ubXd&&XZT;b$7iQrR
zh!Mv=LPXT_k-(GZHT?!b6Y<~Jpb3cwhzn+zNPnQ4!2IK^H&w_<N5@?>;L#=U9EkhI
zdJa*@9NqItn?cofa7b3z65@q|DUFM^U7L~rzJ&i1|F5;@6X1WdJuT(E;Q!~#&81JJ
zd!(4uw_5&TA!@|VDN?gih>~dQ1VU;7wp7l&=;u+*k>w-ooXzsVDCwvG1e!gf09|<4
z(E4?E9DNnmlu&clno>C?;`9oQBA+P_-z`BS6J*Y6WQ(@c;qVJA`+|gEg4F9iy8Dki
zV9OSvC2Pw7U0`BNr?Otg6ogS(of32Lw6NPoX*s9FD2FX0pq#a3ID-IJcaH0x<O*K?
zmPL;|T!eOnm$U7VgoI6ZB4Xis!4L0Qu=E<-I05JEjbq29Q<xfgJ*Ye!JA+sP+XBH)
zw^D*NkG7rA;HNJzcJt5?J9gL=1>g=rG)45ns27~`)P2j^AsspwE!lJ^iYiuDIRo5L
zSbh4avqy?dtRU&iY58><wnmPLz;-srq@uzxvUCP)GHwOgc_9I$E!`w{x*NKW5O!Ag
zA(Aq~X~!?d?j;@M93g%TUeUi`NF_v?Kz3H7!=?~ON6p84%Z|ePAXXgfeSpP67!@>#
z;Qxm<eYA7yJ}hiv!?6pSv=}j11f05{{RI<xyoMnr1{^!Ya4`yTED`NSjwO)-b+lg*
z08i)x%O^xv(NhlmxavES|3=bK+W&v4cM<mgf9u(S6Tq{v1Lzf;05C?bhYY}0$-qy<
zKdete=-Ks|DyBM|IN(bU3v&{F;gvN#i?OU~#O875bSxn0EmITdy7}hqd1t(hlq+HL
zY|0h*kXRT!pbVe7Z!qi-LGY{{a`JrwVjga_NSS&gS`gIEwg^+QK$wWYm6yuXaO^`R
zVeCUWQ-rvS0DgKLoJ5U^v6vH)2(0dk-urq!>^#Biter=R6N(e)TurA61w7a=gcYMB
zLUp}goH2I=<UWjUSh-K)&>`?BvH2;J0&_FlKCzBwe#NAXA9lwuhtLr_%(Q!2h=IfV
z=3caTA{H=WCVm0KPsj4rM5_~dWP0|P&oFL;u(RW)CBToQb3st2K|$Q$+<8Y=K?WM>
z1G_vm*sdhly)!%VMhe@TR7!6I1@>rUQmea~zl;YYu$_HCZFxi&(A&`5Wam$NL9i7x
zU<LbR4LZ#dd{qCB_jDg)z^5f<9P879MJNbj(3hIyKLKBah;Y1DgAMO#T1dpoM9v9&
zIKYd?Fi}V^&<R3k)GvPKdZe6)9LJ`d1V^`^{S)S=M>6&w`2RlC|2W&*3jCkzJOTLs
zUjqLR%DtrTq(`MS{}lrOBTV=|JHkpZXpR-;^2M1AtDb^8PcT30&a1WDUn^I(eQjG3
z(Go%VY_tRx0L2<2?k5z?P)_XndCL`0L4@VAmd&Z!iAV|5l#qBNuK&P=OFzIld6k6Y
zvnwG3%D@omf`k;beXxOa39K0KTi%K(NGzif{3f81L9;k1014VN2OjzQZLAA|@7Z+$
zqk<HZ!yW+D1ccB`Y)T!56`?16M{N80UBHwG&Sx>D0M+^ut6)ane0FW|UGP&0&1d~o
z*c3-sV;c<>J%tlN=}6V<&X@MQ=Y{7QB8Et#4>pD%S~?8VVz-Uj`PQF*8G|`ap$$97
z0iE_XP{~mE`Ni=7&XN<XYNY(g{>a@(%n`EBCgvj8appL1Ak)&O0^q88!Cwy2d%eqD
zwc9~O5v<RuDB@kwsS_Crm*pF;#lpJaiv^-9d(Ff7h?Rutv)L4S02E1~o!#)EG*eIq
z`Vl?5_XRMpgzvKkwg{MtMkRrKiN@~8h4n8!`~5bk9irXwYDf7?=5S;3#?Ww*|Arv=
zf&Y{84)gqo{l6<bW5NI5C9jr;%5|hyq#OQM{J+t56+!xgIR#B6U#syCCp$@-DuV8l
z1lDhVwUgZ4t|DNcRbzs8piS=n^31o#*j0qzv$KU!uHLr+cRN#CKP?Wp`kX$jqOylw
zMJPV2gc6P1n+pwH^w0&$1iOlW`W)`*oN`mxtbvK83PA<f3WVYZP60*%bJ9jyqx;=8
z%C0&U{jdw2ioYR!lc_9&led&uNJug0r=3}K{}sdSD#G#EHMT76)Q*E0rP}C!DIFX6
zIq%}}(Xn<_Ei`7OWC}b+3>P@m(1a(qy#xeypweVa#lh7>?W$AI1sl>;7s`i}0w7&6
z*&V{@`JRK)^ucx&;rOftPh$6&VHrv26`!zODBSMm%LX>aToZ=R&NZGB$4X<&aPLmS
zkJ8T5+)L;0w$ojI$Ac4m&ptS*6y2#ROHQIg-+@x^?{*Q`+;8TpT<}Z@&}VZy0qj$!
z_y|!U)S_60QT_aoGW(u!b`^p9tX4%ap%jS&p({zvAjS+BEV?jy{t*rHuit~LC87Q7
z0*s<Km9yZSvdTJKD61H$Dh1J=5a;PLubOn?@{IhCp!$CodPf5Pd);GuMq~f)TR8nU
z2m60smCln!h_3(1e`65a)-;GXwu<a<kP5GxzKMXYFezP|xPz$fZoO|pEYGeYh@OpO
zPQt|m%4djJfG~=5lj4|IvEaw#ue;`W#c^~+Fg@GVWaPV@1M1=b(xzi13(Nxai*vJ)
zHxqEH{I8a5SUsSZT}9A6t3t64Mc{Ts-ksIzoU5=N3ASg~W2y*AXJ2*#;e+B!(}o``
z&Kd4F=-!v!*=RzW5N^*-CYWc{DLU926#S*cACAAo?p^WV&Y-fpX{`;o6N2v9I|;)!
z6RjPHSt6oSVSUVxU_O*H&OM}`0xj4KJ+N9(EFl<NzIXnNSy;$T@oRP=hlx6eLqU*5
z!%ag8Av=VB2!67@aqWho@8sH5gx#}|O9YTAz<X!^5$$Q9BC5_YSm<tnJBWeTcS)6N
zp-%|DXZ49g0LYv<uL=4@EBmFYe*Zys6@m7=sm1O`CxW)p0(~&@QJXi<{RXo}I6XUS
zD6~XdCy{W${t4PYNt6wphy#k4<v857>XTL@?J9!o**pb8KM;U}&MnXe;J8S@h%DSx
z`{z4H*j2>2W0NF71qZOf9yuof5)V*7Euv5FZuyOrk^gbT|GUJSi~WBu!vCKO{C~fL
z|B?K!k;a{r`M<wn2@uN8E&)8OlZ1s|OTkMdjpG}z0tF-J-&l9JSs#56)Xw%nM>XnL
zM-I$fj7=FxVjuw~7{b7<jmK`mp+QxIv$OJ#phHU{Q-n-CDr(}c0s-8HQ*jkav8}t1
zl%rPr`YXoURo&1Pn^;9n&XXB)WM@)NRTZbas*nbc_FKMoUs-><iZFOKu>+q~4WXK&
zkd4*%WM90x2`=5Grb{EO5<xZ_6l0VwgEWx?1uGXYgz?P3^Oe{Gt8(nB&gg~BDL@j)
z-Nl}RjPpu%5=GeoLkPfU{zpr{@9BX+5%A6mQ~;GFXilNmMYRzAEI9Jftx!XRzq4v6
zWa#j@HRRkJZmqMhgMvy8e>U=hoDbpq5hTz0e#71Q3fKERcA5zvgiv_a2XUyISUyDY
zP(`+~<}3N~*NZVyJ~U-V3T3|(Ds(`ZN!a5R8o)!CWZ1NE?i~bs4{!9)2AD#E-&ubm
z!yYAicS<K_rQ;Vwo4H*S1V#*QvL9ncbUJp-!W1J=G6NN4LLuTV0WuPL(DP@UwP?@)
zyNW1vXL2qnln5E(q%zaJZnW<mFaK7(|38oX|8?GJIR9fm_Wx#kyvYA=K>fdZ(tFYs
zQr_R?{@*@<7AJ(A)#BLr3U&`=ADvyC&Iu79i8{ff;Ppq|+fz9h2Ow1u+RhH86J}x(
zEb^t%A^wRiT7qj79q>rgi$21-CFGr5x2Pq6g=<AHsd{sFEYzzee^T##D0D*KS%nUb
zk;&j0$jYIL1J&lGL)&p1-Q9jd&m0->1om@O5ggAN6mrU)6kgI0h$!kKYlhbT8qYqs
z#%HHvgs_l{U`BBWK?+=G)KL-L($gEwjI8QsR}DfJZMa1Mypjy42+Mr1{mnZcf&n4C
zoi!lXu&>cc!AXNM(EyPI<SW#=$NW!rOth;Ab!YPv!D4u8gp5$Mhb>>=OJ#`gn8JkM
zcj=+eBip-S4G|E}t|8Q}b9T=<BuyOug^g3r`XNYM&>q_4;U7G4KI{o0@vJ>TrkHsA
zAZ{Qc!kt;D<O*AGiaUpqcXI|Gt%HFiOr9Oc>SBfhF-4nKP`YV329j`ib|4X!gn;$v
zPJJ}m^dtl&1^tiTb=V8ni`a6k>lG8^Bs#UlR~PNWS|w5(yH;~%&VzlZX0^igBE1D7
z5$$CbitL1Mt+F~#%-Da_|9jKB#k&~wf8Oz2?wO42|LgK4@^rZt>VIGL&#M1P60Fx`
z+!Jd!Rhoa$?XZ?`ekW~jB<aQZwgR1AZ@>21U%NmjPeL!OPR0&7s%wF+k{UMZQVtZS
zY12o7FozqSc=&?RFd+n>vnFJuJKMpkZ1d=4xaP!~u8A-_laMw{?Ae3=0AvNvfxu3X
zKIH}P>>by`66K;B))E2T2%L<g<BD**1$A@RB%{#(gqpMZKa(u+O^2fqAYL_2_|wdV
z?lT1bRj{k%PK-XG==|ts>he+SKtvX&FfP2Jw0H`(a_sssE#gp~<IxMNJR^D>RRBUz
zK7T3Vp~hP;pK?6gt|Ba*WlW%&3You9H2^_g7@~p#OK_>f>j(ZH_TB_e%klmHzL$}m
zZ)uSwBQh#AC?#oA$rd5mHTO0%_cSy2T-SNsO_P)n`9@?XdxVfe)@;cZN=cF=3Tftx
zEZMi`eVq4on=75C=lB0T{GQ+Ic|E=QeskW}exB#CAIIl7;KS|Vfc?3Nk^2X8h(u)(
zN$Lfi$))W++~eU3@jFRq-RO531ooOP{UjAgv_Uc<<AFe4vh7|&ULONxNnG7XSyFr|
z1tly3Hfeb#nHj@|rv1E12aLMXO|Q3~vz7^wyg1{8kO59_UadfpTY#s4I?y^uBES=q
zTaD{G=T&y`;oQWyiv!6Xu@mcFUVbk;OA_OZJPYMNos0#WlUCexZqYN7bM$|3DEemf
zGV1?+1pn)T$T8vH!!L)&hmWTIcR{EwbZ}7GLn{)}HqxhH%xXzb;XiqGgvr@#vSWij
znDp_N_4>UV++HHwMsBaU6&V3?CC)n_R1qLLTUgZw;FA&^)AuCKM)Q}Dw^8#KdIfM)
zAUwtLmA+O<4WlBgzb0S|r4POQoJ-o`)RCaK*{Orp4aXssMC|ckhC;gRsy_FxK;M_J
zw^85s^~a#=prY#+U02-4UXuW~aj(VkjZ>;jRsnwYrqmN6_CYUhs>jjo?|&Gol~A{l
zYNhKXd_&vd0aKx3?hzAu-pAyf$c4tqqolDq&GyEJh44c7qdipB04ztQL##RwSWE8s
z+irV3iPj?laHH0fLwVCkwt@ISV#o8=%<hf?aRS#F6$pxnkXzUp@e~BZeB@9W*cWJ#
zJ)1aS`Qc~Xc<o|{MZ)4nVhITNSn<N?4|Zq&Ny?gW|KVv7(_I|=l+pqFOPnA@+&~JB
z1Bsp`b8b3(&H+rJB(E8#P#`xX@{h{Sy#R29>+qW{E!qqWBeuBNg7p(nTqLi}sJPT*
zMPXt0<>4KGdx9zg-i*@MrZ~&K>0G}-vfYen3vN)_#vT}P?Bd}<|II@^r2pUL(Gk&o
zB5NY|MrtDisQ-I4d?o$A_6;?JZUX_RN00|VDA<c;La9v^VQ)bzvTiCHuv22wf9f>v
zLRP7qYmKWEnB4MVcdj@($>xx_wsCW4Ona%}5&r<#3$?5iD814Tys9V|659BA<?g+a
z&86JQD4WGqPck~b28tzvifMeS-n$+<plkhx6qmL!Db=brlc^5K;^c-dE5=^Q!z8|K
zd>B~{f{@ErDvM>u1{|5ALhttZxi@4afo&rhB{NBFb(f}tMn~$I$1WLm3F>2<>x}AS
zO`xWt;*jh$Ghb$2C8%wjSKT^8bK3;5cY(msY!4_Gs%QdHuClWa`01q!F*{4RlhN!X
zGfUEEt5dr+k!mv8;^)qHFr^ahHclz3f}09hb>(Z;KKV8+WHv}t+sI$b1$PC~2!Jt`
zmhaJK!Xjj_q^lWaFybjz_D50#K^m#UrkQl0oS^jT2gY|PEUw>h7B^{YT7JwiBupU9
zB|Y~0b(ta-QPR~ci&(2k164K<PD#(-E&lT5JW4XwjE^Gu5OEOjpOzeTarCx0-a|=M
zGkOnU{5arr$tm?uqgck^46Qq9S+{99`H%nqh3NR`VbNxh1(7k4;_%1e8>#*;3VjUi
zXUzV87DNKm#svXN8MfyIf&bEnE&qAgkNDOl25t1M<BUHkuupFJ_X{N_vw#wSHZGtG
zOV-I>64P@P$%E_xXe(e*l%4n3<rm+ERw)r^qgE*)0W<<#1}~C^XjLZT1(HD0UmpB)
z{f@-hBp}_zv<JkBk;a)Q8Ire|>fH1Zr7vFk%!!XeA`*=@k_cvjXeDl8zztc}&|%F%
zXF{S9fHsn-v>)MRN$(O)TcZ(<;a{05v9SW^IH{f9D4O^v63XFDMhR73NAeVy2|4o`
zS3BN?6xJEc5Cq&HWZ28^&Fp_IQd7dxMyV<DkgF_!f?=pcK71}x?F?y}lf?2%{=IJt
zzAj_?x>Cur7jJ=-+htuaM>FvX$qZwT<ADfP>anMmoccaOQ&Q24LKA!z2_I1E2uuje
ztdzv%+`tN@rjJ^8-Yhg{NlP<o&b3eua~=GG+Z*pKba}2Mq#2(}+%J}t)gcB#s9z%h
zU~Ua;nuYR(&Cb7b0^3`1)QsDk3OVuFLBpfPawldEm;gTnUZiZ(?0+BnJ9|^o){J`-
zk(SKiUsHt(qR|meZxFA(ee%Aa=j8uEA^Lwzjt-5sp#$LKk%^I^k!IxoT@W5d1;EPC
zHKDT5LB9MyxV~Xqo@U(4Qk?-zLSZbBlN6h>U}4u09qSvm;VPrhAJp_t6}|TVuG`}N
z^$il#HqI>kmTs@Kg<u_Z84YX(fRuoMN&J4`O}DS<UEd(FZ6jO6ya4ZGj98=CvSf^>
z11_ZGf;)OnJo=FOhOM~Vs8HviK6rj2lMJYpsoSqC+Nn#|`UZ(=8wHzWnz{i|TsAJe
zsOy{o^$k(3Fz*2uPr0ThQeCJ38>7j+X0!J#dGzTEKj(8Jw$Fu@#26EeBPN{?<C_)W
z-q&Z^F`Wk1H%K(wXw!)&Nx+V{8gw*qx!}?Bz!q}@&ZKz9vQN)g%H9ZZ8{^)f<q}Sl
z!n#bLYB~PIytl3qpQVJdjl?IZ)y#CjQmfd$-@!jtpg%~CnQ@xS_}p|L`zhA@jt-M1
zp&wb3%m#FC+JdQh-&99Fhh>kmeF;%4(D=~g16P%9dh^q59zrda)H0*}sBu+c2`H(k
z?U}=yo|xGBu(G15JW-O%jB_WcT@nP%1l;%W;XPIidmC?u<dzw|9bz}59A|P|I9)9)
zG+-{2oKsP=_@tctA0_x-mqmw1+eOwzZi|eh|Ht>?C&StBLFE6<4UG!w{{QX&9#r2T
zaq@vC87kNuc}uS}EgB2fy7cIY#alMbRP5XP(_f#<UYBUOk+fsUayBcw^bZ=3G+mzj
zY4x<{-r#Zxk{d6ljwcJt#w|?twD=4X0Vhl8tG}-r&<y4z5ppAQN~Yq37vwT>PqR5h
zK5i8V5X6@5-)+t^?qQ9a%RC@PvARn!yu|^afNrY}aQ%vVhkd?!!(sIeyYL=nXLHVG
z)(}0KTmxmvsU0Rh^44`->Ki0jZqCu<1p;1{vR3tt(=Y8--_V>3_BJgZeLn=@3fD+L
ziHWs6<d#o69$w!dF>+&mlhlhy(Gn&x04s6g<b?t4w*11``)yp*ufAbtt~aV~I;bxm
zO`@qnRb(1qA_vNt<4<-;PU(4QeS^fujYOHLqN|*=l|^lXyaK+7vM$@5y!(MLG)ZDJ
z5~U<n2~I^a;L9EP*4HyWX@T(Afvb$d1JE&D_YWFCc|iRy9ld?`nm0SwH%Jy+bJHYO
zr3VLga(wWD?aSCklCoypibsGoK%7egWIAm`qKB1UHW0cjZ#6UfWCx-De*y17{m=O5
zpy+nQ|F4Ri9N91YL-^^i8!iq<Kmea;!2dY1zF~hJZd6b4&*!2mI(Z>2<%jrC&{QQQ
zd%LF3NUx9Vd-8`p>l-9eZZwvq)D7!g=aFRHfV52(uHE{BkC*|8mm6n5n$U`3PU?UL
zj|M(S5M%=}_tHea**C;cO*(K7qiPb!`zz~^zUaOm*pCtuH}1!(I_(_?3NH-|B!M16
zhLuGDLw4kIjWxf{VB+@S7RHGqNoy=tjNm8JbV5f<ux!PHiVPpoG;ygjE<b+8Xm)mc
z?quBAr5WHAT-~lf+UW(TqP*yP)n-Mf`UVM_8{Gv}0d*+->N|5@j59}toNb(=fUZ~e
z?Y?jCc_j>1qTxmco2|wZN%T%sdmT%U1@d^(t?s&NXlq!LM8b`%NwP%)&l?rFK7Hy%
zC@&KDHYzU?IR}Uc8!uZ!BV(L#%nA7q)v16TF{<_Z`%N$EQQsi>Y(*yGlg<lh@dEFb
zQUMJvk$L6(*c7gmG&bXvxcPach&Nh@1r&ygD?VBG`mb<R$yzgW)qL_{EKnRevi@VY
z<BTEo4U(Z|H0W@d;)Caz$xN95YDjR5xMP{dT1*6DmZj&HwtP(2|Lz<*Clp->{?E{8
zVdPz1|F@IQ|B>#W>!|)Y=f5lSc~Oa|8(*}Pgfz(zLzfps%}V5@yftAFBJ9CJnUaRK
zi)U_xsY+1Y$W*zoDwj`?Oa;?JUih$Ur#;!b5>+?u-GFnl;{GAsZvFm<`UZ)g_cLt*
zc#$9lpdV;im#r4f7?7ysX-$NgetLFs*9&>qZnk&Dkq#r4mc?UJ0asIO;rt73YQy6t
zm~MPLwR0qLiT_VL(nPIgLt-XZZ`<_vk#7uor_T=T$Ah?waX*SGS)2cc!1Gf*!W(97
z2S2q&&S_;wu>p}TVd6YjObUE%`!zj1QFQFg)tgxJVxDeXa}E0`eT8}T82JPUDTyy&
z(n(N0pc9wQc=w*OZiB%|K;6jTP_ZPVK<eXoqr!eouaUlT!FjP&a0Lmc8@U4dijD*^
zrD$6kRYkfaW6}hoc*!2Gf70$8cFzIa#<+V<Y<gzN9`9{+%RVfhB*Ph(PiKs<bI>g@
zrm#HGH%JRl1w+A!RTV3|V-KotkaRe+V-4(BJ~tIG1d=s<_r5FBy}qF%7nwbd5^><c
zr7<ty`6w?uDUo<2r~e-liarxPFFJ(&-}57vkpH)9cq#cm$CCfEJTx_Q%zuUcv128M
zZnR^QP4Q<@NKgwj3B>|Q5b5Wyzq{Q|++?urCRLz`NgI?}Vd6;<vy{8wNDl<H${u)g
z<L6s57ZOW1&V|k)5?rdnvVhk%zWe82&N&sqHIVC!f-455og^HPwU)_9K&LD~cBNnS
zc>Lpaed-&I;BuoaM$aDcSU|xjo8TErMrHt*Jo(1NZSR~7^+^cbsLkL8z|o-vrzF!z
zFbOj!2qPaW?73w0yBJyhxrfonk^~^}k&@Gv^6L?ONQq!m!-~VN-RjpvAw3DB8%Ym+
zpJ<7AF12&3TN4>neDUUG@7#&jED?00)~tKdK)0J2=+mYj{q88Pl6blCDwdupcil`t
zo2uw@#^i5?Vqi#s+-P7x++`?_A_N8SN%&^Ku{&zm@w>Kp0yZHrb0eFeybf?9-2(tz
z8L3$*E2L<gT^Dd!m0#U=ZnryldC7k>zPy6x>IB$;byL!O-pcbP^YW7HW_)?xSQ@e9
zY)QBj7I8rHi9L71HAk;T8<k8qqc)n7%X0xkf1OYVvVqK(ipE{9o6$2z|KR^T5B_gI
z@PA(<|F3`er|?5)|ARt5hh75x^DoeULLqjo1kH`RmefC8cr2Sm>CA1WFddXwsrxS3
z{m2`jJPDo~DGx?Z-Zb(-drp}CRDka$;ul^zc`>tpGMAfYKO5J*po;>tm)!pB?>>zV
zu5XZ_xzU%M&s>AyfQ6YY^Rs0clxBxF?f2w^kFDOe1YKH!=tf=I3uud}@g+wt{F-l-
zIJxm#bN(S=G}0@BP;n5}EEXHkyKFXZE#Y$GTLZmci$oEOxm?bu_}?)eWC8+QvUJ+J
zXZ^kx!b+m${Y<J(u3$*=b%f_&JJOO=hp!K4`u6hAdhJz`MA}Oj-6-wjQvTtw^z`v&
z-L(QC%nJu13?xu+A8Xa}imlE-YdVfw88tl8K=3SMPT_?NkWuLyFE$_A4t_6Tb0fbe
zSC8~l0vs_nsQd2LaPdn=Lp~BJH<AxlGlj@G#3DTJEQkaWc5M3m<T;D?eRnwQR#M)K
z>=wj$1=)((0pPs0#fklE7kS`5v2Ty-ShNw9?I`YJRM~VA1dWfXApkE>&RRAi{PK>A
z*-nz@X53DSRJ)v{9YC@`CHpC0fuzp*;Pg@3<m~^G1pjATv`^&g$ODmdq*wUo@ay48
zc>i|~HHPNV|M#T-iUyE7ht){&LdMmABWJ4$r9Mdo#An%Vce#<r4ybRCn7J`DNGVw$
z*)Bfy%!h{D&H0JHI6sirRr2jmlV-Wtm2u8D+Lh$^r2~HHitVPH_r)^wFo}^H^{~;H
zbu32^l_h<0|Gm!J4^~vdMP^n+G)A;tZ=a@ZlsIPT(0iUk?U8V}QFmeyYlHxaP3H3l
zb(`JbQl4<a^{3K!vq2){#tAHqRR@4NMt<2M^idiQq6Ei{9z-$8V(6)&;<JIv$_kra
zIezYqlinP|(<CZxd>TqpK$kCB|K9MA_d-laNZcqU@V-?@0WvHi?w3`FoCr8AN{^iC
z_9n-$LBiw4X~N@_5!e8-G)Ygy2@4K9*a5+o>7|!FG+|OVIF<y=jT{RN8HXf-UYwa?
zTM4+Ma4XiD*kjWiB)bkh`$rGjlT<h(?eR@IRZ!3sL2aP>V!#s}d$jJbO;@u3k^*O3
z0CFso_`rR3iMJ%6EtU*#x!Xnbs&A0IHzWVn*02bF#3lmMl?HgQ&dS(PO`lM9MyA=|
zWkUbWL!Bl6e>C_%ts@`70TdO$o5Bx=$A*u=1F(u50Ebg}pv2;h56q=R^B|OaAM{Wb
z(@O`KZuto>uIzaN!cv0qMqwGmkW39Pz3sk9_y#5J-q9$e#JS^%aKoci6wpHB2bbJ%
z*`biH;!-2|=4;jigjlv|k43LM!t*5PZhT%T$p#qSempmjs#$XW)30sX8G?`~yOAK`
zvC2T?rEJ7EMZaGJpOjF#kxx=vuk$B}Vg!7iWqa*3ug5Qa>l-9;-qSQC1R#U}d}vki
zuz9gWAWT=0Y&U<F$ZUz28!13%C*@>5f?r}XFl;wX(E<cj8`wVSapOAvd(?sT4c5Rp
zSPY_j1pK|Jl5OX&{sdW9$>WW(PO@SJ1`2vhWCE&FMYCORul@z*D&cY?b45YNpk@c|
z*|fz+t~&3nsinpB4H6%3Ynres>I%}qj)dh8F8bxU6S+k4+l-gMib<f}zv(IQIW2z~
zd;yMvaxO7C3IeoSdi7_E+stJRC9Tc4hT>xs^D0)03$Io;Vob#YyRH1mUftff4aGy!
z+02RuzP>cY)5s{|+vtSaa2Zn`%c{VA;uF8h7V7%He}xjE=;G)U=zmw@|Fa_Jp#l5^
z0>H)L0U!Xp6S|!f{`-G=)i+8gzKd!8X_y2JlgERx0=G&8RQs~`4hhxV(5=2v0`W!<
zDXl4ife<4n*0dU>A6`AU<JMj48?9k@jkpzvy^LzrxcaF!-Rm1A3~we!gn|J5k>V3@
z8;|_q@t;pCJEFc(BJW17hzd!mk{JGi^gse<uG_6D9MJT>sXm|I+<F#ImjJx+>4Pir
zx<N_hF)yG5rE72KxA!wW>l-EFZsb?eHzJ;elgRQX0+w@n=rvn!Rf+JDu)9%s0b8KE
zms0j4UJG0w0Z&b0^0-eHk3pVG1l}mm(N)l&GeEg12n_UYsF~z}K=7$zNXsrqyhOZ9
zV)D&RJ0tA{l0hqus5t6q`lvKWP~Nza2tX>f0xpp{CaNxVNYf0LE?UreWp|z>v3cXO
zs!~0gPLC~YvnE@MwkY9vqqc}>4;J;u7F8bJY#_#jMB<Icgf1eanW})yQUoY&ARM^?
zg{&-j+0p0r#(^Xmbw&qLDfucaqts0n*3=0gRI)IT<50f#)o~lHfo(~4osn&kNQFIi
zX47|$d?}hZ_VJwke_DwAp9#^EqI*W(!u~%pvTb-#_?qxJ;ntyLp(&x${?Cd3!1_iB
zlkaX?T11o>rU6qXz4qcB+g$}INm$%SN;xPg1QSz`^Mq;ewp1(-6-^ux>VNN3{p%Yg
zFmBwK`L?8(^)%tYix!vdk_li8m7lPx%Ze`s)i+9b+{j&V<q^(|W6<TSb*WHr1)r<3
zE?{Gq?RWOtJ$oNq-zZUYqrf6(l@K3xX&_&*w5DCr_8nmc5;Qk51HY-E<PW!KTFdey
zJ3c*o1&mgL<wp7-ps4+&e7S}$41__`J-Xlc;VdqeFuCz!ln9E@#c^0h32SM#sOiax
z4_>;U#nl7q8zoL|RLrG~a~(}YwN6cMW8|kG_QeCspIV&mc>h`^UBc$ZNyl)e4JpNh
zB*P`M+7Cb-4gr{KWzdj(zkbg}ryN<|C{gqwrmY7hYL|w%<Ol?k`X#w}`ui$_#_`B2
zwmo$9q=V`kCBSY}AuIf9wt!nHUGUDp4wF09H%fxsj;6;4On|az;}bVW53g^Oytr<r
zlQG#9ER+g<ltCTsNwy43{QWO<ez1R^`bJ5WGqMaN@fCbHGT9V?RFY7VY2I{$(i_{a
zzU-x({ohIK{|m_fjgtR+1^AyG!XJYFTM;e_eSr3VMyOLLbU=Nh#L12NEieVAH{H2n
zT6FH>*Vz*iDmU(la-5UezsdHe?-hk5+O3)n_(jr3)Ln7JGUi8u<;M9z6(<&#2N?k<
zIg<!1Mrn(E>z=P?Pf3W}xTmB94L=(&7)_xhnJauI0XK2!?_XwH-rKLfQNra$?ymju
zbifm5Etr&q*CgdV5M4;L_-uV_ey94zLT+I+d@A>7n!WhTYo@$0k{6dCy79$H36N)?
zO@K2aI8x$N$H~NA4yrW+hQ2?vkyVgrx@8pzN9bn8x#TdeFC0r;F963?(RJfVMK7?W
zCBkmp(gEI?TJYeVQ?Y6rC5~>iYDGoI5lkqG_a@vH#E325{qa2`*PysbEZvycCxN46
zKvJhi_f0M72MI_F-ADo`UwO}^)M}%IRMvHAn(Em41wZs@iHa%Fbfbz1>>kxul93UN
zxb^(@rq{k>g{<jplDb=_c?^7461oHliWFp6Sdi_l8nI+(8g4J?Y({PmY=K}ih!;9g
zcwO;IYNws9Lt086n^9WAE>q}2xIi*lX*fo-6@4L@N(Z9jsXJpgJ-t-uf5*_bq3Dy~
z{|_bqXKCcl$Z3(*;dkl(TN^%%L;v6V15rqr-AEMDmrGJMP}49eGkD)5akjQRkbsxi
zp~s2)v_W7>l-(#W<DfPtiSd%|f;&DI4;cUPmGAF2vJcx_0`10aj)d}3fsDPfszbio
z;|$oZgw>7gm*oyfhU6<tpW5blUQc4@#@8dW5DrquccFunmZk$FQ9fkh`A^pLt#6dz
zxzRq2QvoP`cx|V$qs5^a3#i+pj=tu{W_u2)Z<M&X(Z^6JWSNq<f@JrKLP9_?f&GVG
z9FGT}T}G~$Hh4l5?juokBliiU#>AHuo-zKM9`%i#IN9i2C`D`Lh0#G^LAx}ufs&gp
zT2tNw7B3NWBZ~(ETyiD~=~kIzBI0!#9l(4^-T2v_iQV8Nk`rg-Bx!))1hTI@7FeqC
zF9)^m^*d^YB)}Qf4174%aC#M3qLE{VeRS151M3?l_01f(tjv;6DHF?l0v3f^lo1&S
zZoq(y^}Tfb@!M?&b?*~;JjCB6p-)4<hue_zHw5JG+VIryJ@^3L32%&S9oZ|=Gjalb
z!6!tnkIad@68RwVeRSt&QM6z5)M$pt;cd~!qf4TnMsJNS=7wzwig%3Q5=7Ud?4S#Y
zcu-ND6SMqYYWY2D`F&cO0?U!V@d?H+c-HdV*DSxUu>8Kx{JXog<@Y@;zqhmee!AuN
zr!BvKZ2A2Q^Y5yK<@coJ_j@hBuQC7b?O^%6z2*1AEx!-3{C>RU_j1ec|F-;oyXE)0
zEWgjP{Qjur_YLOXv)fvJx9pQ_=UoemcixgB2YBZR{kINX8shJ>p-;li!~Mf&gZuq(
z_`OK;$RUvg6n|Uf?a0^BouWOXRn!RG1)a}{z7-mAa6$3FEpPc3*dyKn`xO*-HeBL&
zJOA5nh=9S1PT!`^1;vMK`CJnkgx9ZYL2>Ub&mEjpgp`na<TBIE6DdLt6AW&jJqn83
z7)}?Lo%=!ig5rHF2e}pgJPIrdiU(|YioHL#O7CA#Tx_`F&t0um>X3rsqqjWqufY(#
z-S#Oc?qIqK<Q*}!aCA6xx)c=m+VUJTWT@9{_k!Y9Tb_MfY<S9<vR6Uzo`z$<cQZk8
zwTJl|{<_D#I?=o+!)bx2oZHN=GXjT{^SOC$w`ganZZ*HxUjxl~9nFvCD%V+JKc;@`
zSWtY>mb0{Ft&4a4fd$3=OlMYrxkEll&I^rQAbBiwf^-%N{kIBD5ApYn(AVL1$o@?D
z+VC^s)saY~Q{)uTKxakXjE1A_@eWRi&Z1Ai?a?<wL;oPD0}6_Jnx4o;LF`MWmneD~
zAz6KG-dw>p_NwBKJLi;#fBOEua-utt^QvsSJQ#~|D$M&Khat?@<<E7mC@LuKVwi;#
zydp+svQ!$9FYNxiLqTyz!+8<~p#q)8d@PZBuH|ljij`!WwJRvz-Eg-u5@Sclock>g
zON%cFmrHf3s;<a+*YYrIpj-h$t}nS7+o_<qo8e)VWhoK_#F9YUtiq+1c3b>u3G-7d
zMlnFFpornd9;?Ii>IB<uD<ynQ0u+7?t;yE72ku)?Tx5EKKt{9oP;o(VAKOVhI_K@d
zpy$8HC{*FXg5tf*=j)0)Z>;r(^d`Wtj=Nbf(g0>7rxdf%x!kg0D>LZ+8bgL8Lh_FV
z*Vmb9JDHjtoPQt-=~t#=fwbA(&EgaMtBjA&Ch62}XUjdQDFb#WS4>ka0WEys?qx#%
zEkjR)`1@&i2jYEagZniv{9gF`$N}^Lofx?bMBuNZ?V$d1qqC#SqE~<vyoQV9PhjoL
zV$%``@_w@{Wi|L{e6~uZ$7Y?cx)&4=F)R&yCFA{1KM%(h$U8K?!DFU@iEw%18glox
z@NE)`ymf*33D`jfTyJk1vmRi_9`la0Y}`E3qqnE+&FVboO3Ty=@RAMr!;4wwTrSei
zeT0f+9*EtUu69>i7>o9);Qj+uTigK7s=W(}_cknZ4S~ZH&O)WuT6T+nMp}wR-4|?+
z+q}J_nrC57hGJQ-u3JIzVAHEnlqSH4g6b>oH5{2RE4D5KcBn;W{JGJC`q8ZKvc-rm
zflejq)ug?`Sx2R7a;f7tS>z{nHrFHst<-B_R?f`DlHOFI|2Cn?A^zSKdL{H#cvm!l
zT6%xI82%&@iu8z_5t$U37g-zKI=VObKp9Yi?*J?K(dcSn0G2I=<nXStEGro$2|OvW
ztb6`uYR%txt3NyrTPE#$FIbo;Wff)OKrgJSW7|2aEqk5Q@FAhpaHe3&N}&~?<UK7y
z!jhBbtupJq<gjI>6REqKg@>Ea?Y*dl6XfHI+2*?y6z^i##yDjTvM92imb-4DG>*%a
z=!idA3?Q;|+!rnTFn~1XS&S~prN)~M{wt{VOrq2PJL4>L2IgrZ1KNW>;b@am`jN=Q
z<CUtNWg$nymh*X%XlRF6lpskRBd<A!_~ezgEhuhon4wyCgN0Mp#w2toRb29q)*cH<
zxB=T3k{xe0x8rUb%K>$>`32%JCvN6zU`fInNK8)Bf)-pd=XCQ*YQ*b5q6h=@?8l%!
zF9W)9+Nsak|1(3OnW05^|2l_{45z}A!}rnu_XoUweZc}a9}8f4bergY^aq=W{lAh}
z!P}wXp^#bq{1bmQZ<Qc^w70LB6Vmb?*b`W)aM-`;HdLK?Aoyxktt#u({^@0XO_e9h
z=FqKKfF39NyRb&xV5TBc`@FBrGr=K|5$+DQmzVT-ND8^>{Aea(x|4$1&$~DyY>#)<
zM%(;heF$_+u0?k>Rrc7_`1^UOL1yY9PE5X7rizz>=2FfBwhyb5P?oB-ymTJw!#m%0
zLV{d0$$eO0SpYgSz$FCRNTvsEHSM_<Stx-lFo|vhl@k+4Xm_BQn*cDtf+h)xC1Pa4
zpvN(<>@LA3b(Zc~P~3J)1`wwbwLI-wMD<@_LVG<o6K;P<BwEE%gUr@)2@6VDd{%Wa
z3rfyJ4bUv|O3V7%)BL>kmbv;<Tq=7|j{dI;g{})dAKDZy3ZE9fFnm{dMI;>Q962s>
zZsc10{qN!J-!s}jIx2c;^uFjD{BMy+e{uo}%qp&-N0ZuQ`wFxd3RX6Qx%_ADD!E~C
z*E`wvB8s%>awr6N?^q>C0a~d;1y8xpoBb-*nojS2%f1FPLQH*jKL1EUi*(1c5DAIn
z%nTd4ukGoChGc_CZy{akMR5ttD(O6GnZGSd%Dg8n`xHYySt>mbX*ht_2ms9cZLg^j
zMpU75wpnM2S7u3mm-4w%T?I!0v?x)|MvKVHIHRpc9=A+uCJx$zKmcmQJ6*P<O3WIi
zWJM~+tQBmYF_{gS{kMU>t!kxZrZZ(_Qrk`nK&p%k<3wS(n>6cu`CbrSk%iZ0D#g#_
z4z>sp*`_W~k~j#|aI+O@N9FZS6Z&rzdLYE#wc(w@y}~i-exC?8Mw&(1M@B?yB3DNq
z0u%W6XvgTt=ta@{qaQ}^j=l>I_*651{Qt=`<fp>Ieo<3${48JIhBKYU074CFh*{tL
zbEx^ByR!~rXS?J-Ve`PH0jS2ac>Mm{16jRqza@FG7<k%p9v!1I_BEExjl+RC5_=H*
zEj&EPIOh(_N^6uUJbT#S84^w@SJ2&O&}({G$N>?fKC>Omc<MCEr2j>!p|`|Bz*%*t
zg`~35oQQ1>U%1O6igkxV^}R(6%9g4REqpzv@la}y&M$p4=>Z{zjKE9vvv5DTL~OjA
z*)6lV(V|}eWr?G=*urOW*ihNr;=3JfXHoEsS0Pu&>y9*AB2*c&6ykq{$BJhWI~KbJ
zzabx~DlJS$N)url&ILL7e@7^EN9a{NfT3{P@WJ5{EP#i@Ya`J}cXENe$h64wkuRdH
zqXVKf(HYSGUD0<!q0LMgi#oYEX0~^VZE5LDHd^h!*&Y8-nf}3BC!FWZ&rCR9SPr-c
znEfkANCS?jmo<BXw&=^`?PNW1^Ey25eY2FcAYFRZX6;gM5RBETl-j|pU2q0jFK8&$
z_@U@{QWmSh5^_n}JIO4GxL`Dyy_A4uYn-3V97XVZyj#ugJlzQr4UK&Xa@B2S1y)X?
z<OBE=924X{sw>QrgYzWtB-&9^^JUdwyXod2nO=pNY2z&bE=-_1NV>$=21{|jwk?OT
zZI#!_%uNMsRoa8&Wro{h79?@$`wl>7sF_J|jfa+2Ryc~z2(UHY?pd=`NZ|C3p+pc{
zLO&8Hco8F_=&HMN^gks;mj9z6Kp?{%!>3dCGc&v@vQ=bXIswJ#2k=<r(`a+L1D4Vw
z_~Ga~<oYZ}@aKJAmYplh*i=DYnRTABe7n?B#V9o`{M&9MQGZdeC0w7b7AdQmn^{k;
zn9FOhP)Rur%(w%L^x^#1Zmt?gdMU+mh!ajEAwb%5l-H4XeS?KfNb)<Yt2=P$zL*e9
z%BeH!*5X?ph4iU$kG8C=#0=#Ql^Kl_3i%+`fG(_azP9Y)EjuKuU(A}P-<(%{YYwNQ
zv7m9kXcjQ}jtAaw%a`TB^SsL}yMhy>fdoE3)EIVd1rEbpEZKAKu&^wyk;ctipcZ&<
zSV#yHOLQeN0&|#7qupI?XJ+Jc*-_YqlADlJFIy&<&O)q+R$bwq6ig)D>ny8hP1DQn
zXV#z+8RtO@_smEyV|?qQ@Ps($Sx709BHL3pV_~N-sZOQPf1A*SA^tvy1rQB)37-<K
z56=lN3x5-7iT{5Dc;Ht@9*nGt?hx%1JwBSn`d^9tKfFm>4H8e&uffzm3{$CT1hWV8
zl-Z%3Q;oYRzl#5zYyL!rnJPhY(m9$H*)jATWD$~u18S5CzFbo-qHiga#G__eRvcT}
zx34jUX}p<npR<S$In$-~yizxcNV|7iKd6d|ZgwZHmKuY-N(j2n!Y8<A?p)mNg~JBo
zsKOWEUTjvM1ylk)1O|DLnrk6APC=#RD{AZ~Flpd_Pqt1Ovr3I!#+hj$dY-{sq?{7_
z9kP0n)V5|d9^z74Ti8v8fPwp#ZL$805#uel&>Uzo;?EEno095&;oX4zWNOrX77@V}
z^p5<uMeET=rTmK)6uX#p)j)lT6tH=-&6+%?2}CcvNTPqB2ME$vVW~8`OS$e)+eQI<
z)vvhcOT=Ye3J02Q+p4;zn~jH00H3LIjnIF~(8D4AZV2yA?C(5~e^!Nmi*$$#i;Rxk
zjpqL?nZ5@{%c9ew&tm!C5`8`TUf%5I-_5_pY$eIEYDO+QUOMNcv}Q(E-m>b9a^E)_
zZd^4ww>}lvOX3ICGT?vU5i;-YSQ`}!yrL>RYAi1#DjN&s++cetsYuU73#HkVfX_pN
ztW#-vOrd*?MfCkeuRHG`8)v5|R9lK{L{WO2J8k>bBe^aqIavwyk!`=?PlTgYqFmIH
zkJQQ{=`vYREvYPF!*VyV7o6M8rmPO7`~lVAZL%m+>|PLSa#k@2hvJ9TNn{t=xJ9js
z*ya$EnCc5sgRq84enVA3<E3dbF~JoU;p)0!3x5R(MD(zDou|&+e8cCH+y4@|)w|Qe
zjEH{fhR)>5d#E~qNmeH{=8&3b5%cKpY#(6Uk)^8KGB1E_O|>koZip(}O4KV?T`Kh7
z3V<K}J{S6i44@8ReoP48N&W9nks_qO6PXctJKBu=ztf`UNAHX-CkJqiWe)zT-J^G~
zWu^R!Qvbv~4d`9oGP7l$bk<uAs9()%k&IP|*+$TpE;8;?^ZRoW9A8Ri@NVT2^F)i4
zR3f%yOEZzu;7@$MN#S?yR5QgVV-P8K#)}14K{Bhi%n~BW-YQpxrwBy1upTcfp%#@e
z8_q@q5pSc}%C+E~d)J!xC1pz4Vl%J*i~8QI#X%u8ZWvQZjd4r>NmasZA)>76npZ40
zR}$p{V^LhTwb@(21!*<F%-ZD`3WNr^*|M{jcbr-NautC`P4mbA_Czx?!{NL<VyAbn
z?Q6*LG&R)pjy4OfB(7i{O4yT}fgHk7%K263zcmd$`1@GseIfwe!|Cu%;irfIZXf9%
zDUVEvJW5Z{P0@X$M@AFTt0ebdTmJzS!0?|WZbJ`&H#cj9O~~=yl}!xm|K!}DmGLKB
zO7FSA^8@*JRvcgN5wrB#9E9Av$3p2qmE&oExFIsJFS58aNQb5GDxIItF-riswP^UF
zmm`%)hsl*q!J1z&E7@E@kg_7<?qwq~rRr^OD5|0cQiLhMw(^ED?w6SQ!FG{kmWjmB
zXt}%}v{s{A;bp6xS8e+o{Q;#|3^ECDxI0-G9Y&MDRC{F4x(`_x9pMih8^EK6c3W8K
zJYpf&bZMz`sfD08M#?K;(wIBVtbHWYx^+V>sRrfbd$0mIz)H8=vLDlxx~U>OpulXh
z02)fP;VBF6<RH#^jp#be&5QygF*TYvU!(0_0D!3DZPN%2R!+f8I!Oy-2c{w}=t>el
z%4M*l6>Xo>{~rut{jUobgbxGr<D&3m;ddiDMfycDk((pWMLv%1sy+WVNz^ZT6WKrS
zML&k-b4%YeIhGxcwM7v$0SQ^eY5|_b{m6DIbH_DZyBQh(0etS=xCQh5A9;u_SHwLc
zn}9u+3(=9&%I-rgrI1{pr)^8o1XSrQYT{{s`ao$HMu<lHWYvKdK843gn$7YCcxwbg
z9_yPr%0e~8vdNp;19}MyHD|POnL$j7^h%Tq9!H%96QErDJj;tTp*JJG0^NhXffiC~
zx?nT7XYXap-b72M$0h)k(qm8(uF|C`=Na2q{?R|rJJX_>aX)Phq2(&~HM8PL$4J^V
z$P8$dLzOC%%x89|Fz}Ntyodl|;iz;H!w)^m^(vj=7V1W`H#7kAD$S-;QX`&$eXk!6
z8b-3tJ<_5n)upILrxUX-Dsjt6S0xq#6DoI|wPp=A<sN1`p!5G)<?R3Ep&yC<9YO`b
zM0@~?iT)Mh1CZ?BMza69<Nd!3l%UmA`#us~6*AK<SckfFt0t{}GOrCqbMRLHQHh_#
zRFzrC36Z5JSaK3uvikqm9xSw%B9!7fW}yc#V8RoxYA$imRbQFa2_NeO7DzNE=2V;2
zb~Apn_r#VHqTj1BR^t|K!7Vi-)5Z0Y3P_9+Mk3iDqx{4RUe^7^EO2y4AzNT3a5UEx
zZ8caz(0qL%R>c*{l7*V8LjTeUvpNMS-?vdBjG`R9Y^G4U4b%5ZWCi(HxV6zIP!;GQ
zAc)3uEpJ9Qi5ivf3IJS?uy91HJIw6eBf*c?b~c!GW>jU|aXhXvBk8sR!kTebnq^Q*
z+=PCC5w;dDiBC3$pr~=)G|PdMh!IIiOpPH#7gHJAjcwfuyaz06CmmG1k!A_StBKn|
z=5&-ZJ!k*l76RqxrO<!ETZMasOT*WNpAUZ&{+;^YWMnG7|Bs_>sQyhxZ=_4;YX0{@
zs5kQ8%*vWjd3<4FAp+of>QF>*Ym*<PF0-6v`T4(gF=c5IrLER}G1oJDeNv;HGt6R-
zd=Ya00PU;7FD0^}P}PdoT&s?->^(M{3F#`kqviZD<PNi=rJ@M7nRn}?)b-}6Wt*V<
zvtL+T?K!G0bH25(!!f`O3gsl7H!K`u3`s%jEF5D@hDeg6l!!FsfeDE))6Eh~mvGi1
zv&=(7k${Ofumvhi!y;i4xzE_X2I`hz5Hgxsmd{uFm}3)vG!5{cwQvgEK8|}OQ_vBw
zog!aBFcT3Y&ckLwDhd@LYT+)aKee3mZm@`@oDP<D*O~Pg-QGm$PCG=p>U6zCR+ZT%
z8Qy8_h2qUIYal$rjrq-51<V9kbF*wORj-@rKiGiAn;W42`JvClEr|amkpHvk{~`2$
zX5_NSGm(|it?>Vy0z#P7|2`W1(9{t`^Ej=tnHRAXuQV<%sAz(D_Bg>4Og*9);#S9$
zW^Ihsng6|8xpT}K$!4%H*-mD&8USr?jd>ye8Z_E_*SwcXW4aAc#;G!sM-v~F)OL+-
zmfgop>`geR*{#f^iS6r&?I$K!O)5iEXzoaiK4kf#ziiFqJ#Oa8rL;XuQ(8eNpfZtl
z{$rMAw6&#15N4XqCZw@hiewtxQrYTi^?;d8+8W_{qby5>&9TU`#jxSP!Aj#R6yFE?
zi-5HIu33r-?5U^zW9A;Z(h-F~JQAR#j-q;-Zaz9z=WT0wxCz+T`_vrKB#2il$t74Q
z89^XdX}8p@Mf|DLn|Fuh>6tW?MLSvWmGdpEK%&pl|J9+;)%5v%EA(4<Kk|RZg>MPJ
z8vZ!4Bd9+k(Ewi5*?)tgirnAVqW9!#|18^@Zi<qb<XU3H=t%GYauwdQY<nDAMob8~
z@c-eB|J)45d)lnX^C(J$P#p_nz|p%gx4&f%AU|~Ts9fBYCeyW43t=6m%hXJ>@yf09
z4G_FfEX*zA<`4wE60=fjf`avau+V}V%XTnJ5(=1Ut0P;N-fNQA=Zvy!MWSD*16mcT
z0X4NM?d@!txIf{FWxHA^+S1n8n`ri0{AELMFJpOa-D@|WY%Wj&-crkJ`~87vNhrxN
zuKSePB!fxm6eP+%NuR?<kN+J_=XwjzC2p@doh0VKa;jot%2cYJmd)gsQGf<Qfh74d
zU`V2SO4713!y?J)bD*O?G@|w{vaoU(tLO<(UDieP^TL=_#G_nsvv?;8{kH+&o4+rH
zJ`Qge-Y0xg*bC1f{`X^~U8Hy9bnt-ZM?NR}r)%_>Xe9_hPe#{AAB?`vg}FbQ2_@T`
zk~yhUCV7iB76QkgA||ExO;Ei2-S=xs0ookS-}~CEMwK}e&C6RRTvYcZ6>wZh7@%B-
z;C{=^rsIz+W(qW<kQN`hJKanaoS_rURAst`M51b4%ZA<IT2f)lWOL=r6Hsu;?>xuM
z_{+o!W!W)c(<$;qbr)~<46`o8$$S=ivj{fzwplQ8Qf18f-fU1~ConH=g<1O3+7Xps
z!ce68BYshnX^tW0g0fWFas?<Vcs|8%ottCr50w&D*S+2H%_uNZ79$Nb%F|L%j}7Cs
zHs?9|J;uEWmX)j2fj&|_)Kar4RaS``<qg}_n72A5Q9WsyO{ua{jh0OTGQKPaZ9Fw3
zK&DjJES9T-EFUfjK$6?R?39*DbQ0f(*UoJEmbvOpq5syQn?n3u8u~803;w?{@V};o
z=Z4oscGda6<G=t}MFg+|7QjWi{_oc4vOneh<kKK<XrQ<Au3BXLsq?QlGf3G@lt_-G
z>}2VBn?MvD=g*T_7W|!0_!B^(ZXEB8w=CozNU+(qmc3n9!>6MGU@~L-71lyS$a~5H
zoX5<}rQEsBc3_ry$w(ibZ{|nkl2#?D!bG{reb+RClIomdmJ8*$9wfy)*PuWYa>xrz
zbnbwMR$XG&8A#RUG~^(1M*u*_sB_KCocF}mE3EO(G3zDec%W)6&(NMv9P_Cd{sfqW
zJIK5fbX(s<M!O-Udw4oQ{-WlHpp82hS|%{9t~0xP%GtIWB_ro11)*4yFr*{V)n?kX
zfmmnvwVf|T$E5dQdr6|7@IQfD&bBl2Vu2H&_Y)IN*w$HQmV^=sNL7~7=Yw>RBg`AK
zoK@!2$PF(iSqrgWSer__R40yc&dTZkGeV&mp=F_Oq5qzseoqGXb7lDFNY_Y7<jTmi
z;Qtgxk0Jx`GGzZMI)$zZ_0g2<8zg3JDOa|=r}<zxJ>l4`(qEB+3gKzem05jb)SCZ>
zThx_<<SS7$#E<i-S#p(&8klk|IXT3M*bZzlJg2IIS%(vRCw6@@jbDppV+V_|!*VCH
z&P8V7<2T9iKDUr*UEEEB|LS{u@b{o25f{Y9R)Ci~X7-VG#~3HF4oQY8FYfR{cb54Z
z{sOu>yQ_JBrKvg=<&OFF^ZxmG-QC+OG}9W$%3|8WDG_W0-70nBD)&$pfi4%|T)=HW
z5hS^IXs_vndxY5=$jRb}guJ)_&j*et?Qy`8cDx$%Zjx*8!&XvC!78WS1a@*J>-=W6
z81&f^!xhB>mg{-u)#W@OVv_DLX2B<iF>4_Mpb4woWoCPivj}~7KD<awN6u7#v+*eB
z>Mls$e=LuzmSkMq08C9~o#RH3|1D|n#h)|yXGUmII1CSnhcBQ8=z~ZrDgde@w?|fx
z0k}W-A9c~0(Y12&fBnztn`<guc%)f^9YN*=p?}B)qnm_#(PAp;k#Px^3^8**Ns%M!
zrrp%eN1S(*dB34e>j*1xC=nD;DH;k5tYgk`Tx2P(K^O>AqSbH?#ZWf2hGS2A9k}Wk
zvpXg(p!_g_STYImD=*Bc$C~v<3UrH<0I(ltRyib6ClNdVfd+8aP&2{)MVm?QRW3W;
zOtkjqw%$`*b%I%0O=RfP?i|kv!_2fNyGz{acsZDItXJ)B(|HV)YA>!k(M*3Nw8DLb
zK@$(e`J!jA!jmgbGJgQ9OhAM<F%#D*@Q_Fqaf{J0cNJHiY$hfN&uR@hT_ru3b;6*#
zGv^OC3k5%*eLiQLviU~NtGqbzai!`l2(AviU(!L9B*=^~FMFxD4KCpLsWulFZ3~q&
zO#*5bFbZ&D-HDujnpq7JAWtTNiNjAL@yEIp-h*m9n@SZqleqA7vkrzP?e-G-Zyh?C
z{|~9?2gvt}q9;d-qb(vEu==M)&WaoyDF}Z6FQ|tn92VY%Zh-fO#^f%Li-Lb#^Y@Ug
z;8!YQ{ObadBKHxlbIkLJK9El8=|u5CJnAAx=PE9!F<+3aF0Yex0i6(`Lq$?AaWWTV
z%rlk`xZ%R7BuXYZ>{am`FlD0B8N-FuX7Q>06S?N$-iw@8W#&p0z~-7hh}`~;^D4~?
zKzffOhew&8M*2}Ik;4d3)LVxt%=E9ywHwO+aPjUCG}oc0l)Hq>(q>8VM^|cZ9w(KX
zeQ2V-u%o2BDYwg#O7Pvw%(4YBrloF@0tQ(4ew<lqX7x4nLesGb6hM>_vgEXg^N!_`
zlzEkrvUQ|AlC8u35a?B*c~|1lN%Jbyz`H3%mJZa)y_542=C`hiQIP@xNsXHFoG&>u
zZdR)@&Mh2_nJpgB|8ydRcOU1Jn3)`^H#1YHWfr;y6pll~b@%0pk!G7g$|O-_5GU~p
zG%P$C<ZFr8aJl9jv)E|rG?3k&v(7Yga+Fe{$aOjU|B6uP3i5x~hPMeHO8j3k0M}9f
z+Z*ryxshA(|9=(TE7}JO;1c?TzD*6V)c^W_%(E)DA0wWg8a6|vbBUQXaF(CsMop{^
z0sp;s%ewzDOKF||EV2fTkKU-NuX*~#`jiS1Nnd2C#EAw^CY}CO^8)9gsu295Ey(Vc
z_L&)rc1S@Jd*AukthAs9(ZEU9vE!l_$BwA9g7@&IS+;S31d0%W;-4lm!H#r)HZvDF
zSMpQD+qa+D_TUul`J!$Rc}$UUzIIex-)YB^ULsfNu(r5F-!n@<&dIu0+g?nk6cKz$
zyRX=G1KeKPk)vBcKcAQxhR#3GNxwqfVvA9B=6-5hIBvN`52x(jW~D&idbInhnQ7*Z
zrc?ACXA_|0CEd2xZ$%9OS)H8Dxb?;KDQ@90*-CMN;)1E7C5?@!k)G~VHe!=<I^E6&
zM*#E*ADtug-v;PU{=NzNXZ!Hs;j`%cF(3MG9_a)6$C$|dk$1HB|75)X7t!J4aq@rX
zMn8(aCp`r$TUS|jC}57_Sk@^LfIvy6hI5~pq2@aNK}nw+__yB7h>&h=FPLp<_9Fo~
z_pAB6^Nr!M+nMFHbU)XTVvT>9MqyNSaF-bMY3g_LbXFjkg!U^kgrxabP&t7eEmP`Q
zvk1taSQAr^n<a1sRgBWIkg^%SY>@v>rrl%BbB*8?6-(-j^qa&8b-Rz5)tU-UZEKku
z4oO2gWl3%&FHtaysNEx*P%^FjTwqD*`Iq_4My2ZF84{SW=d|V>6CX{XS@9c%jD{EF
z%sIdrG3~0*KhPzJxu{X*xg1rUsl^RQY)~CwcGSrkvMkaONqIM$m4`~TmF>W2%K@*8
z<v_O3tn#49VAzYAKu3Z1%r8sJC3#ouG*mk0rX2li|KIcU{|Hh4H;@Rx1t0*t6aIw?
zz+=JxnTh?s1OETM(Q@#A1p)Ap=(^CzP`{8YbKVf#Y&V$s6JaVZl|9h*_Q)AAVAQCr
z^GV=tf9JgdbwHJ1P>!%ol8(lbJ_a*)&M`{?9L^*%duLd_CY_?aCt3ces?M>2uL-_E
zdX%z2{o>^kdK-$e8y8R!N&@j@4Kll<1Q)Ct1Qp`NWGJH?pKbZ9Oso{Ggh@s*b1Yeg
zm3SSr;>JcIb}VYDd${ErHS{d{4Iw{OYIf&WVx-eLg)XbLlE{>(beHEh%;x2JpxEHj
z)77t{i<6@?Mt>2V>y&!LEFFW_h;K${*>k=AW`*Xj`;KJ~FjHHVJI`{!n{HMB00k#v
zNnRtV`7!jc)EKA6%nz&Z62USGy)kCqQx&7o3yP?5opSRMRIx!4I;fDSRL7Y;B~nij
zOR$M@T?Iso&Ec=6+~GO;*ZDsW(d+Z~@Im1JP6$6j|Bs!q{ZES2MsA2KjI4|N0s`pZ
zXhrlId<5&@0k5GrnCXJYWlLl3Z{{VVW|oc3H<gK}nSFsKqB5#m(**r9cMTTcpmS-%
z+IiA8VIW!Oba+lJPw{`+xlomLFEMXkaG?1l-C0*oM)#GdvShbbW!1Z86#__<pUrZr
z3Kao@CKpme;A;7%4OFT4^jtF&5a9h$QaDp6wLR4-=XJCG!Fl4XLI%X$Oe`rmRSei1
zz~C-2>#0rle~mN0X`wco(iBcrg6!%RGwb1F%QHzWp;OBF%<PjO9|=hdo}KrM*&gEr
z9zyzx%xsbpc=7$B(RwdgrZ}x$upRL(wY-FIA!`3J?!%Ue)*6Gho^+C!ddBj}Y1!YB
zW?YS!xXHpRI0@(7AEp(LEwkPZeObG)6B+L_Gq=SHk#f=GXxvUt2wI}o%|cFi7%3Tf
zT<E`52*1WHp|^<t?-xFf_}?vb0Qn@+Ix>j-|MMa@MP7*fK(D{E(f;oR{cCP?QS_7O
zyId&q^QVO}b6#<dh^~(vn<7{w&Kogju~H@Q;mosayTA2j8J#5~=1=xte|l*j_PdJk
zw-~xa2Qs9;OFB=r1}^GhwnMAL&x&}*<4+)6S&YRh93TkuMhi9Kv1We=LT;>*l%5=A
z;+zAVt+QG2(G8*9)@CEG3YZZ{B%bo?9?CMcjs?9Kv}4Q((SD^OiC4f8f{;K*TVY|{
zbvo26WJl#3`8!zQl||kR3rC<bO}M7p%q%{uz3t3fvs%KYNq4lF`l@j<YQ_kHl61&%
z#+rF3m8MLs4$xH+6_eOar5M^tN}medAIw$}Uxec!$Hw`mGUpU7b1nV8m_0}g-zCL<
z%pa~saUu$0Jdp0LI?VC~VsHVa$jrlh%M0E4X3<_PiNDB7COYk2YF-j^W72F#Gk1_^
zt1OwgrZQyRC|BcuwFdl;zjuY^hu$Olw}1Fl5CCU~-;eA92Z)pZ_iSVX{r~z$UGTqW
zzyVf;21ET#e`JB7Ra57s9OamIK*sxaGrjn~cGe#$b(wgj_t9oI*zC~9W}@Y)G&RU9
z8#`&Nx0TsH=$|EmJX6K=Pd4wDOk8@aiY%qQi{w{>Jcd5!d}Ex8I-Ti70Yr7oCAl1#
zD@n~|M5V`D-hxMumH;t3j1}`Px4eaPrG*XU;Jqc_rm^7Eo@V|@l^TiV^o&4C@Ski$
z35sQ?brP4F+R5yLK-Fhgv$aWT6(&)g6f{t-Roj@!7(@efJ11q{iWzYCEB$iU45V44
z`j{D{ALAofHI_G}5HC|D<^i1w(r$aROqG-pxHmLOgEN`rTK6u?W<UygF%nP6g~9*#
zky#xS*Q?|=a4#K>)#Zx}2-$bDUqO8&kg(Yril%U*f?Gg50tA*@%)7kC-PUrzi<>9r
zFWT2<+nXmnAL<Y&WHxJ6%yC5iw+!7A;_v&RU+DdNdiXNXKURYO-6K*8`u}4Z`LAa*
zMdt4_RR4+hZ=EQ?L3fPVzg-hEZ$P~1ObAmVNg(W1(F5oSL<ywiIyz?>?)JCch#FoV
zkH$5|>u#G@JlMPk>|ekN_^-UTH08}VZ#Z$JC&6bx+L4GweoES#WVRFZ7c1RB45A|i
z0gqm;<Cd!RPBrs*oOp_vN%~1ZpbR1yD%C)<cEH(a#NXI%<&{^HH_YZGuP9ZD{Nejl
z*37PKt<bXv+s;qM$_Rev66mOi0pbV*&$MUh3_!*WIw<LIIN?M^Mmo!<x!;==b4k!a
zX^mGpH|}F>QpyQhr=jXG<vnJmOwJ*mfd`Q9CR0GC<dan;treS_H7c%<x`3=C?&X*u
zd)G3((z8RVCADRHB;QX+zR26d^13AWWmKj{l2N<@%YGrWoy#c5O)6$7I;UWS;a>RE
zKq#`m)3LE*V}<Hz%VTw1RN`)wK81w-TT}eQ-zPu-Y)1SqiS&OYyax2ofyDpnB6mhs
zfdAh$Ivn|bITe6QvHm3<9SWHZm727qyy++oP>VlX_KM)*5PU+7#9|R@OJr!k<+<DM
z`On<d*x!X$RfWem%Cc7guklhjj}#gy`SZCJVKL>pLGIU-$&3pc3rz>#@PeRC0=DB^
zYqoAUS9?22d3G!nkyws7Mk$^|MK>f#D{wxrFd==i=pxx_lm$s;v?LYEUEoy2&csik
z0lV4cBHc!jI_%tQ)-rTT15G5+j?o;YWsAZwQte%1j`0aviE3pwzH11zSw4b&AeblE
ziBcGVS>&y>uxbBHUYpMm-@+Kt?&-^y_WD}HpKLNxWJr#ttBIIw)s|0nQ^e@0m5}UT
z_?H+;Wrb<)J+l^pc9x-PM=}(-r?bYa4~Y&(u>S<hbTOyiPu435?7B8K!j)1g3%E|k
zImtq8q*TE+P@JT+jBSVP7l3l-=^XuE9tvF^dK?6xUFZN(MhDQl!f%9s#ruC;WGv|a
zOCmo;_lWkQ|IgJ_{=5@?DEgtM|4_&_(c)r8Spxh(cyY|R+rnGn=xCGLqLuLW-+Vg+
zL3SInI*S)vcW(1CB#VoFjcJSiiv#N@+ahP^xuyY>m^^Q=MFK#0dK>WBTGq2~KxX;Y
zBGG_&*I6B&vIuiGL$LQ?+q7gLGUl07bwL47XZNse=M1?-f?y1-=+q>9(j<RgW}`tl
zT_+o$L9?ShcYg~{#wPI-*_pu4ty7{;@^O^VPB5`O=TwXEl3S7=aI{6^b2Fm}Pe?q!
zvIaMRju6yhNoWF47M$-I?Gcswk}^Tvg1e|;7N#tsJ6CDs-e_49ii(t)VG$YGYTY)t
z6q<y|AgJR=7@+xG_bjtFK(NP&0KjPgD<K-}{M+_eT863KW<!yi==H)d5>DmbXW20%
zShHWqX~}8;`YN{}NB=ti=fTjL@Q&2~oEE-3{4_a#KZF0@mka<maw9!}e+K>gY&w8H
zg#3Rz`o2&9`3+}w0bvv;HBjj>=B**esX!&-M^ZXd#x(qGH_D7otE=*_w|S(A7%30b
zz!o~nCXPM~BJX+g3OQMgQiCf1^eb4cx3zii$a(Bc*nGz8Vcx!Et&p`}m_hxN;xr-t
zq>g}y+p)$QVV))ds?s47-j<y#D_lhntF-wwBnwnr@pv8GU(LdXQ<BaT<~>4EsJO|n
zeMpZ*s3g>2vk=FCJKK8XL)#JW81p2%DflLnzz60)ATBgZGDNtDJGc@kSQI1UDV6ys
zb51bxdCn)tGdF#8@C+V7!mMb|Mdr=H1rQUkKrE#W0?S^3;a_Z4LqspE(m7hPg86jD
zDtroAb%r^pmsceV%T#wW7s;Q&YZBU}Nua2K;-_%EdNbRUE5xRM$u?`GcKDpSn)?t#
zLBUcn=R=|YR=N7WXTkqzN%UXvf98fiqWbShvVZQ4yg~JEE6_j3MsJTkA6*Lvc+aPP
z{t0d(%YICWuYoM6ta78~R4r6WkeT7j=qRM>=VXuin{U@T_^M4RJ2F9(V1%|VnL{sH
zYugw(;lbolC&v|%u8u2c7u$Q5Ns~#=Nw_7pRmlTkB_$~;2Xjf7#2alE0buHoE@i1k
zgKDv*C7&JlM$WN@jvvoBWoG}loG(mJr=dzsjiz=_cwuEKyS;@I32PvuP5d-$C^Qc+
zjnm$bwrwn~YXR98Vp1T^m+P!u?9Q!h)SA!f7ndYS!jw@6SaD%CV%9)3q$l*R{n_e4
z8*zwJq|miA#e`w&I3f$HJ^$IAZ7-*jl%ex1^+Z@c0{kH@RoySm#=CafO6v%w88d~a
z;P}VIA!>{Bvsum5*Jyl9+yZg;X0zfb>Z<lMxVxJLrapn$b7$M8gbBexbGgueo6z(S
ze_sx5B>%5pxH^0-^8Y{3e{aygua7*A{r@BRzlTOoB>q1U1mI<O0@r{7rvHc~Y@wKP
z+oFkOfG`tb=`6O<B}NxJ_;0uciDZRzVPw-<nK+ryB1R<53mzm63BB?7kB&B4gk;@L
zwhyl(mz<9ik3r5H5dXE?&#b-agdBlp;Z$D2jo40O`=Ikeg3MjUJJ<4Xv}d+5o^s?Q
zn^mz_2}64aT6izXb4YpY;#@5R8x^MUgN3P4wu#GMn>NENDvqx#>3il&fuu*0Olqz7
zg=O2zRXR1bES4SXS$bunx3V~Fo<}XaTFPZe|7&k~`z-#Za=}ecJ1<(^L)U<!km7Cw
z%4~15PhPowYzG!w4yd7)170h$D@l<=B)|deBQzs=b>OhbS~O23sU~PdWVAUCnK`$L
z(a|u6rKq`3tSW=X<@}!0|7V3lvqEps|F;AEzY}x-z6bmd$^JVM1n_B*rz0OlLsSKw
zMF)VHAb{NxT^i~G@dx**S=T{5%X#&cbDDX^afa)(25C->yKuFc_bMTc|A9x)7Xe!V
zF)Mvov}i1K-9ybxSoR3sYgO&sY~~T10FT?*dNoD3JjeUcyj!J7O-^r3XWN*$pb|x&
zO%2VCs#dGaT83_LoomIW;Xg4!By^;_0cM{}9)O&ilBuCV*qn3C^v0>W2)5X=GP%RV
zMBJY&%c{>1CPik;=p3iS62|5Bon=x|G1BTOh$eFMdT{$SDRcmo3%-4s4szqPthFqT
z_<Nj}%se#b3_>H+{slOwK<8udY-i@7I6~n{@);WSPrfGYy5r6McTU!V4VB$>XPB*_
zd>x0VTjc-=dcWA#O4t5j_UC%MqiLwSZSN>dM0{<PNzq9GV4zD(CP)9%LZNB&|J)ef
zo(|y0ga30q{XeAx$X*}-JCQrU0Ne-$Xm9d=ZzlWanVkP`iwFH-ZCZ9BwF{}700WXm
zN1jX3qSMYj2G;O5+=5sL@gkALxj46{yg%MB5lmjgn_cNzn&47@l~QdjTa9D7MK;<h
z@J{Y1!*}SHkhFcwRx<N298R=sZ5quJPnTe``=mLofsmSWtJ$(vY3Cga=NIRoq!Y52
zboB*l7dvl-g{A1~dfDtGvA78f+2X{|K8AF4P0lx-i?*j#8w<0;y1>XHKVqEaju<0y
z96iK$xQk^%B*oj`G8Hth+GI96NamL$95k+)6q>Y{&lMESh~0LSh1@9Fm7p-qsHhFC
zEOO7ZkZxrbb4QovroBVA*!~iDty5IB&~61TCKw+)RA3j~qs$h9qF@<4U$Zk2_I@zD
zoZeh@uEmxodqjhzV^KrTQV=BiAZa2UEYFbY1lSW?DOHnu9^4ZYccOIegE{)YI25{=
z41l+Y|8)zGME`#+ypjCBo@4+_jNF3!e>YkX?G_zI{r{Zk;^@<U{4W#|r-<1C(TcRp
zLy<+lA*KptVnJd@j{ZCDk*Sl4Zf}9vQ9}%uq@OqmS2+$O;de=`f-JHvEK4bNA!lGb
zBy$soOmy$JeGft>C$FVRt&S9UJDPQ5S_DWFF;ZBi`9&#NSzth89qO{Egg4D>v2#@(
zua-@QnvzTQ=bZ%O=>!Ws%SAA!YN+4y7FzgN4M9%%&>W_>nq;A39H)|5<T@8y#3m=C
z#!6>B@+J{-I^uvCzr95S14ik37N8!g7%U+Iq$_&7tBNgmC9a*!?rss792^^C%5WI)
z|57LA7F#}sTrNrAP2@~NuwC?$d6uk9-U^lR5VJ80=}~sW&9c?_T?l+TlPx=g69ww4
z32G1$(n=EklZ3m_93T|kgKEpJmYwgVB<cr~0hvM|>ZMd1^P2_F?j`i!DnxnoouNgc
z&%%4)|Eog!zXbZ<K9M1G0K7gjmkgk-k^Lp)|IQ`%f38r!MLdI7B<V7?S&%&zkJYgk
zb1u!REp+dtC4JdbOXM+s>&+rL^)^t11J~B?j8iKg-_yI-`@ljhoKM3XNfVVkPsh@d
zlG|oIE%XQAHj-$&_lh~*Ce9E+c_Q5=LB~C$v$NbH%1QsImP8aLP+F-HSq0U}voyHi
zzEVjiw@>Tb8fZ5K@RDTyd6uTqBLBcekz|0FR3B6Ce1Sz4X5*-xh=24*_Y?~W1<oOS
z5>Mq^&+b<i{*sOB&{UE4mPJn^9Iw_}mW5-wzZpm(=yNJ$;pv=~6}C^}3DFqQh|#;=
zv53xWTpY8w?^qlcQwLg<m<>x`>ONp$xY-19E#Efg4(mw*PN1FQo*H9W?JPixI#xtA
ziMX#=csA6(Y;(;k67$lb5!q4l#>A8!w6F|~QQ>wG`fnKmj^h#C{cBLT4)6bS^!{y6
z|DP%}|EKW&{YLEX=;%1@`MU=M;FaR|voJ6qK5!&K-*F4w0z)doPRj=}TPr<FyEY0z
z$P2(%!&*rmw8XF3mZ+}(*o~|HZ@)<b6q2<heY?n1L1`^?ezAz_tmKSJa|ii^ENUZ@
zLU>DgxQ(4FEW!&;UF8;7zOWWgp19u>9X_?vc&%mMVk1j{SD+>&w5p?vup^mD?=Z{$
z5ugk?0m<lhz9QwN+OuGQs@hBjb;q)E>%dcy{2w$E0sw+wQHc5#u}oB*fP0nKp?*v9
zBrcemoI_qBGU|D=-^}ygG#dt>TYIa`YQ7F`kSI;ahkTgQY<4HJDu;f7s27sw-DSCj
z8Cvk$&?iO#GUA+Umc5b>&Pr*sMlh`;nuifac}L1?W4Q#-mukOIN_qrR1BODQr%*j+
zHXS_yeL;%`b3k2gUJ?ym1NkU%p>i|+6F;%nD@Xq~hC(-j|M?T>zsH8p4L?Zs&qkvE
zr$)vj{Xc;I_b2<$A^x`{kNzzjK>sn5jFf(0b&CEkiz#MMMuOO4c@Tg7mst{e<+#j=
z>WYMN|FIhrY)mE8;bs~GM==SViYkw*Suzvev23RDEb#)$JrKkRJaF#YW|fH4eER-M
zXgEomiCnjN!cm24J2N#1)CSKbNg48$c3ZN0U>rIqs&+MVb5HwpRn#n3h3<v4E7eHb
zGppqtVHGSEi!?d|h`IJx5NA>rg9;~|03d6y!@_Ekx5c|CbrU2()R<+oe+e>G^CY#<
z@;Vvemzou&#hRch3Uy1czOaAP2Nt50@M2tKKbwcy7OV^Rc(dOUNg`=L*;bZqm;q#n
zW{h$VW&@9m8fSZ`cBxb2nbQ7i9Prid1T$+#CKFiN(ae2O)pWBODz~Wk$i@<I35*jJ
zvz{({L;^<uA0SLKq#ebQ%F^*tvW7)!Y2UVJG{TUi4Z5rS|E)r|hWNVx{l7IGz*FI?
z!T<P({NFD4|7$@1T|)Lx`{)t61JDxU|7(QuH(R^>M4EL)l*%|MtSn4z%vq2>ck`qi
zQ9LVi4QhpVu>HK#JO0hLD=0o_OZ{I!)+AY$JUw!N_&4EM5MmMDiBV9dpMR20rzK4l
zZmRCFkY(156Tbf5!jc8Sn)Ry{Uu-#r0~y|=%sa%axO%lxelvguRF%|}OJsmNA8%KS
zK&YdeC>kz&L49HNxOsIo<&ZfJ7)XZQCLD$Zif6q2%n~>2USK;g$-JZ>5V>VpohP9%
z^+`!m%Qo9Jf7ENCEs~m>^Twdx<O`XoqC<Zm25Ve6E@B>Z8keLuiotlBnM`3FR6Ge{
z5E5ONa^v*b&CH`XSJ<uA^5W@)Gt6wFYWo$NUp--teTbA5$1|m&_n0LaQ1E`k8`54z
z`-KQPWCR~gsO7eqqF0gT%~eu4ET7M+(bbpSZP)E?UTYqu6E(CCm=2aYR}g+w?LC~6
z|0wh;k^Z}fhlQQ+4dI31FX{c)56}Ot^#A-S+7|8Kjb0gjf$X0P(E?tKehdoe-UYT9
zRJM0Vw?rR8#347_Sgi;Q7tbr+^CHjE>qk5$>;tgghgctnSBg8bTB#c4uGVtcwkmjn
zMZW~*-YhEtBBm%_xWVNA_dj9_UqzPCzN9JhwSvUMc9znqOtpK9SxJ%eF$zUWNaqe$
zS)i#okL@HPS2S?cU7YV=Di(Qt%mS42#SB){%pQ0S(_lhpvBZV;czi}U7Fy4-X6`0-
z9$_iT)8WQMveS~J*~zv>A}*N(XRht}wc;b^v9%=I@a?)H20C%wYTHC{rX<Mckbjl3
zlsILpr9Uvbq2%<ED#Azc6ygR~n$^iHO@UxMESi^-zG@fCjJk1Pp%Usf%NOC_!>*Rp
z6unBgfn=J{uAR5dvIl*PXF3*OVvY*Prq^5OzeV_{Q1~e7e$J=w$BW?)>HT|P<b;SK
z_iuGHO6R{bi2L73*3aHi=>c>n_W!UPahR#B7RDm80vghd=C8%d74GBSYZmaVo}O1`
zyWE>%W}kwtFLNQTFsWyeY&_aXyIRq$^L95ISGBP^@r4S9MYSd#r^SIJXcel5%>1P`
zRfHJ;S;)jIjA*0HZFX2uVU~8MSdOJA7(T^30i%fp;NO#UV$YdvmO!K7|9nT%TWh&L
z<?qh<X4RvXY!JPXV0S2<QUi?mbsGNv_54F6!PinLfjrSNbnkFHIe^q-5`e*JNxc>q
zik8i6lji1Fa4m`m7)+A=20wHf&H9^;!(b#5LdizWCV-&oYTp9LDiV~TkER6Fyt^$c
z{s#yzMQs47CvtM*b)o-Op({g?1EBcY$aP@-d`-6Rpr{Ad$D5ID!YjhJheuNt+&kPd
z^l9ixPW@;9nECTq^c>MmVd_W`@=_i(e`cKqbd$syOhB?I#5+AY<-B5+I(4Z8QM92r
z(WRbUv|ni4dBMyF>crE7qe?S<%HC(2`7YYL<oKUuHUe?|;bMQntk7~$yFLJKfgnZo
z^?tW7KWW<~-zItR_)~awE~bApcz%e*m(4;1mz^pch-*ozl?zL$Khy=+L_*zD&3p)~
zW7*Hb%(L!!w!JE8_&7oetJRn0)vFa}kbnnj=ygiGPqc^y&SM3<D$Dy*N00J`0x8Oe
zcBkNM;G1id1zm^0H)(wEZ9)Cu#JKB@uzW>Yy715vg~XySEfklo)E-pkTYJ+un`UoG
z^_|)A10-M)rK(cY4yijVO_%Z7Y|S2K#j-XntB!GrG~+ZhUMav}uLC4i=bmPpSpm$K
z-UXut1gzS5-}dfaxj5FiqZr{i(OH;M*9!d~8UpnAOM3t95Z(>+j~?Mc^Z+X%4|rVo
z60Cu{sRmv^KhQPd&&UYchP;4%K?ds|IUaQI3MvF9MXn)E@E|B5i|7-yA@Uu$0xjqm
z(lvTG9m7teZ@5S2&?`U=ofVxIT^L<~_3-uPqdZI5G1@E=Dj4bBF=Wp-)aU*vdrkj=
z2fCg8QC-)r<9~F1%8%}P^6GD$^Zn7-VIN&}PqxS(oqyEz{a#k>{ZakLZpRtkjsEDL
zf5Ii#e7F8PZ+HKBmrh>%`YlevA6>ESp{pllxA#Z4o&L~+wQ8k5n(<2ItnuD{{^+jk
z*cQLJrT%D6pKp&j!+kJ6y7QjX_jA7YM{}#zA6MhP>W>~9cU}B*XP7^FV(l$^k9IHh
zNAo%!^v()(x<7iZvF6tq-VA><zdl>^n-}#*3p(}cRqQ^MAKkb8@m<{${m~0^dv&W)
zz5UUPx4!ty<L(N7^ini&?Bibk&E6RFPM;mThy7zqV&!*y=pN;d-uimRCoR0o{LzYO
zgC|6@2l%6vOJ7{xPTlH{-aY4=&JnMJKU#I(TT@HD|M;ViFI_cuymOyFT7T5kcRH$1
z{n4l6H<T(h+#hWi^zpo#oQw0LCzjuSv})#$8b)j!*;6g>M~!X0$2PhX{LyD;PnmGA
zx0^ruvPI~lw713|eKmdKrt_Sc{^*;Do8sTONq_XifRb0|xVz*>kN<pHS=OK3lJK||
zR}WH$=Z=*`T3+02tvkjaZFSb}_dnrw^hev5U4Glss!x7&?$Y)ryZ8E|=JQsbH`$x#
zk6InQ|HCcaNBq$q?`?I<KHe;UwD%yV_fGB^`O&poZ`eoe`M;6=OFHjd@k2!Azp%>-
z#}6N?Hu&#-aQx~s?{a-gD(QCma|Mgt5B+0@?L2bYOJ2wy^&TDh>UigIf7EAAtC!|D
zulS>X{t127EP4KX=UV@HgT^1-x4*N>A02gZ^tQN{Ux}dy-P~!Ydy{``c+1@``pkPL
zKl*WY=a9PGADyzp=Z)Rn*Yl%pKYg*-c_=^XzIyi$)nb2i>LnA~%v0C+qtmKRY1zve
z=a0^*s9AiHSLcsPZ@a$b`R?uhC|$F<({y!@KdSh;X5_E#MgFKV-n?xG_X2-Z_3=0N
zz2*MkkK9g~nMr50KN`2`KX*@ZeA+2F|LNB@?d*N+AG>t%ji>IT^80-1_PyL4z0Urz
zsWms1_EH=D(G90Qw0gMvi$A*QqBZ3`vYq_V%>`>)Jm9|VkM3&t^2#YHPc8Rte01YS
z%BR4RImsojf2k(=XU@6l@Hq!~L;caC6(bWDy1o3-6YcJwdW$ObNAo%_Y4xod<&U1;
zetP8;HP|1`cS`4-<oFz|<oOS0z13aisqB?2T0DERy3#-MwJ~kyE^)u~N3YNB_emG$
zeSfsHaP8NV+y;NNa^g8FK+Et)YhL_%$a`vvKU)9Z@Q?TM^0WKtk4N+xtOohVHtf8j
zq?@YnM-6Qk&)n$c_x$HqFYEBU%CGI0Tfg6bnwzJNZ|~{YH>1}6ucZI)PCRb6-`#Hh
zH~m=O;fRc?_eZ~+lX~W1_YQyb+xwrrf0%PyZWIe0x>MP9&aeI`di2@1uXm2~N87%;
z^7gcwr=)-U39;=)Zol(xYPtXP?LXUYt8wlef3(9#@9(tS&A;bP7dOmLy50R_%~eHY
zlk&MiY?r?4*G%wy2^DMA@`|m_@O&DNwLWyyhO?C~^<u3D{&0DN+ReYqu7{o+xzIf@
zKRS6`<`ea<KWcl(EuVJu{2dzGW60L0g`MO5V|%2#-r3BV?vM67cWrtrueCpFw|~3O
zJGx8#QDM&|qu=$O_ec9I_^#!ZuFvga#S5oD*xk$D^N{&>9{8#9b(mO>*Dmk4qq^R|
z?$G}XynTBo?T>oj(P7dgZ@fS1d+GS&x6AJ5j|R<MI_fC*D}Qv<_#Wvm-IM&$aoxTz
z>Fhq>k4~(6dHKEG;r?j&8DHNYa?kNcBMQFX^(r^zk49cTzIK8-*&oFQ^e&t2<-ad}
z&i6m<>Ym~si#L4G?gW)zqw?W1|Gl?U>mTz*_NhPHjr*f>FZ$u|*2<^x*tm_$vJX0U
z`o|`Wd*P}V-2C$<ZL`Bm9i9Aj|DIKJ-8asY{+Ux2EbKbMo9vG+D~-RrUOncIt~mXi
zbN}V|`eN+LJzkwtqw;&{`VQNE@Pq4XNwMn>Dc|pW<?D8_Y15B>ca-<6f0tX5yB|8(
z9rwSH{$tZaS6;eY)%b5Z{ijazF7)zyWJY6SU27-5NA6ztuOoXodAfRF#IcKqd&l_K
z&29Tx%NEW$fAnbGVVkb@^0W5OKjG1rUTZ(tdBK1BW4|4>{3OTcTCsUIpZR3cxy3*B
zY`D1PWOqq^bY;7n9&p$DqvuYz=IGU4epf7rp7g{t?@0gH3ss+7R^u-4M=z_b2kxQH
z@<$8XtjX4TzBGv~oPWVhZM?buu~*m4?D?GQ^V8U(%EOxt^nUV>EpE18{RA)1Gv7G$
z#|NHLzOEiya>FiV-PI%hnM?QYHfNcar}!0*FPbsi%hSiIBjU$A;ymb|`QG4do-I(1
z`lB_E4D58VljlAk+;+#zi<~<D*!l%O^l6#R^RNv!7PcsKFY}Kz?6Kj!w%)(;qs~wC
znC#@gui>HQUwz?Z{bT<*a>?LsZhp=_S9|X`*6ZjW`{MQR<!3m)1{K>Fd-}6`-8`*s
zoYuEZl{e5o^V{P(7H#xi&5!O+e|@fZgFpH){%hyfZdrcx+z+>1p?p0h_Up`V?rn7U
z&mD_Lt7je7#eK^kZPk0%V+VLXCyX~c@WAf7IKEyR|5x*2<>S3W{4<-UyY2U+`ZzyY
zx?6gn@}C!P*=MhPhC04fkMI8Zmvc__Ui8o0<Kee%@8S0MNA0UdpWNX1`c%CA+V)q!
z?Y8ibb$I8J>$<9${~PH)zJJ??wrb(#=VJfEx0{u5{k4vF43{k1$+_GAijHNUp0U*P
z_j0`WhFLE?;O^`nJGkVA%MSH6<wpxoI`MP&Sby}-KcRcY@o%qid|4eo<ca=s-g5J!
zUN@{+U*&w~zsundztd-|y1*axxhv8*O!du=8uy&s-d*O8`c543-S6rEf7I{k+P;Uo
zjsEDECzk!Nv+^ZI{Fvn<3Vv3~KXyXvr_=>%8-FxBblRJ<o%}8w-ebkEx4p6cu~Tkc
zyxVlO$RC}(*J&U9?w;q5O4_XN*3((<k7B)!U3!T6%pawW`S{Dj)HD7l-R!mRZglf&
zly3c4Lxb|^Dqb<}fKy`XYyZsZ+b8e)x#w%I@k|GGR7-W2f2^j{$#aG|BmI%{Zm-#Q
zyJz~NZ2On4TkQILDt_*blinQT`E(o~_t3SApLf3T&z$&GwlL)7-+EG~D|TAq<SFUW
z#~1D!_IC8oobuUk+2&4u&ZeIE(2%>mJOy4kIegsRDnHlPMGH#0xL5esUDvj6E7#r2
zAKh@^u<?Vvh(Ef$MZepw^g8*Y>CLZsac?*OeRr1LF@25l<y!o{mAh0v>16yfXP<w0
z^FsF(e>A7%FM}`e8uFtn51!N7@uhnFiFt2bGu}JjKlWso<dmM?RDblsu$?zNsebcE
zFTQr*+B%g#^QDf>i-x(={#Vlf!edwdbc>tc%dhVK`@#bp-(rlv_FU-GN!~90H!W&$
z<hpiFo^}>Z?Nu~H<!OBJ?{A(xR}JycTykm2S8u2R{^*~7!m`3M#-Eez>_6}A@Hlsp
zI@lkre1E@@eX<AnqqRTOAMk{F+8=!pYx&%>D!;cjW?p`KqwDKz@r~Ec-=os~kALQO
zb;mx_;N0tveu}^G-IMOA{^;jX&#jx`4f0373@=g7xbt(P#MXzE6;1Wd^+!AOIB}mg
zS^v!vJA821Io0lP|JaV_t(o238|IIif4yV-qttc&sKsaNWAn3n`=gfEv|P|k?e32X
zQ^$_K%JnHJQRtmq@}v6DKeq3_-xXi!`frvfI_&)YmOH*qktjNL=ITw}gZ`Nv)AuCK
z_WUnObY3)I?c*xpA3NZZc4tmSvTJ{FqD!ylv!{54{^*cU|9hXxw)95>UmDzPg6q>`
z;>ejBf4srD-#>QD(xLY}=jGpQ*jC*p9q+dDkDWO5n1g?IFV2syZneX;s*67wKBA+y
zqjRZ0I{oF}j?6ed&rHPTw`?}WYvUh_Ux??|TkelWEid1`x%-+ws_ee#+ozRJtBK4j
z=f|daH~YuNEE#e9iC!yzG~u+7YtB`t<VPF(rax05e>Abz1#>TSeGZej=<Pk?%~Y@d
ztGzpqs(Jta1>QiUOqnYYkr0{6lzB>0rXnJm_AW!8_xrt#WlSY9MlywnGEW(b5;A4T
zkW!&ci87ZEw{yKd_paafKG$8pwSMb-_qoIQ=bY!`_1V2&dw37Kb=sS1D*|5Lnk#-&
zTAkN6-&zWzw6>F<^=p3bpE&<Lb{54oXJQ6*8Z*Gjvye}wbl_6Eqy1F0mw6oA*;eNa
zuS>Nf&dXPEiB1C^#|`HkeIRY2+HniF)s-JeN$Kw&;iUh)HpUX8@lGwUzjlJlkNpMB
z+EbpegH*ewy(+7e_oZ~B_1<bGoOUmdo1ZVd+t27-gvW!hP%{JJPgiC-wV!Z@%a78d
zeJ+zD_#>)ir3L7ok(N=)PS~|`3%^e3v2UiZ7xEl<dS$7>230Mp<#*pYvW#g{dO2iI
z{ZhU`POH0*oX&budiB$=ZaAAmsjxpQ4i~i6dVKu4{j8G9GwHY0)}2oT%_L6^ouo+>
zoK_!Ct#-}gD%goXKgCn~$&=XcjNTh~RvBxV8p+M6RyCl{k?X=%P6s|5j${KVRWIn~
z-kjS}(sL_)tu5|Ts`<;X*;z4)Qr(bO+?3OM1JC+<Sd5c2hH4EC*LE&uttmBWHuUCP
zLC=b3GpFP;R~gM!&*u5no<0}*=*pHW&vsI<TuQBWe*4~sf2GvH!L3|~Y)YL~Te>>1
z@07Z^tc*G!Wm2-f`O;*vI7G?j>((2kswR|r&(b{mnHx~*Kj?IZlk|y_!!skNS<IKx
zn2LAR^0<5-oDaPmAIQg3ZL<FL2p!2?PPfdm$BG;O#QE<zt!{tawNfH=I&E;Oo{yl_
z*3;AAN4woZz88wpwn3{Iy+S=_7|tDDDhAN){QH>hoh9Na@yEv=J4rL;pZT|sFxN<t
zV=U2p^jxwvzoM@szYc;5*0^VJ`BfiO9_ZMb9jDHMUFT|+NoOd96ixCT!R1F{P4HXG
zmz?%v&-HdW`VU2Sx^jbiY?7%&Ck4-l^6k5ON>NnXlpXs!hCimXJ@k_M7(p}Fb9bYa
zLz1PbREr6kb=QC`q_pR0TtZJyCtJ^hfm@<(OSIm29!<#Abr<*O%40z`)k=glrNm7i
z_Kf4klrAW{zj`h7C?)&uzcGcsp_F2HchGbpUzs}V%k=SF?ksh;%`!U?OjllR*`i&c
z<VGniXMewqLZWo_ZesP3s*aRy{yMj!jM-31-*BzJ8S6mlR`7@!fy|83?Pa<#heax-
z%%0x@%cR?sp5{*-y-#RT%8v}`^^HYPDzwa;zfRC^5j~5p91VFZouXRto#Hd!*e^<@
zyB>};VuDin^m^NSFj~JozporT!%JFDwePu6$+tx$r5~TCq-#s^3iH!M71o>6itVMp
z?BxATf?o4pwQid)J0;kk+j%uGjjwCKN+>mc-N|-3TTH2maid<X8TIL9$coLz@d5wD
z`R~=d;O);4L8m*f_LG|ppTj!Sy=WgW-l;irpk!$f?3~AFo%HH#*y-qEiPl~(Yt6!g
zHN-Kx(%P=Yf#ZVK`hUX+HaU0whwva8y%)E&+ADM^*`Dv-Vj8O}r{Zl5531;d>Sbq<
z=5$-=Q_ZeN=BdS^6Q$wx#EOlKW}w$dqpf#3OIN7o=osmuBc4(k?cum%F%P9QW=X=g
zaLJj{SnufgU?D$B<NTgS&J{Fwyj)k0+%sFm(3O*(PVlQPu2PyDsc9C=?^ANuP04*J
zisiIi#n$lIl%@^|8xSkeYuQWD!LoN>DVb`14;P4b678g3Gg@TVc3~~4Hsg(D%y3Tc
z>b?BCEz6kAK2c5b3A(dOdO>N9cI3b&d>5q!!KLlpSOZD{=9?ZA@KKZ&x(~VbNn}u3
zzB9D>6Dgchh<{ME8q!@#;c3xMRrq#F>%R5Ot--rdin`<0{Scc)Y0JB&9)>ClN;}t?
z*Rm8ekG*#J6$Bm>w9k0OOx>DvSJjZN+>>@Cs~OutDeg-~>L`AZQhb=vkj>&DrK7>O
zv@#?|N(qT~T=IlG`nk_DwTeX`)e^IgmE7j#l+GuFIfV%iIVI`Vwq?~QUASuWMw{hO
zx~P?Up*Ao5N6!CCC$6LqVe;$sdh5QyPSO|Z`}*hOIUm`3O1G322l7=lDcv@_*_d<M
z5xp{e;zsY55~!AKV>V=|MCVSgzkh_s&UYM?s>U>WUcRSUcZqgOuNU77YjzR_RC}Fi
zrco-brS#VCYHl=>SBf7|M@GzHPyW=r^~Q(gFOcZ0=Uv-l&B~W-3f1a7Y-wW811Qz?
zHEa_mZKGshHt*sR70oj5M&S-l$2hGU-iB?RbIyn^bfw{&kSliLCMBb<7LitbH>IXE
z=OspQT4B7K&b&3;osX1j!7d|ivj34*Hg-NL(QfH&^33>nkmyHOwy0ly=x$y`PQy)`
zyk}MAv~qdvnJkM^%W=i^+Ve}4+U{svHJWdx)J1RKno-gRN;VS?FP$oCP_k9nC61Bq
zP#Us^^(qzgs`nn2rWx+YVyHHv^a=B2w99%sgf}=D$D*k=YVPoLo7g)_WBps@w&w+u
zoFkVFyu@k6_I8e)cjux+GuL}ka=nH}r1Ny8+kru0oHwF0Ic1;YN#;k%qwnF(Q$;K#
zFYBeIvm_Tv-r*}YwU_cKDU2H}N*9ymG=KkD9Y(Km@9Fn6`ut{eHt?QN!ywz8U85^!
zris!y{01d|6LUQa7416SQoPD`H+%U{od4d7z3V5$3p%}e2Q3}o|C7tl%L<oEVR@1~
zBUXmR6kp@HbPvOiEeh@;=$z}lc2wI}7g;Z=t({u7_YiAJ>F*z5-L~;=gV<CWZ^NO5
zmd%BmoZj7PbV3wTirknm>k->7r|hJ-yPWnU@2Koazncm9wY;T8Zuk`yt>@m`qIM^D
zmnPEf_GIsy6fKTW+PBMPu&+dCMDL?{ovj`++5^4M*(VlfNR#Nw#MLPqbUD4N_f9P8
zeCo8Yq1yRTrEiAw({l1VdFeB!wbuLmn}&r`S%0b}uQ^@UoXM~A)NN%S^_jd<TwZy8
z)G0w{VDGf%<5&KYis*LNe?RW8BQ{aGu}Zr4S=dubPi>dgRs5uM`*K|e6Om5o?uhI2
zo=NiU9(_5I5g^IqJ^EE}(~U8@GV9>z&Q5FyrKg1#JWsK6l%8!EY*9@muRi%-e;pXl
zOsQ5d`d*hPF+omz^GA1POX+!-@k>))k5bW>G0J>tETwm$_iBA*vnhSFKK-IV$ZOb_
zn=Ovyi#}BQlJUCwF%dxNXV|lno02?pfAw*5+{Q|&_WOgXew?bspX8&x`LdHcUoWSk
zGuyOPv|spCH(%9pn6#Q|dV_nMYR)%O(r;IsQ_ks;@X`M@y#^C4{)zM7r*`?#rM6-i
z^<8&SU5)Y5d`b<L6zy6m<a^&BEIE1yGpAaU2~+L2^0$->_cE;n@sg6s_V6wSg7%$%
z!wAi4owNQaXovD?rCc8WP3)y!TD#>p?WLmq->3EEBWvB*bE=sKs>W+ev|stOSzr5B
zEbB|PHU(FEZ<0zVS=Jb1WF_S1x_`w^qp3`y+Moup^TSyrr4f_$bcRZYD2>tW8fwKZ
zQyO<C%<Zf6nv%0-TFqO6UWGo+pUr<S7aytSI!kBpJ&{Stt^M~aL4wvdANM*D6+Kvc
zs<~T5udruyR`>CEo8L2lg;CAZwT{JgiQd)wc!t|8=q2d%>f@E}^0OuDL|1xWis<!1
zT183uEbrGYE<c`r2Mf$|SS_ke*S~TzObVqmquWPgSCthdsZX7aYq&~Ii>gKGNkMW7
z&R1Pvw5$6pNRAnkBc)L-Kr_9=5g}h0n6Nq|TF|WaS-AIWpAph8x^mg~i9sJ(Hl?7r
z;PUg*MLE4urF4)EQVOve61<ty`t1{Xyw)}gmPECcUD`j>6SSWCY<Saq?ltKf)i%C6
z_qjEvQ;W}zJKp=Nb2_p4>@>CDiHz20pPhxg)es>+54)~aof6Lv(@)uB@`_jG@+&0X
zHfnfVvGgA~{}T?4`C9o&m(+L4f#vl^G5L8(y&BYR9+&69rDq-5HWdkUW!fpLK|yRN
zrE8`!_7C_~N;f9>UtY&GDgFH;+=`yl@+fah<J}#*+;s?lMJZ#zsjFL<lG6QO9knj<
zm6RSn`09R{-=vgTSLCZ0?YTZ#nyH5t@hMcx>89boS*1fMx2QpU4L+JuUazGCABmQ7
z^5}IuPMFDQNz?RkDt$`NQ<l9bW?w12Y4xPjM8PQ)O>SQ|lhN;5ecl>ne@&87srH^%
zOts`qD19+bzj{)9meb+T?!Sc}rLSfWo30Z(DV27pe?N(b{7DLp*0tJm-iDHXwR@+0
z_!deH_N&ge60~k8j7~SziclF-&3NA~{Xq7bl1cB_v7u}MrRJkOJWh%@O6Fy}QKr~U
z$;vgoz)GSWLeWV#Wae=`ooc<FS9u%7_RHz5mDGvR`wd0!Nn1AF5{^_GR305}!Q?)N
zSR@_JRMnx{kZ7$w-#M*eilO5!Ox`Hb*+((-+TyeRst$DJuqJyOrg2*L6~oqfW|&Dg
zsAhk7n2{-~LCNuQmW`vJ(}2S9v1Mk7icTL2r<hDTPobbI$84Szo5LBU@sZWO?Gd#p
zxxRN(jOQ+tCLW7x*M`^sC(eJx<OI=i5|{7Ow1mL=A9xD&?Ps;=Ty<thX;#Xu#h=(D
zO7mZ7_i>YG4k#9mv8w$4GUaD?;fvd5wWM=&<=;QTqMEmV4`h32yr9Fa-=~YUl!6~T
z$zp61r4=!iUwzB2P+E03$a6CbrL>{Xi7vZEBBjX8*SdXKZ%R>}3@)`|zbWnc-d5$p
z=2MEdi@8(E==7>Ml&<U%CeeIU98Le3JW3SNmB$?V_sQdQN>UsP=oUPKSySz7k1n^P
zg*?kHPW261DbX25ai!k#G0Rv(y7HRN;+RE3eyr2a2hZEf%cyp5V7FpjLHn`d-l!&%
z)(cuU6!)*Z?zUO<q$?lH8TxoA-$p6hD1E^PQI}HA>#|S1SURP=sYhcqIGvIdPx8+`
zbQ82LD)O%f6h;WzI~6Z}bd2+mX4CCn9!~n?DAA6ncv<v75zD_&?Ol&%?w;Z{rQ&v*
zcAVgJW>S=FZd)yZ&!bw&)u(OWuw+W_BYLk`#^`jecwao-sF(1e+J`|6d;C_lq4e2g
zfg*=@r1a(Gn(tatF{RS3+2-vf`PnR;f6di~%WKNFp&<i&MK!vzLc4oO<)7jINlNX@
z8EcqmOsUGFfvr}kXx&g&Db)%sX601Vl?--Au;!F%G%Gx?R#g8d&VQwT)dgP~NDkC#
z&4DEcJ91ikl@0c;cW5Z0sn)1*jnbN2zOqrSPES2X@2`~2Lmvzr$!HZ(ng(zD*;?4q
z?f(7|%(wJQDdY62S6bLMESe<IZlbi9J+@rQ22d~U#?~GFgpH@vUOPUnH(M{KeO5<G
z_%uqL9Ci%uDP5P-xT$07@uPD3Ve~$a(~hsS?z-jKK^3k1N^9mHaE%4imEBiQ4r?Nu
zDfN8t!>L@%rPNz*i;<P|hSGp}YX{s@(YZl6V3pUC4qT6F4iVL=PFHDA8X4Z>cNZbw
z2dDMJ%2#uGEi1?LYZlmA<kOX7^@0y9VEUBC9gWv9VMdf(`kH;3&f+P#cJ98Ukk6zv
z(X8o)dyLL+$|)lqCv+7iRP%nSINe5crsOk1aiom5lGA$I1DRqRrJ2_UPIh3`DM<@0
z7Tn-;vQ$c6`W@2e?o<=E^OLqP`i+fpb|0@heN}Rwb2j%iJ+G2`nO{~g%UsYNqznkK
z2=x;s^i!6&7PN|EPL$RJud>My^(n1O4V?N|&|0L7UKbqUCwWmVI%~Y^bm;-5z0%1e
zx1~TzvB?KcH|Fw{2Ufk?+?mOb(!tXsQ&QP6y7K7ra*yYnR&(VszlR1UtTEM2+HGs}
zUQ+xu|7|pWY5bf2`uAV{8u&l{{jc(3WUNUoAwMry`iCs4C(Nnu>yM6Ho+frty5Uk}
z(p92;NBOWUS$8v|_j=05TNfnF<?`!1$M)>j$GjHZF0amAeI;*5>9p-o&H3C_PA;Ag
z^!Y?eXQrQCnasaYI{WI3`)fw$TxHVXjva!;Nvfq7PD@)Y<l9|zJ^Ae;drY-|_dUuF
zv97UR)qqBS9#Qf!fZNFF^~H(n*?CH@w9Ljl6Z<I@Df?S4<sT`%+t%@SV`fRIB*<`7
zB9rI;ht5e$Y6|(W{&C!8eL9n$m0xe;*Dql7>h-Of^>yJVe*4c)@zrU(bLLO+PEO%(
zR$pYpDe0O8)a%S=QL3>ju;iX7prqHgbGffrL`lDQ@=|wcE2TR9l`~T%Nlp`*1-_Gh
zQZgP?tLz!il+%(CGe2^9y!LY^G_A&~Qmup0CT~YZd#-PXk`9^iVys+yKid3~iq;$7
zjxlK!d7>%RtmX#aeIaO%_w9VF{_<?mgKFJW5&P2wt>3=ZX?o|9BzkmxZL&;luSs<N
z_wC+sj>~3dOt<UNrnJi~5lX4|#;O(F1)YF>ZCzJ<b`bRZ`Sx4h`M4WTrYi^d4zsHe
z6_f_nG~552(Rs>u@UYKAeWhnq8(QCTz!mZ9ule6mbEd}M{MY{f+s^{1{O)1;=TC2b
z{l<TMuFscKrwhNlFa01TQCh6^M8iSI&)Kq3n;y)RCQvP8`-^^(M0=<2+Lr}4D}?+S
zS*JJhz&`0RUAZB+w8WLsX}~v1`^2rAs#a9ny1@MW3ek&Fv~E3}6n>o2?!cTvM~O~U
zzHv^)xrHKvYH=keO}k692l^fu+GR(XI7PKX*4}ywE-2YIdbj+ppn2sx*2?n!D^`VS
z&XGMH&fy&>P2Q1OqQwK{l-F;H9uKGFX_9i#Q@oc`YEn)KKSN2;H1hCteojs!^lt9p
z@_qNSE+6tjT0ym$#ih$^`4LKzX5pJb(tS$oM02T_XHepwee|;#{l39Bpgen!g*2IJ
z|MxvdhX%xNnZ+*B{X1rMQhA!kQaUkUkxjf9O(|iX=B^-4`>OA`l*S)41no1vNo@_5
zbYVesWm3wBHD{Q-5?=MHRcn)~5!J5lws&j53Mt*R7cN6tKBe^6g^fONT}ltK`>&`b
z*;C3~l(bNr2UE)Gu%u-bwu(}&f2;n{>@cN*4a;gLOD`$CGP+m!jdW#y&3_BcRE_`I
zr+HL<8c65LPX%dM`FTO#D?cUVN#&=7q{?&p|Nr~%eFXkIpMKMNcB}V5G@~@>Y`kQ`
zA5wBnX>xZipHFF&M#bq*(g{jVBO5n5BWQK?8*VV?$VPsFYIYIjI!#ryPWjo@o|ny8
zN2(27{>gH?<Vk7ZC9l%a?9rd(Thw^d9vdOAMMc)4zd3WH+Pl}SLYA@wN+oCar73tj
zIc0=DiV^Z&R-tjBRdwF)Pt8vw+xAB<A&;jOsdQN`c2G^Hx<*aL22;`-9OUmS<kX-j
zH?fhb3e_6swcceewo_^xY(L3VqH~|0u~FjMpKKY`j9ohBt&r%P;%9uQmPRQ5PBqh|
zgW6u_cjOd*x-5l9$>|i!E#glowRpDJJ5-_-)X$<~e#Sjsn`)g(_rB2<w9@-^oo(mr
zERCa@_4$Pj!&rSe-N^kin-x>)zQ@6SFL$HVGtPg&B(6`X_tV;ANArc0`i5>)Y?J8R
z@E><ozy1z+4n=>y|D&Zw<rn(qXnfMt)oiY5Q~CX0UX`Exvq3Xn^P*-}<>!FwXf@U9
zs%5V=O>3UkTCIJRpY!uj>s{sN0vc*}(jKNgMSHe(xb`0H#LCYHeDgp5>tA2<4YfP|
zuOGcD*<&7o*#YxN%#N7VFr*XiWEAGnn8#oqi+LPoXUr~`$77y=*%k9d%#$#?VV;b6
z3TAiAQ!!7&?19-6vlnJ>%s!YEn3b4)G5cYjj(Nsk`@j0;|18{<KV}It!^|<OVMu{H
zQDL5qc@E~enCD@hk9h&+0L+1y7h+z7c`@cCn3rN+hB*lHa?HV)LokP8UV%9b^GeLC
zFo$Dajd=~`wV2nbcm8j{T}5Eth<Ov{NX%*&ax?BE3iB4sTQP6LydCon%+Z*4V%~*$
zH|7}3dob_C9E*7$=KYxCFvnv)fcYTiLzoX^K7#ou=3|(TV?KfTB<54<o&TqCS7$Jv
z#e5EPB4#xVnS?tzkNE=TWXvg;FJex`d<pYq%vUg{VZMs_8s_VmZ(zQOIUVyY%(pS$
z!F(5U2IhO1?_+*|`61>^%#Sc<Va`_X{LjH%<zmjm`~>q;%xW0&8SW$>a{=b(m|tLi
ziTM@g*O&`2zrkFD`7P#mn2Rx&V1AGJ1LlvIKVkli`3vT+m`gF2Vg81>9P@X~KQRBq
zT%q3i{~LD2G%#yo*21g}S^D=6$*RCkSXInAn5$u~j#(FT4a|C&^)c7PTnlq;%ylr=
z#cY7N9_IR(8(?mTxe?~Zn44fW#B7Aw7;{t1CYYOHZjRYht@EF?#9f(TZiTruW^>GH
z7_trS!~%0$%<V9@$83qY1LlsHtuS}O+!=Eh%v~{e!)%S&26K1JJuvsg+zWGW%(j^O
zVD5{#ALjm;2VfqEc@XBo>Ye{XaaY4I+hHD#*&eeRh8%%Aalkwhvm<6F%%d=m#yke|
zSj^)vJ7adiJRb7|%&wRxVxENA4fABoQ!u+@o{D)IW)IAsn7uH2WA?$Uz^qj7{P)9M
zO~*U~^GwXMFsormf82?LnPKLb1!fiI*_h{Go{M=N=J}WxU=F|>h<PFAMVJ?3UV?ck
z=4F_JFfYd(j5!2zDCQNI!!WPJyb5!;dguQd+|^pl>oBj!yaBTshK#_SY{a|?b0p@?
zn4>Un!MqjoHq6^G@4y_5c_-#wn0I52!Mq3aUd*wW_hH_TISz9?<^z}yVm^fVFy<qe
zk77Qi-uZt5cXbl;Da;9&Ph(cYkY{iwXEC3{oQOFI^Lfk{FehV9!F&;OD&|X=FJr!f
zISunw%-1kq$9x0xP0Z<-Z(+WT`3~m0m@_cn!+am}1I!QAJO3ZyuCg#^V}6V|2eTT6
z%*CDLVSa-7DduOG^D!4-evbJC=9idXVSbId5c3<%MVQ}Weuudja|!16m_K0ti1`!d
z&zQep{))L2a~bAun9J2W|9{}Feqye`{0sAM%>Vu&xd!ZnYhu>Itc|$}=Bk)=FjvD|
z9kVXx8kqGk>tn8oxfbTynCoD!i`f8kJ<RnnH^AHwb0f@+F*m_%h}j6UG3NjN{l9Aa
z|NnV2+*NbTrkGn`Zi!h9Lz>}ET48RD*&K5l%odp2Vs3}IJ!VVH9WZyqY=yZK=FXVA
zVD5^!8)j?FHki9(?t!@{=3bb4W46WI2XkM{{V?}e>;BIN;;sf^9*lVi=AoF?Fyt`Y
zi5=$QnC&r-!0do|BxXm<PMAkw9*ubn=CPQ^VRpvsf_XgV37B0mPsBV4vm55gn5STN
z$2=ADG|V2DJu!Q!cmDg}t`wM+n0+z(VOGPC({U#=Fwew13$s6F2{XgYF$>Hp%(F4i
z!8{l9Jk0YkFTfmtIS}(g%!@ED#=HdcQq0RR2Vq{0IT&*Y=1|Nl)I0xI;;vR<4#&J2
z^BT-*7;-J{WF6-9m^WaKz`POjCd`qTH)D>%yan@C%-b+;$Gih`H0GU{cVXU*IR^6{
z%zH7%V%~>&Kjt{h@t6-_K8X2{dguQU+|^Oc$1oqqd;+r?hCGQoIfXd^^J&ayFrUSI
z4s#;rB+TbAU%;G<IR*1Y%&C|!VZMy{3g$G-S2171d>!)*%r`NoW4?v?Hs(8+?_$nS
z@BF`yyLy26A?8fXk1(rY$SmARHs;5eb1>&(&cpl!^Ha>vFy~_~!2BHZ3(PMuzry?)
zb0Ow8n2RvK#rzI)G3FA??=gSC{1Njf%%3rT!TeRd^S=yt^$l}5=I@w)U{=GBKXE4&
zn15mZ4OwVl*2JuZSsQZ|%vCY#V6KL_I%ZwWH8AU8*2i2Eb1lrZG1tLd7qbE8dYJ2D
zZh*NV=0=zsV{W3>`7excSH_r|Vm86t46_=BY>qoI#oPjOOU!1NTVZaE*&K5l%odp2
zVs3}IJ!VVH9WZyqY=yZK=FXVAVD5^!8)j?FHki9(?t!@{=3bb4W42ZA{O^mq>W8^M
z<^h-oVphYDgK#H<F%Q8!6!S35c9@4_w#PgIvjgUlm>n@YVIGBfH0Cjw$6_9b*%`A7
z=JA*(V0Ohk5%VO>ZkQ)yo`TsO^HlZDe-GT1CuT3q-k5zbt6@k5?nH^%7qcJc>6m9=
zo{4!DW`E2QW`>z#7MN9-XJej&c`oL8nCD|&fH?qjAm)Xb7hztEc?ssFn3rJ=!n|C)
z^FIW46^eNU<}l1FF{@$7Rk)LI%&Rf4!MqmpI?U@aZ@?UZc_Zdcm?JT7#vFxt3+Anu
zw_)Cnc?afb%sVmf!n_-E4CXzU_hOF4ybtq!%yH_S{|9ha2QeSQd>Hc)%xW0&DDLDK
z=Hr-8U_OcY6y^lXr!k+wd=~RL%!!zjFrUYK0dq3u6wDVfr((W@`7-7!nA0#{#e5C(
zb<8&~-^84b`IdU;{{!6BL(G|&A7ReId<XMg%o&*PVZM)94fiq|ck&o>4(43Ud6=JI
zev0`S=6uWrn4e>Qf%zroSD0U8F2wu>a}nmZnBQS8#$1B=J?0OXKmIlUO*BVp{FlD<
z2YeIIf9m^xL<R2Z7v|rPRT`KzF>7Jg##{w+Rm?h&#b?Z4Fn`5din$E)H_YXjzhnM^
z`6uT8C!R}HHF)P$)iLX0u7Oz(vp(jUm}_CKjk(TW^WRicSK~kX4PTYt1*W6<zVds)
zE>?a&*oMmQ3G=F4IczGwH%#|mXZ-(R89zRqF?Ygjg}Ec<4wx-5x5wNLb6d<7nA>1B
z$J`pT0p@y`>tk+!xgq98m>Xkmg4qzW5oTk|O);BbZicxzW>d^9Ft@~PhPl;$14XM7
AOaK4?

literal 0
HcmV?d00001

diff --git a/toolkit/components/satchel/test/unit/perf_autocomplete.js b/toolkit/components/satchel/test/unit/perf_autocomplete.js
new file mode 100644
index 00000000000..278ab88cd35
--- /dev/null
+++ b/toolkit/components/satchel/test/unit/perf_autocomplete.js
@@ -0,0 +1,173 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Satchel Test Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Matthew Noorenberghe <mnoorenberghe@mozilla.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var testnum = 0;
+var fh;
+var fac;
+var prefs;
+
+function countAllEntries() {
+    let stmt = fh.DBConnection.createStatement("SELECT COUNT(*) as numEntries FROM moz_formhistory");
+    do_check_true(stmt.step());
+    let numEntries = stmt.row.numEntries;
+    stmt.finalize();
+    return numEntries;
+}
+
+function do_AC_search(searchTerm, previousResult) {
+    var duration = 0;
+    var searchCount = 5;
+    var tempPrevious = null;
+    var startTime;
+    for (var i = 0; i < searchCount; i++) {
+        if (previousResult !== null)
+            tempPrevious = fac.autoCompleteSearch("searchbar-history", previousResult, null, null);
+        startTime = Date.now();
+        results = fac.autoCompleteSearch("searchbar-history", searchTerm, null, tempPrevious);
+        duration += Date.now() - startTime;
+    }
+    dump("[autoCompleteSearch][test " + testnum + "] for '" + searchTerm + "' ");
+    if (previousResult !== null)
+        dump("with '" + previousResult + "' previous result ");
+    else
+        dump("w/o previous result ");
+    dump("took " + duration + " ms with " + results.matchCount + " matches.  ");
+    dump("Average of " + Math.round(duration / searchCount) + " ms per search\n");
+    return results;
+}
+
+function run_test() {
+    try {
+
+        // ===== test init =====
+        var testfile = do_get_file("formhistory_1000.sqlite");
+        var profileDir = dirSvc.get("ProfD", Ci.nsIFile);
+        var results;
+
+        // Cleanup from any previous tests or failures.
+        var destFile = profileDir.clone();
+        destFile.append("formhistory.sqlite");
+        if (destFile.exists())
+          destFile.remove(false);
+
+        testfile.copyTo(profileDir, "formhistory.sqlite");
+
+        fh = Cc["@mozilla.org/satchel/form-history;1"].
+             getService(Ci.nsIFormHistory2);
+        fac = Cc["@mozilla.org/satchel/form-autocomplete;1"].
+              getService(Ci.nsIFormAutoComplete);
+        prefs = Cc["@mozilla.org/preferences-service;1"].
+                getService(Ci.nsIPrefBranch);
+
+        timeGroupingSize = prefs.getIntPref("browser.formfill.timeGroupingSize") * 1000 * 1000;
+        maxTimeGroupings = prefs.getIntPref("browser.formfill.maxTimeGroupings");
+        bucketSize = prefs.getIntPref("browser.formfill.bucketSize");
+
+        // ===== 1 =====
+        // Check initial state is as expected
+        testnum++;
+        do_check_true(fh.hasEntries);
+        do_check_eq(1000, countAllEntries());
+        fac.autoCompleteSearch("searchbar-history", "zzzzzzzzzz", null, null); // warm-up search
+        do_check_true(fh.nameExists("searchbar-history"));
+
+        // ===== 2 =====
+        // Search for '' with no previous result
+        testnum++;
+        results = do_AC_search("", null);
+        do_check_true(results.matchCount > 0);
+
+        // ===== 3 =====
+        // Search for 'r' with no previous result
+        testnum++;
+        results = do_AC_search("r", null);
+        do_check_true(results.matchCount > 0);
+
+        // ===== 4 =====
+        // Search for 'r' with '' previous result
+        testnum++;
+        results = do_AC_search("r", "");
+        do_check_true(results.matchCount > 0);
+
+        // ===== 5 =====
+        // Search for 're' with no previous result
+        testnum++;
+        results = do_AC_search("re", null);
+        do_check_true(results.matchCount > 0);
+
+        // ===== 6 =====
+        // Search for 're' with 'r' previous result
+        testnum++;
+        results = do_AC_search("re", "r");
+        do_check_true(results.matchCount > 0);
+
+        // ===== 7 =====
+        // Search for 'rea' without previous result
+        testnum++;
+        results = do_AC_search("rea", null);
+        let countREA = results.matchCount;
+
+        // ===== 8 =====
+        // Search for 'rea' with 're' previous result
+        testnum++;
+        results = do_AC_search("rea", "re");
+        do_check_eq(countREA, results.matchCount);
+
+        // ===== 9 =====
+        // Search for 'real' with 'rea' previous result
+        testnum++;
+        results = do_AC_search("real", "rea");
+        let countREAL = results.matchCount;
+        do_check_true(results.matchCount <= countREA);
+
+        // ===== 10 =====
+        // Search for 'real' with 're' previous result
+        testnum++;
+        results = do_AC_search("real", "re");
+        do_check_eq(countREAL, results.matchCount);
+
+        // ===== 11 =====
+        // Search for 'real' with no previous result
+        testnum++;
+        results = do_AC_search("real", null);
+        do_check_eq(countREAL, results.matchCount);
+
+
+    } catch (e) {
+      throw "FAILED in test #" + testnum + " -- " + e;
+    }
+}

From 3639559e2759153afd3c5cb79451f1a47417eed8 Mon Sep 17 00:00:00 2001
From: MattN <mnoorenberghe@mozilla.com>
Date: Sat, 1 Aug 2009 17:30:27 -0700
Subject: [PATCH 157/175] Bug 444728 - autocomplete disregards maxlength for
 input fields. r=dolske, sr=mconnor

---
 .../satchel/public/nsIFormAutoComplete.idl    |  4 +-
 .../satchel/src/nsFormAutoComplete.js         |  8 +-
 .../satchel/src/nsFormFillController.cpp      |  1 +
 .../satchel/test/test_form_autocomplete.html  | 93 +++++++++++++++++++
 .../satchel/test/unit/test_autocomplete.js    | 14 +--
 5 files changed, 111 insertions(+), 9 deletions(-)

diff --git a/toolkit/components/satchel/public/nsIFormAutoComplete.idl b/toolkit/components/satchel/public/nsIFormAutoComplete.idl
index f0a1db02113..93cf717cb7f 100644
--- a/toolkit/components/satchel/public/nsIFormAutoComplete.idl
+++ b/toolkit/components/satchel/public/nsIFormAutoComplete.idl
@@ -38,8 +38,9 @@
 #include "nsISupports.idl"
 
 interface nsIAutoCompleteResult;
+interface nsIDOMHTMLInputElement;
 
-[scriptable, uuid(2f5bb765-428e-4e33-b2d8-441eb7ddf730)]
+[scriptable, uuid(997c0c05-5d1d-47e5-9cbc-765c0b8ec699)]
 
 interface nsIFormAutoComplete: nsISupports {
     /**
@@ -48,5 +49,6 @@ interface nsIFormAutoComplete: nsISupports {
     nsIAutoCompleteResult autoCompleteSearch(
                                     in AString aInputName,
                                     in AString aSearchString,
+                                    in nsIDOMHTMLInputElement aField,
                                     in nsIAutoCompleteResult aPreviousResult);
 };
diff --git a/toolkit/components/satchel/src/nsFormAutoComplete.js b/toolkit/components/satchel/src/nsFormAutoComplete.js
index fc5e6d3aa3f..b54e33d1aa7 100644
--- a/toolkit/components/satchel/src/nsFormAutoComplete.js
+++ b/toolkit/components/satchel/src/nsFormAutoComplete.js
@@ -173,11 +173,12 @@ FormAutoComplete.prototype = {
      *
      * aInputName    -- |name| attribute from the form input being autocompleted.
      * aUntrimmedSearchString -- current value of the input
+     * aField -- nsIDOMHTMLInputElement being autocompleted (may be null if from chrome)
      * aPreviousResult -- previous search result, if any.
      *
      * Returns: an nsIAutoCompleteResult
      */
-    autoCompleteSearch : function (aInputName, aUntrimmedSearchString, aPreviousResult) {
+    autoCompleteSearch : function (aInputName, aUntrimmedSearchString, aField, aPreviousResult) {
         function sortBytotalScore (a, b) {
             let x = a.totalScore;
             let y = b.totalScore;
@@ -222,6 +223,11 @@ FormAutoComplete.prototype = {
             this.log("Creating new autocomplete search result.");
             let entries = this.getAutoCompleteValues(aInputName, searchString);
             result = new FormAutoCompleteResult(this._formHistory, entries, aInputName, aUntrimmedSearchString);
+            if (aField && aField.maxLength > -1) {
+                let original = result.wrappedJSObject.entries;
+                let filtered = original.filter(function (el) el.text.length <= this.maxLength, aField);
+                result.wrappedJSObject.entries = filtered;
+            }
         }
 
         return result;
diff --git a/toolkit/components/satchel/src/nsFormFillController.cpp b/toolkit/components/satchel/src/nsFormFillController.cpp
index 491a3bd0551..a81cfa8eb3c 100644
--- a/toolkit/components/satchel/src/nsFormFillController.cpp
+++ b/toolkit/components/satchel/src/nsFormFillController.cpp
@@ -517,6 +517,7 @@ nsFormFillController::StartSearch(const nsAString &aSearchString, const nsAStrin
 
     rv = formAutoComplete->AutoCompleteSearch(aSearchParam,
                                               aSearchString,
+                                              mFocusedInput,
                                               aPreviousResult,
                                               getter_AddRefs(result));
   }
diff --git a/toolkit/components/satchel/test/test_form_autocomplete.html b/toolkit/components/satchel/test/test_form_autocomplete.html
index b147be11314..c00e0cbf4b4 100644
--- a/toolkit/components/satchel/test/test_form_autocomplete.html
+++ b/toolkit/components/satchel/test/test_form_autocomplete.html
@@ -51,6 +51,12 @@ Form History test: form field autocomplete
     <button type="submit">Submit</button>
   </form>
 
+  <!-- form with maxlength attribute on input -->
+  <form id="form7" onsubmit="return false;">
+    <input  type="text" name="field5" maxlength="10">
+    <button type="submit">Submit</button>
+  </form>
+
 </div>
 
 <pre id="test">
@@ -84,6 +90,10 @@ fh.addEntry("field4", "a\xe6");
 fh.addEntry("field4", "aa a\xe6");
 fh.addEntry("field4", "aba\xe6");
 fh.addEntry("field4", "bc d\xe6");
+fh.addEntry("field5", "1");
+fh.addEntry("field5", "12");
+fh.addEntry("field5", "123");
+fh.addEntry("field5", "1234");
 
 // Restore the form to the default state.
 function restoreForm() {
@@ -521,6 +531,89 @@ function runTest(testNum) {
     case 256:
         checkMenuEntries([]);
 
+        // Look at form 7, try to trigger autocomplete popup
+        input = $_(7, "field5");
+        restoreForm();
+        doKey("down");
+        testNum = 299;
+        break;
+
+    case 300:
+        checkMenuEntries(["1", "12", "123", "1234"]);
+        input.maxLength = 4;
+        doKey("escape");
+        doKey("down");
+        break;
+
+    case 301:
+        checkMenuEntries(["1", "12", "123", "1234"]);
+        input.maxLength = 3;
+        doKey("escape");
+        doKey("down");
+        break;
+
+    case 302:
+        checkMenuEntries(["1", "12", "123"]);
+        input.maxLength = 2;
+        doKey("escape");
+        doKey("down");
+        break;
+
+    case 303:
+        checkMenuEntries(["1", "12"]);
+        input.maxLength = 1;
+        doKey("escape");
+        doKey("down");
+        break;
+
+    case 304:
+        checkMenuEntries(["1"]);
+        input.maxLength = 0;
+        doKey("escape");
+        doKey("down");
+        break;
+
+    case 305:
+        checkMenuEntries([]);
+        input.maxLength = 4;
+
+        // now again with a character typed
+        sendChar("1", input);
+        doKey("escape");
+        doKey("down");
+        break;
+
+    case 306:
+        checkMenuEntries(["1", "12", "123", "1234"]);
+        input.maxLength = 3;
+        doKey("escape");
+        doKey("down");
+        break;
+
+    case 307:
+        checkMenuEntries(["1", "12", "123"]);
+        input.maxLength = 2;
+        doKey("escape");
+        doKey("down");
+        break;
+
+    case 308:
+        checkMenuEntries(["1", "12"]);
+        input.maxLength = 1;
+        doKey("escape");
+        doKey("down");
+        break;
+
+    case 309:
+        checkMenuEntries(["1"]);
+        input.maxLength = 0;
+        doKey("escape");
+        doKey("down");
+        break;
+
+    case 310:
+        checkMenuEntries([]);
+
         SimpleTest.finish();
         return;
 
diff --git a/toolkit/components/satchel/test/unit/test_autocomplete.js b/toolkit/components/satchel/test/unit/test_autocomplete.js
index b72962e97be..f87308bd716 100644
--- a/toolkit/components/satchel/test/unit/test_autocomplete.js
+++ b/toolkit/components/satchel/test/unit/test_autocomplete.js
@@ -131,13 +131,13 @@ function run_test() {
         // ===== 2 =====
         // Check search contains all entries
         testnum++;
-        results = fac.autoCompleteSearch("field1", "", null);
+        results = fac.autoCompleteSearch("field1", "", null, null);
         do_check_eq(numRecords, results.matchCount);
 
         // ===== 3 =====
         // Check search result ordering with empty search term
         testnum++;
-        results = fac.autoCompleteSearch("field1", "", null);
+        results = fac.autoCompleteSearch("field1", "", null, null);
         let lastFound = numRecords;
         for (let i = 0; i < numRecords; i+=2) {
             do_check_eq(parseInt(results.getValueAt(i + 1).substr(5), 10), --lastFound);
@@ -147,7 +147,7 @@ function run_test() {
         // ===== 4 =====
         // Check search result ordering with "v"
         testnum++;
-        results = fac.autoCompleteSearch("field1", "v", null);
+        results = fac.autoCompleteSearch("field1", "v", null, null);
         lastFound = numRecords;
         for (let i = 0; i < numRecords; i+=2) {
             do_check_eq(parseInt(results.getValueAt(i + 1).substr(5), 10), --lastFound);
@@ -176,7 +176,7 @@ function run_test() {
         // ===== 5 =====
         // Check search result ordering with empty search term
         testnum++;
-        results = fac.autoCompleteSearch("field2", "", null);
+        results = fac.autoCompleteSearch("field2", "", null, null);
         lastFound = timesUsedSamples;
         for (let i = 0; i < timesUsedSamples; i++) {
             do_check_eq(parseInt(results.getValueAt(i).substr(5)), --lastFound);
@@ -185,7 +185,7 @@ function run_test() {
         // ===== 6 =====
         // Check search result ordering with "v"
         testnum++;
-        results = fac.autoCompleteSearch("field2", "v", null);
+        results = fac.autoCompleteSearch("field2", "v", null, null);
         lastFound = timesUsedSamples;
         for (let i = 0; i < timesUsedSamples; i++) {
             do_check_eq(parseInt(results.getValueAt(i).substr(5)), --lastFound);
@@ -217,7 +217,7 @@ function run_test() {
               now +
           ");");
 
-        results = fac.autoCompleteSearch("field3", "", null);
+        results = fac.autoCompleteSearch("field3", "", null, null);
         do_check_eq(results.getValueAt(0), "senior citizen");
         do_check_eq(results.getValueAt(1), "old but not senior");
 
@@ -257,7 +257,7 @@ function run_test() {
               (now * 2) +
           ");");
 
-        results = fac.autoCompleteSearch("field4", "", null);
+        results = fac.autoCompleteSearch("field4", "", null, null);
         do_check_eq(results.matchCount, 3);
 
 

From 876f2f2c1380c113496464fc2b80909b265c70c1 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Sun, 2 Aug 2009 10:51:17 +0900
Subject: [PATCH 158/175] Bug 125282 Webpage-JS can steal focus from URLbar /
 chrome r=enn, sr=smaug

---
 browser/base/content/test/Makefile.in         |  1 +
 .../base/content/test/browser_bug125282.js    | 77 +++++++++++++++++++
 dom/base/nsFocusManager.cpp                   | 15 +++-
 3 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 browser/base/content/test/browser_bug125282.js

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 14b9ae15d64..a2b2b4758dd 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -126,6 +126,7 @@ _BROWSER_FILES = \
                  browser_bug491431.js \
                  browser_bug304198.js \
                  browser_drag.js \
+                 browser_bug125282.js \
     $(NULL)
 
 ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
diff --git a/browser/base/content/test/browser_bug125282.js b/browser/base/content/test/browser_bug125282.js
new file mode 100644
index 00000000000..ee3a18055ea
--- /dev/null
+++ b/browser/base/content/test/browser_bug125282.js
@@ -0,0 +1,77 @@
+function test() {
+  waitForExplicitFinish();
+
+  let fm = Components.classes["@mozilla.org/focus-manager;1"]
+                     .getService(Components.interfaces.nsIFocusManager);
+
+  let tabs = [ gBrowser.mCurrentTab, gBrowser.addTab() ];
+  gBrowser.selectedTab = tabs[0];
+
+  let loadedCount;
+
+  // The first test set is checking the nsIDOMElement.focus can move focus at
+  // onload event.
+  let callback = doTest1;
+  load("data:text/html,<body onload=\"document.getElementById('input').focus()\"><input id='input'></body>");
+
+  function load(aURI) {
+    loadedCount = 0;
+    for (let i = 0; i < tabs.length; i++) {
+      tabs[i].linkedBrowser.addEventListener("load", onLoad, true);
+      tabs[i].linkedBrowser.loadURI(aURI);
+    }
+  }
+
+  function onLoad() {
+    if (++loadedCount == tabs.length) {
+      setTimeout(callback, 10);
+    }
+  }
+
+  function doTest1() {
+    tabs[0].linkedBrowser.removeEventListener("load", onLoad, true);
+    tabs[1].linkedBrowser.removeEventListener("load", onLoad, true);
+
+    let e = tabs[0].linkedBrowser.contentDocument.activeElement;
+    is(e.tagName, "INPUT", "the foreground tab's input element is not active");
+    is(fm.focusedElement, e, "the input element isn't focused");
+    e = tabs[1].linkedBrowser.contentDocument.activeElement;
+    is(e.tagName, "INPUT", "the background tab's input element is not active");
+    isnot(fm.focusedElement, e, "the input element is focused");
+
+    // The second test set is checking the nsIDOMElement.focus can NOT move
+    // if an element of chrome has focus.
+    callback = doTest2;
+    load("data:text/html,<body onload=\"setTimeout(function () { document.getElementById('input').focus(); }, 10);\"><input id='input'></body>");
+
+    BrowserSearch.searchBar.focus();
+  }
+
+  let canRetry = 10;
+
+  function doTest2() {
+    if (canRetry-- > 0 &&
+        (tabs[0].linkedBrowser.contentDocument.activeElement.tagName != "INPUT" ||
+         tabs[1].linkedBrowser.contentDocument.activeElement.tagName != "INPUT")) {
+      setTimeout(doTest2, 10); // retry
+      return;
+    }
+
+    tabs[0].linkedBrowser.removeEventListener("load", onLoad, true);
+    tabs[1].linkedBrowser.removeEventListener("load", onLoad, true);
+
+    let e = tabs[0].linkedBrowser.contentDocument.activeElement;
+    is(e.tagName, "INPUT", "the foreground tab's input element is not active");
+    isnot(fm.focusedElement, e, "the input element is focused");
+    e = tabs[1].linkedBrowser.contentDocument.activeElement;
+    is(e.tagName, "INPUT", "the background tab's input element is not active");
+    isnot(fm.focusedElement, e, "the input element is focused");
+
+    // cleaning-up...
+    tabs[0].linkedBrowser.loadURI("about:blank");
+    gBrowser.selectedTab = tabs[1];
+    gBrowser.removeCurrentTab();
+
+    finish();
+  }
+}
\ No newline at end of file
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index 4d8f59ab9f5..e388f99afa3 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -1041,9 +1041,22 @@ nsFocusManager::SetFocusInner(nsIContent* aNewContent, PRInt32 aFlags,
   PRBool allowFrameSwitch = !(aFlags & FLAG_NOSWITCHFRAME) ||
                             IsSameOrAncestor(newWindow, mFocusedWindow);
 
+  PRBool canStealFocus = PR_TRUE;
+  // When an element already has focus but this focus changing isn't by the
+  // user input, we should check the permission.
+  if (mFocusedContent && !(aFlags & (FLAG_BYMOUSE | FLAG_BYKEY))) {
+    nsCOMPtr<nsIDOMNode> currentFocusedNode =
+                           do_QueryInterface(mFocusedContent);
+    // If the caller cannot access the current focused node, the caller should
+    // not be able to steal focus from it. E.g., When the current focused node
+    // is in chrome, any web contents should not be able to steal the focus.
+    canStealFocus = nsContentUtils::CanCallerAccess(currentFocusedNode);
+  }
+
   // if the element is in the active window, frame switching is allowed and
   // the content is in a visible window, fire blur and focus events.
-  if (isElementInActiveWindow && allowFrameSwitch && IsWindowVisible(newWindow)) {
+  if (isElementInActiveWindow && allowFrameSwitch &&
+      IsWindowVisible(newWindow) && canStealFocus) {
     // return if blurring fails or the focus changes during the blur
     if (mFocusedWindow) {
       // if the focus is being moved to another element in the same document,

From 55fc3b142c829553e10ccd237f8748021414488c Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Sun, 2 Aug 2009 15:10:37 +0430
Subject: [PATCH 159/175] Backed out changeset 8366e5cc9f57 (bug 125282)
 because of four windows unit test oranges in a row (all timed out when
 running mochitest-plain)

---
 browser/base/content/test/Makefile.in         |  1 -
 .../base/content/test/browser_bug125282.js    | 77 -------------------
 dom/base/nsFocusManager.cpp                   | 15 +---
 3 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 browser/base/content/test/browser_bug125282.js

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index a2b2b4758dd..14b9ae15d64 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -126,7 +126,6 @@ _BROWSER_FILES = \
                  browser_bug491431.js \
                  browser_bug304198.js \
                  browser_drag.js \
-                 browser_bug125282.js \
     $(NULL)
 
 ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
diff --git a/browser/base/content/test/browser_bug125282.js b/browser/base/content/test/browser_bug125282.js
deleted file mode 100644
index ee3a18055ea..00000000000
--- a/browser/base/content/test/browser_bug125282.js
+++ /dev/null
@@ -1,77 +0,0 @@
-function test() {
-  waitForExplicitFinish();
-
-  let fm = Components.classes["@mozilla.org/focus-manager;1"]
-                     .getService(Components.interfaces.nsIFocusManager);
-
-  let tabs = [ gBrowser.mCurrentTab, gBrowser.addTab() ];
-  gBrowser.selectedTab = tabs[0];
-
-  let loadedCount;
-
-  // The first test set is checking the nsIDOMElement.focus can move focus at
-  // onload event.
-  let callback = doTest1;
-  load("data:text/html,<body onload=\"document.getElementById('input').focus()\"><input id='input'></body>");
-
-  function load(aURI) {
-    loadedCount = 0;
-    for (let i = 0; i < tabs.length; i++) {
-      tabs[i].linkedBrowser.addEventListener("load", onLoad, true);
-      tabs[i].linkedBrowser.loadURI(aURI);
-    }
-  }
-
-  function onLoad() {
-    if (++loadedCount == tabs.length) {
-      setTimeout(callback, 10);
-    }
-  }
-
-  function doTest1() {
-    tabs[0].linkedBrowser.removeEventListener("load", onLoad, true);
-    tabs[1].linkedBrowser.removeEventListener("load", onLoad, true);
-
-    let e = tabs[0].linkedBrowser.contentDocument.activeElement;
-    is(e.tagName, "INPUT", "the foreground tab's input element is not active");
-    is(fm.focusedElement, e, "the input element isn't focused");
-    e = tabs[1].linkedBrowser.contentDocument.activeElement;
-    is(e.tagName, "INPUT", "the background tab's input element is not active");
-    isnot(fm.focusedElement, e, "the input element is focused");
-
-    // The second test set is checking the nsIDOMElement.focus can NOT move
-    // if an element of chrome has focus.
-    callback = doTest2;
-    load("data:text/html,<body onload=\"setTimeout(function () { document.getElementById('input').focus(); }, 10);\"><input id='input'></body>");
-
-    BrowserSearch.searchBar.focus();
-  }
-
-  let canRetry = 10;
-
-  function doTest2() {
-    if (canRetry-- > 0 &&
-        (tabs[0].linkedBrowser.contentDocument.activeElement.tagName != "INPUT" ||
-         tabs[1].linkedBrowser.contentDocument.activeElement.tagName != "INPUT")) {
-      setTimeout(doTest2, 10); // retry
-      return;
-    }
-
-    tabs[0].linkedBrowser.removeEventListener("load", onLoad, true);
-    tabs[1].linkedBrowser.removeEventListener("load", onLoad, true);
-
-    let e = tabs[0].linkedBrowser.contentDocument.activeElement;
-    is(e.tagName, "INPUT", "the foreground tab's input element is not active");
-    isnot(fm.focusedElement, e, "the input element is focused");
-    e = tabs[1].linkedBrowser.contentDocument.activeElement;
-    is(e.tagName, "INPUT", "the background tab's input element is not active");
-    isnot(fm.focusedElement, e, "the input element is focused");
-
-    // cleaning-up...
-    tabs[0].linkedBrowser.loadURI("about:blank");
-    gBrowser.selectedTab = tabs[1];
-    gBrowser.removeCurrentTab();
-
-    finish();
-  }
-}
\ No newline at end of file
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index e388f99afa3..4d8f59ab9f5 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -1041,22 +1041,9 @@ nsFocusManager::SetFocusInner(nsIContent* aNewContent, PRInt32 aFlags,
   PRBool allowFrameSwitch = !(aFlags & FLAG_NOSWITCHFRAME) ||
                             IsSameOrAncestor(newWindow, mFocusedWindow);
 
-  PRBool canStealFocus = PR_TRUE;
-  // When an element already has focus but this focus changing isn't by the
-  // user input, we should check the permission.
-  if (mFocusedContent && !(aFlags & (FLAG_BYMOUSE | FLAG_BYKEY))) {
-    nsCOMPtr<nsIDOMNode> currentFocusedNode =
-                           do_QueryInterface(mFocusedContent);
-    // If the caller cannot access the current focused node, the caller should
-    // not be able to steal focus from it. E.g., When the current focused node
-    // is in chrome, any web contents should not be able to steal the focus.
-    canStealFocus = nsContentUtils::CanCallerAccess(currentFocusedNode);
-  }
-
   // if the element is in the active window, frame switching is allowed and
   // the content is in a visible window, fire blur and focus events.
-  if (isElementInActiveWindow && allowFrameSwitch &&
-      IsWindowVisible(newWindow) && canStealFocus) {
+  if (isElementInActiveWindow && allowFrameSwitch && IsWindowVisible(newWindow)) {
     // return if blurring fails or the focus changes during the blur
     if (mFocusedWindow) {
       // if the focus is being moved to another element in the same document,

From effbfd086a086ae79dc5e89cd10b727ed09a0f0c Mon Sep 17 00:00:00 2001
From: Rich Walsh <dragtext@e-vertise.com>
Date: Sun, 2 Aug 2009 14:06:02 +0300
Subject: [PATCH 160/175] Bug 506434 - fix ogg video playback regression, add
 OS/2 part to sydneyaudio patch, r=pweilbacher

---
 media/libsydneyaudio/sydney_os2_base.patch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/media/libsydneyaudio/sydney_os2_base.patch b/media/libsydneyaudio/sydney_os2_base.patch
index 2750a31d72c..a3078274703 100644
--- a/media/libsydneyaudio/sydney_os2_base.patch
+++ b/media/libsydneyaudio/sydney_os2_base.patch
@@ -552,10 +552,12 @@ new file mode 100644
 +  /* keep os2_mixer_event() from reacting to buffer under-runs */
 +  s->state = SAOS2_EXIT;
 +
-+  /* DART won't start playing until 2 buffers have been
-+   * written, so write a dummy 2nd buffer just in case */
-+  memset(buf, 0, sizeof(buf));
-+  sa_stream_write(s, buf, s->nchannels * SAOS2_SAMPLE_SIZE);
++  /* DART won't start playing until 2 buffers have been written,
++   * so write a dummy 2nd buffer if any buffers are in use */
++  if (s->freeCnt < SAOS2_BUF_CNT) {
++    memset(buf, 0, sizeof(buf));
++    sa_stream_write(s, buf, s->nchannels * SAOS2_SAMPLE_SIZE);
++  }
 +
 +  /* write all remaining buffers to the device */
 +  if (s->readyCnt)

From dada0805751ccde995efdc1a5cca22d67aca2710 Mon Sep 17 00:00:00 2001
From: Rich Walsh <dragtext@e-vertise.com>
Date: Sun, 2 Aug 2009 14:06:02 +0300
Subject: [PATCH 161/175] Bug 506434 - fix ogg video playback regression,
 cross-platform change, r=chris.double

---
 content/media/ogg/nsOggDecoder.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/content/media/ogg/nsOggDecoder.cpp b/content/media/ogg/nsOggDecoder.cpp
index 3855ffd10ca..20cd6455bcc 100644
--- a/content/media/ogg/nsOggDecoder.cpp
+++ b/content/media/ogg/nsOggDecoder.cpp
@@ -910,22 +910,16 @@ void nsOggDecodeStateMachine::PlayFrame() {
       }
 
       double time;
-      double prevTime = -1.0;
+      PRUint32 hasAudio = frame->mAudioData.Length();
       for (;;) {
         // Even if the frame has had its audio data written we call
         // PlayAudio to ensure that any data we have buffered in the
         // nsAudioStream is written to the hardware.
         PlayAudio(frame);
-        double hwtime = mAudioStream ? mAudioStream->GetPosition() : -1.0;
+        double hwtime = mAudioStream && hasAudio ? mAudioStream->GetPosition() : -1.0;
         time = hwtime < 0.0 ?
           (TimeStamp::Now() - mPlayStartTime - mPauseDuration).ToSeconds() :
           hwtime;
-        // Break out of the loop if we've not played any audio. This can
-        // happen when the frame has no audio, and there's no audio pending
-        // in the nsAudioStream.
-        if (time == prevTime)
-          break;
-        prevTime = time;
         // Is it time for the next frame?  Using an integer here avoids f.p.
         // rounding errors that can cause multiple 0ms waits (Bug 495352)
         PRInt64 wait = PRInt64((frame->mTime - time)*1000);

From 2d6a49e99b5ea7aa48f8827ecc082536fbcee2af Mon Sep 17 00:00:00 2001
From: Rich Walsh <dragtext@e-vertise.com>
Date: Sun, 2 Aug 2009 14:06:02 +0300
Subject: [PATCH 162/175] Bug 506434 - fix ogg video playback regression, OS/2
 part, r=pweilbacher

---
 media/libsydneyaudio/src/sydney_audio_os2.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/media/libsydneyaudio/src/sydney_audio_os2.c b/media/libsydneyaudio/src/sydney_audio_os2.c
index c3a6f4cb40d..6e768aace7c 100644
--- a/media/libsydneyaudio/src/sydney_audio_os2.c
+++ b/media/libsydneyaudio/src/sydney_audio_os2.c
@@ -555,10 +555,12 @@ int     sa_stream_drain(sa_stream_t *s)
   /* keep os2_mixer_event() from reacting to buffer under-runs */
   s->state = SAOS2_EXIT;
 
-  /* DART won't start playing until 2 buffers have been
-   * written, so write a dummy 2nd buffer just in case */
-  memset(buf, 0, sizeof(buf));
-  sa_stream_write(s, buf, s->nchannels * SAOS2_SAMPLE_SIZE);
+  /* DART won't start playing until 2 buffers have been written,
+   * so write a dummy 2nd buffer if any buffers are in use */
+  if (s->freeCnt < SAOS2_BUF_CNT) {
+    memset(buf, 0, sizeof(buf));
+    sa_stream_write(s, buf, s->nchannels * SAOS2_SAMPLE_SIZE);
+  }
 
   /* write all remaining buffers to the device */
   if (s->readyCnt)

From 6538983820aa74a94448d345ade0bbe8211e9cd4 Mon Sep 17 00:00:00 2001
From: Rich Walsh <dragtext@e-vertise.com>
Date: Sun, 2 Aug 2009 14:06:02 +0300
Subject: [PATCH 163/175] [OS/2] Bug 501618 - fix plugin display (e.g. MPlayer
 plugin, npmp) after child widget removal, r=pweilbacher

---
 widget/src/os2/nsWindow.cpp | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp
index 39a69ccee60..5cd585b0f49 100644
--- a/widget/src/os2/nsWindow.cpp
+++ b/widget/src/os2/nsWindow.cpp
@@ -2035,19 +2035,21 @@ nsWindow::ConfigureChildren(const nsTArray<Configuration>& aConfigurations)
       r.UnionRect(r, rects[i]);
 
     // resize the child;  mBounds.x/y contain the child's correct origin;
-    // r.x/y are always <= zero - adding them to r.width/height produces
-    // the actual clipped width/height this window should have
+    // the sum of r.x/y + r.width/height produces the actual clipped
+    // width/height this window should have - it's only smaller than
+    // normal when part or all the window is scrolled off the right
+    // or bottom side of the parent
     w->Resize(configuration.mBounds.x, configuration.mBounds.y,
-              r.width + r.x, r.height + r.y, PR_TRUE);
+              r.width + r.x, r.height + r.y, PR_FALSE);
 
     // some plugins may shrink their window when the Mozilla widget window
     // shrinks, then fail to reinflate when the widget window reinflates;
     // this ensures the plugin's window is always at its full size and is
-    // clipped correctly by the widget's bounds
+    // positioned so the correct part of the child will be clipped
     HWND hwnd = WinQueryWindow( w->mWnd, QW_TOP);
-    ::WinSetWindowPos(hwnd, 0, 0, 0,
-                      configuration.mBounds.width, configuration.mBounds.height,
-                      SWP_MOVE | SWP_SIZE);
+    WinSetWindowPos(hwnd, 0, 0, r.height + r.y - configuration.mBounds.height,
+                    configuration.mBounds.width, configuration.mBounds.height,
+                    SWP_MOVE | SWP_SIZE);
 
     // show or hide the window, then save the array of rects
     // for future reference
@@ -2108,7 +2110,22 @@ void nsWindow::Scroll(const nsIntPoint& aDelta, const nsIntRect& aSource,
   // fetching it unlocks the screen so it can be updated
   HPS hps = 0;
   CheckDragStatus(ACTION_SCROLL, &hps);
-  ::WinScrollWindow(mWnd, aDelta.x, -aDelta.y, &clip, &clip, NULL, NULL, flags);
+
+  // send a WM_VRNDISABLED to the grandchildren of this window;
+  // if they're plugins that blit directly to the screen, this
+  // will halt their output during the scroll - if they're
+  // anything else, this will have no effect
+  HWND hChild;
+  HENUM hEnum = WinBeginEnumWindows(mWnd);
+  while ((hChild = WinGetNextWindow(hEnum)) != 0) {
+    HWND hGrandChild;
+    if ((hGrandChild = WinQueryWindow(hChild, QW_TOP)) != 0)
+      WinSendMsg(hGrandChild, WM_VRNDISABLED, 0, 0);
+  }
+  WinEndEnumWindows(hEnum);
+
+  // do it
+  WinScrollWindow(mWnd, aDelta.x, -aDelta.y, &clip, &clip, NULL, NULL, flags);
 
   // Now make sure all children actually get positioned, sized, and clipped
   // correctly.  If SW_SCROLLCHILDREN was in effect, they may already be.

From 84fece3f2547acc27c1c6a21be1c9d0f70637b70 Mon Sep 17 00:00:00 2001
From: Peter Weilbacher <mozilla@weilbacher.org>
Date: Sun, 2 Aug 2009 14:06:02 +0300
Subject: [PATCH 164/175] [OS/2] Bug 506997: optimize repainting after window
 moves, r=dragtext

---
 widget/src/os2/nsWindow.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp
index 5cd585b0f49..c1af77ad9de 100644
--- a/widget/src/os2/nsWindow.cpp
+++ b/widget/src/os2/nsWindow.cpp
@@ -103,9 +103,6 @@ static const char *sScreenManagerContractID = "@mozilla.org/gfx/screenmanager;1"
 // NS2PM methods for conversion of points & rectangles; position is a bit
 // different in that it's the *parent* window whose height must be used.
 //
-// Deferred window positioning is emulated using WinSetMultWindowPos in
-// the hopes that there was a good reason for adding it to nsIWidget.
-//
 // SetColorSpace() is not implemented on purpose.  So there.
 //
 // John Fairhurst 17-09-98 first version
@@ -1354,9 +1351,12 @@ NS_METHOD nsWindow::Resize(PRInt32 aX,
          ptl.y = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN) - h - 1 - aY;
       }
 
-      WinSetWindowPos(GetMainWindow(), 0, ptl.x, ptl.y, w, h, SWP_MOVE | SWP_SIZE);
-      if (aRepaint)
-         Invalidate(PR_FALSE);
+      if (!WinSetWindowPos(GetMainWindow(), 0, ptl.x, ptl.y, w, h,
+                           SWP_MOVE | SWP_SIZE)) {
+         if (aRepaint) {
+            Invalidate(PR_FALSE);
+         }
+      }
 
 #if DEBUG_sobotka
       printf("+++++++++++Resized 0x%lx at %ld, %ld to %d x %d (%d,%d)\n",

From 69fe204dbc2dedc16d7c0f1e3c075ffccdca433e Mon Sep 17 00:00:00 2001
From: Peter Weilbacher <mozilla@weilbacher.org>
Date: Sun, 2 Aug 2009 14:08:02 +0300
Subject: [PATCH 165/175] [OS/2] Bug 503744: do not unload MDM to fix MMOS2
 destruction, r=dragtext

---
 widget/src/os2/nsSound.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/widget/src/os2/nsSound.cpp b/widget/src/os2/nsSound.cpp
index c4473b847fd..304d906ec3d 100644
--- a/widget/src/os2/nsSound.cpp
+++ b/widget/src/os2/nsSound.cpp
@@ -70,7 +70,6 @@ NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver)
 static int sInitialized = 0;
 static PRBool sMMPMInstalled = PR_FALSE;
 static HMODULE sHModMMIO = NULLHANDLE;
-static HMODULE sHModMDM = NULLHANDLE;
 
 // function pointer definitions, include underscore (work around redef. warning)
 HMMIO (*APIENTRY _mmioOpen)(PSZ, PMMIOINFO, ULONG);
@@ -100,9 +99,10 @@ static void InitGlobals(void)
 {
   ULONG ulrc = 0;
   char LoadError[CCHMAXPATH];
+  HMODULE hModMDM = NULLHANDLE;
 
   ulrc = DosLoadModule(LoadError, CCHMAXPATH, "MMIO", &sHModMMIO);
-  ulrc += DosLoadModule(LoadError, CCHMAXPATH, "MDM", &sHModMDM);
+  ulrc += DosLoadModule(LoadError, CCHMAXPATH, "MDM", &hModMDM);
   if (ulrc == NO_ERROR) {
 #ifdef DEBUG
     printf("InitGlobals: MMOS2 is installed, both DLLs loaded\n");
@@ -114,12 +114,12 @@ static void InitGlobals(void)
     ulrc += DosQueryProcAddr(sHModMMIO, 0L, "mmioClose", (PFN *)&_mmioClose);
     ulrc += DosQueryProcAddr(sHModMMIO, 0L, "mmioGetFormats", (PFN *)&_mmioGetFormats);
     // mci functions are in MDM.DLL
-    ulrc += DosQueryProcAddr(sHModMDM, 0L, "mciSendCommand", (PFN *)&_mciSendCommand);
+    ulrc += DosQueryProcAddr(hModMDM, 0L, "mciSendCommand", (PFN *)&_mciSendCommand);
 #ifdef DEBUG
     ulrc += DosQueryProcAddr(sHModMMIO, 0L, "mmioGetLastError", (PFN *)&_mmioGetLastError);
     ulrc += DosQueryProcAddr(sHModMMIO, 0L, "mmioQueryFormatCount", (PFN *)&_mmioQueryFormatCount);
     ulrc += DosQueryProcAddr(sHModMMIO, 0L, "mmioGetFormatName", (PFN *)&_mmioGetFormatName);
-    ulrc += DosQueryProcAddr(sHModMDM, 0L, "mciGetErrorString", (PFN *)&_mciGetErrorString);
+    ulrc += DosQueryProcAddr(hModMDM, 0L, "mciGetErrorString", (PFN *)&_mciGetErrorString);
 #endif
 
     ulrc += DosQueryProcAddr(sHModMMIO, 0L, "mmioIniFileHandler", (PFN *)&_mmioIniFileHandler);
@@ -398,7 +398,7 @@ nsSound::~nsSound()
 #endif
     ULONG ulrc;
     ulrc = DosFreeModule(sHModMMIO);
-    ulrc += DosFreeModule(sHModMDM);
+    // do not free MDM.DLL because it doesn't like to be unloaded repeatedly
     if (ulrc != NO_ERROR) {
       NS_WARNING("DosFreeModule did not work");
     }

From ed972bfa6b9bf8a370bda704102efa92efc9e630 Mon Sep 17 00:00:00 2001
From: Peter Weilbacher <mozilla@weilbacher.org>
Date: Sun, 2 Aug 2009 14:08:40 +0300
Subject: [PATCH 166/175] [OS/2] Bug 503744: use the few system sounds that we
 have available on OS/2, r=dragtext

---
 widget/src/os2/nsSound.cpp | 42 +++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/widget/src/os2/nsSound.cpp b/widget/src/os2/nsSound.cpp
index 304d906ec3d..ee48d390462 100644
--- a/widget/src/os2/nsSound.cpp
+++ b/widget/src/os2/nsSound.cpp
@@ -457,14 +457,14 @@ NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
   return NS_OK;
 }
 
-NS_METHOD nsSound::Beep()
+NS_IMETHODIMP nsSound::Beep()
 {
   WinAlarm(HWND_DESKTOP, WA_WARNING);
 
   return NS_OK;
 }
 
-NS_METHOD nsSound::Play(nsIURL *aURL)
+NS_IMETHODIMP nsSound::Play(nsIURL *aURL)
 {
   nsresult rv;
 
@@ -481,18 +481,22 @@ NS_IMETHODIMP nsSound::Init()
 
 NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)
 {
-  // Just beep if MMPM isn't installed.
   if (!sMMPMInstalled) {
-    Beep();
-    return NS_OK;
+    return Beep();
   }
 
   if (NS_IsMozAliasSound(aSoundAlias)) {
     NS_WARNING("nsISound::playSystemSound is called with \"_moz_\" events, they are obsolete, use nsISound::playEventSound instead");
-    // We don't have a default mail sound on OS/2, so just beep.
-    if (aSoundAlias.Equals(NS_SYSSOUND_MAIL_BEEP))
-      Beep();
-    return NS_OK;
+    PRUint32 eventId;
+    if (aSoundAlias.Equals(NS_SYSSOUND_ALERT_DIALOG))
+        eventId = EVENT_ALERT_DIALOG_OPEN;
+    else if (aSoundAlias.Equals(NS_SYSSOUND_CONFIRM_DIALOG))
+        eventId = EVENT_CONFIRM_DIALOG_OPEN;
+    else if (aSoundAlias.Equals(NS_SYSSOUND_MAIL_BEEP))
+        eventId = EVENT_NEW_MAIL_RECEIVED;
+    else
+        return NS_OK;
+    return PlayEventSound(eventId);
   }
   nsCAutoString nativeSoundAlias;
   NS_CopyUnicodeToNative(aSoundAlias, nativeSoundAlias);
@@ -515,11 +519,21 @@ NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)
 
 NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
 {
-  // Just beep if MMPM isn't installed.
-  if (!sMMPMInstalled) {
-    return Beep();
+  // Prompt dialog and select dialog sounds do not correspond to OS/2
+  // system sounds, ignore them. Ignore the menu sounds, too. Try to handle
+  // the rest. Skip the beeps on systems without MMPM, too many of them are
+  // confusing and annoying.
+  switch(aEventId) {
+  case EVENT_NEW_MAIL_RECEIVED:
+    // We don't have a default mail sound on OS/2, so just "beep"
+    return Beep(); // this corresponds to the "Warning" sound
+  case EVENT_ALERT_DIALOG_OPEN:
+    WinAlarm(HWND_DESKTOP, WA_ERROR); // play "Error" sound
+    break;
+  case EVENT_CONFIRM_DIALOG_OPEN:
+    WinAlarm(HWND_DESKTOP, WA_NOTE); // play "Information" sound
+    break;
   }
 
-  // We don't have a default mail sound on OS/2, so just beep.
-  return aEventId == EVENT_NEW_MAIL_RECEIVED ? Beep() : NS_OK;
+  return NS_OK;
 }

From 2ef9c481748a6fe66309eb10e589a21c367f4581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sun, 2 Aug 2009 18:31:24 +0200
Subject: [PATCH 167/175] Bug 507883 - addCookieToHash() creates a useless
 object that will be clobbered right away. r=zeniko

---
 browser/components/sessionstore/src/nsSessionStore.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js
index 958a8838d00..1a9422b5374 100644
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -1594,9 +1594,6 @@ SessionStoreService.prototype = {
         aHash[aHost] = {};
       if (!aHash[aHost][aPath])
         aHash[aHost][aPath] = {};
-      if (!aHash[aHost][aPath][aName])
-        aHash[aHost][aPath][aName] = {};
-
       aHash[aHost][aPath][aName] = aCookie;
     }
 

From e9db04451304acecdd7292edd4622ad420409429 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Sun, 2 Aug 2009 22:23:01 +0430
Subject: [PATCH 168/175] Bug 487656 - zoomed in by default while entering
 Private Browsing; r=dao,mconnor

---
 browser/base/content/browser-textZoom.js      |  29 ++--
 browser/base/content/browser.js               |   5 +-
 .../base/content/test/browser_bug386835.js    |  79 +++++++++-
 .../privatebrowsing/test/browser/Makefile.in  |   1 +
 .../browser_privatebrowsing_zoomrestore.js    | 137 ++++++++++++++++++
 .../components/printing/content/printUtils.js |  13 +-
 6 files changed, 248 insertions(+), 16 deletions(-)
 create mode 100644 browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js

diff --git a/browser/base/content/browser-textZoom.js b/browser/base/content/browser-textZoom.js
index d947ebdd359..9a3246e15e9 100644
--- a/browser/base/content/browser-textZoom.js
+++ b/browser/base/content/browser-textZoom.js
@@ -266,8 +266,19 @@ var FullZoom = {
 
   // location change observer
 
-  onLocationChange: function FullZoom_onLocationChange(aURI, aBrowser) {
-    if (!aURI)
+  /**
+   * Called when the location of a tab changes.
+   * When that happens, we need to update the current zoom level if appropriate.
+   *
+   * @param aURI
+   *        A URI object representing the new location.
+   * @param aIsTabSwitch
+   *        Whether this location change has happened because of a tab switch.
+   * @param aBrowser
+   *        (optional) browser object displaying the document
+   */
+  onLocationChange: function FullZoom_onLocationChange(aURI, aIsTabSwitch, aBrowser) {
+    if (!aURI || (aIsTabSwitch && !this.siteSpecific))
       return;
     this._applyPrefToSetting(this._cps.getPref(aURI, this.name), aBrowser);
   },
@@ -302,11 +313,6 @@ var FullZoom = {
     this._removePref();
   },
 
-  setSettingValue: function FullZoom_setSettingValue() {
-    var value = this._cps.getPref(gBrowser.currentURI, this.name);
-    this._applyPrefToSetting(value);
-  },
-
   /**
    * Set the zoom level for the current tab.
    *
@@ -329,12 +335,13 @@ var FullZoom = {
   _applyPrefToSetting: function FullZoom__applyPrefToSetting(aValue, aBrowser) {
     var browser = aBrowser || gBrowser.selectedBrowser;
 
-    if (!this.siteSpecific || gInPrintPreviewMode ||
-        browser.contentDocument instanceof Ci.nsIImageDocument)
-      return;
+    var resetZoom = (!this.siteSpecific || gInPrintPreviewMode ||
+                     browser.contentDocument instanceof Ci.nsIImageDocument);
 
     try {
-      if (typeof aValue != "undefined")
+      if (resetZoom)
+        ZoomManager.setZoomForBrowser(browser, 1);
+      else if (typeof aValue != "undefined")
         ZoomManager.setZoomForBrowser(browser, this._ensureValid(aValue));
       else if (typeof this.globalValue != "undefined")
         ZoomManager.setZoomForBrowser(browser, this.globalValue);
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index fce6b078c01..b886ea6192d 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2558,7 +2558,6 @@ function onExitPrintPreview()
 {
   // restore chrome to original state
   gInPrintPreviewMode = false;
-  FullZoom.setSettingValue();
   toggleAffectedChrome(false);
 }
 
@@ -4229,7 +4228,7 @@ var XULBrowserWindow = {
   // simulate all change notifications after switching tabs
   onUpdateCurrentBrowser: function (aStateFlags, aStatus, aMessage, aTotalProgress) {
     if (FullZoom.updateBackgroundTabs)
-      FullZoom.onLocationChange(gBrowser.currentURI);
+      FullZoom.onLocationChange(gBrowser.currentURI, true);
     var nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
     var loadingDone = aStateFlags & nsIWebProgressListener.STATE_STOP;
     // use a pseudo-object instead of a (potentially non-existing) channel for getting
@@ -4296,7 +4295,7 @@ var TabsProgressListener = {
   onLocationChange: function (aBrowser, aWebProgress, aRequest, aLocationURI) {
     // Filter out any sub-frame loads
     if (aBrowser.contentWindow == aWebProgress.DOMWindow)
-      FullZoom.onLocationChange(aLocationURI, aBrowser);
+      FullZoom.onLocationChange(aLocationURI, false, aBrowser);
   },
   
   onStatusChange: function (aBrowser, aWebProgress, aRequest, aStatus, aMessage) {
diff --git a/browser/base/content/test/browser_bug386835.js b/browser/base/content/test/browser_bug386835.js
index 17f12925315..5ce3cc5ebf1 100644
--- a/browser/base/content/test/browser_bug386835.js
+++ b/browser/base/content/test/browser_bug386835.js
@@ -2,6 +2,8 @@ var gTestPage = "http://example.org/browser/browser/base/content/test/dummy_page
 var gTestImage = "http://example.org/browser/browser/base/content/test/moz.png";
 var gTab1, gTab2, gTab3;
 var gLevel;
+const kBack = 0;
+const kForward = 1;
 
 function test() {
   waitForExplicitFinish();
@@ -53,10 +55,74 @@ function imageLoaded() {
   gBrowser.selectedTab = gTab1;
   zoomTest(gTab1, 1, "Zoom should still be 1 when tab with image is selected");
 
-  finishTest();
+  executeSoon(imageZoomSwitch);
+}
+
+function imageZoomSwitch() {
+  navigate(kBack, function() {
+    navigate(kForward, function() {
+      zoomTest(gTab1, 1, "Tab 1 should not be zoomed when an image loads");
+      gBrowser.selectedTab = gTab2;
+      zoomTest(gTab1, 1, "Tab 1 should still not be zoomed when deselected");
+
+      // Mac OS X does not support print preview, so skip those tests
+      let isOSX = ("nsILocalFileMac" in Components.interfaces);
+      if (isOSX)
+        finishTest();
+      else
+        runPrintPreviewTests();
+    });
+  });
+}
+
+function runPrintPreviewTests() {
+  // test print preview on image document
+  testPrintPreview(gTab1, function() {
+    // test print preview on HTML document
+    testPrintPreview(gTab2, function() {
+      // test print preview on image document with siteSpecific set to false
+      gPrefService.setBoolPref("browser.zoom.siteSpecific", false);
+      testPrintPreview(gTab1, function() {
+        // test print preview of HTML document with siteSpecific set to false
+        testPrintPreview(gTab2, function() {
+          gPrefService.clearUserPref("browser.zoom.siteSpecific");
+          finishTest();
+        });
+      });
+    });
+  });
+}
+
+function testPrintPreview(aTab, aCallback) {
+  gBrowser.selectedTab = aTab;
+  FullZoom.enlarge();
+  let level = ZoomManager.zoom;
+
+  function onEnterPP() {
+    toggleAffectedChromeOrig.apply(null, arguments);
+
+    function onExitPP() {
+      toggleAffectedChromeOrig.apply(null, arguments);
+      toggleAffectedChrome = toggleAffectedChromeOrig;
+
+      zoomTest(aTab, level, "Toggling print preview mode should not affect zoom level");
+
+      FullZoom.reset();
+      aCallback();
+    }
+    toggleAffectedChrome = onExitPP;
+    PrintUtils.exitPrintPreview();
+  }
+  let toggleAffectedChromeOrig = toggleAffectedChrome;
+  toggleAffectedChrome = onEnterPP;
+
+  let printPreview = new Function(document.getElementById("cmd_printPreview")
+                                          .getAttribute("oncommand"));
+  executeSoon(printPreview);
 }
 
 function finishTest() {
+  gBrowser.selectedTab = gTab1;
   FullZoom.reset();
   gBrowser.removeTab(gTab1);
   FullZoom.reset();
@@ -77,3 +143,14 @@ function load(tab, url, cb) {
   }, true);
   tab.linkedBrowser.loadURI(url);
 }
+
+function navigate(direction, cb) {
+  gBrowser.addEventListener("pageshow", function(event) {
+    gBrowser.removeEventListener("pageshow", arguments.callee, true);
+    setTimeout(cb, 0);
+  }, true);
+  if (direction == kBack)
+    gBrowser.goBack();
+  else if (direction == kForward)
+    gBrowser.goForward();
+}
diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in
index 09488ff47c7..ce41daa48d0 100644
--- a/browser/components/privatebrowsing/test/browser/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/Makefile.in
@@ -51,6 +51,7 @@ _BROWSER_TEST_FILES =  \
 		browser_privatebrowsing_searchbar.js \
 		browser_privatebrowsing_findbar.js \
 		browser_privatebrowsing_zoom.js \
+		browser_privatebrowsing_zoomrestore.js \
 		browser_privatebrowsing_transition.js \
 		browser_privatebrowsing_import.js \
 		browser_privatebrowsing_crh.js \
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js
new file mode 100644
index 00000000000..dd1987dade2
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js
@@ -0,0 +1,137 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This test makes sure that about:privatebrowsing does not appear zoomed in
+// if there is already a zoom site pref for about:blank (bug 487656).
+
+function test() {
+  // initialization
+  let pb = Cc["@mozilla.org/privatebrowsing;1"].
+           getService(Ci.nsIPrivateBrowsingService);
+  let cps = Cc["@mozilla.org/content-pref/service;1"].
+            getService(Ci.nsIContentPrefService);
+  waitForExplicitFinish();
+
+  let tabBlank = gBrowser.selectedTab;
+  gBrowser.removeAllTabsBut(tabBlank);
+
+  let blankBrowser = gBrowser.getBrowserForTab(tabBlank);
+  blankBrowser.addEventListener("load", function() {
+    blankBrowser.removeEventListener("load", arguments.callee, true);
+
+    // change the zoom on the blank page
+    FullZoom.enlarge();
+    isnot(ZoomManager.zoom, 1, "Zoom level for about:blank should be changed");
+
+    // enter private browsing mode
+    pb.privateBrowsingEnabled = true;
+    let tabAboutPB = gBrowser.selectedTab;
+    let browserAboutPB = gBrowser.getBrowserForTab(tabAboutPB);
+    browserAboutPB.addEventListener("load", function() {
+      browserAboutPB.removeEventListener("load", arguments.callee, true);
+      setTimeout(function() {
+        // make sure the zoom level is set to 1
+        is(ZoomManager.zoom, 1, "Zoom level for about:privatebrowsing should be reset");
+
+        // Mac OS X does not support print preview, so skip those tests
+        let isOSX = ("nsILocalFileMac" in Components.interfaces);
+        if (isOSX) {
+          finishTest();
+          return;
+        }
+
+        // test print preview on HTML document
+        testPrintPreview(browserAboutPB, function() {
+          browserAboutPB.addEventListener("load", function() {
+            browserAboutPB.removeEventListener("load", arguments.callee, true);
+
+            // test print preview on image document
+            testPrintPreview(browserAboutPB, finishTest);
+          }, true);
+          browserAboutPB.loadURI("about:logo");
+        });
+      }, 0);
+    }, true);
+  }, true);
+  blankBrowser.loadURI("about:blank");
+}
+
+function finishTest() {
+  let pb = Cc["@mozilla.org/privatebrowsing;1"].
+           getService(Ci.nsIPrivateBrowsingService);
+  // leave private browsing mode
+  pb.privateBrowsingEnabled = false;
+  let tabBlank = gBrowser.selectedTab;
+  let blankBrowser = gBrowser.getBrowserForTab(tabBlank);
+  blankBrowser.addEventListener("load", function() {
+    blankBrowser.removeEventListener("load", arguments.callee, true);
+
+    executeSoon(function() {
+      // cleanup
+      FullZoom.reset();
+      finish();
+    });
+  }, true);
+}
+
+function testPrintPreview(aBrowser, aCallback) {
+  FullZoom.enlarge();
+  let level = ZoomManager.getZoomForBrowser(aBrowser);
+
+  function onEnterPP(aHide) {
+    toggleAffectedChromeOrig(aHide);
+
+    function onExitPP(aHide) {
+      toggleAffectedChromeOrig(aHide);
+      toggleAffectedChrome = toggleAffectedChromeOrig;
+
+      is(ZoomManager.getZoomForBrowser(aBrowser), level,
+         "Toggling print preview mode should not affect zoom level");
+
+      FullZoom.reset();
+      aCallback();
+    }
+    toggleAffectedChrome = onExitPP;
+    PrintUtils.exitPrintPreview();
+  }
+  let toggleAffectedChromeOrig = toggleAffectedChrome;
+  toggleAffectedChrome = onEnterPP;
+
+  let printPreview = new Function(document.getElementById("cmd_printPreview")
+                                          .getAttribute("oncommand"));
+  executeSoon(printPreview);
+}
diff --git a/toolkit/components/printing/content/printUtils.js b/toolkit/components/printing/content/printUtils.js
index 352587f2a5d..ba79da78533 100644
--- a/toolkit/components/printing/content/printUtils.js
+++ b/toolkit/components/printing/content/printUtils.js
@@ -190,6 +190,7 @@ var PrintUtils = {
     return printSettings;
   },
 
+  _originalZoomValue: null,
   _closeHandlerPP: null,
   _webProgressPP: null,
   _onEnterPP: null,
@@ -218,11 +219,19 @@ var PrintUtils = {
   {
     gFocusedElement = document.commandDispatcher.focusedElement;
 
+    // Reset the zoom value and save it to be restored later.
+    if (typeof ZoomManager == "object") {
+      this._originalZoomValue = ZoomManager.zoom;
+      ZoomManager.reset();
+    }
+
     var webBrowserPrint = this.getWebBrowserPrint(aWindow);
     var printSettings   = this.getPrintSettings();
     try {
       webBrowserPrint.printPreview(printSettings, null, this._webProgressPP.value);
     } catch (e) {
+      if (typeof ZoomManager == "object")
+        ZoomManager.zoom = this._originalZoomValue;
       // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
       // causing an exception to be thrown which we catch here.
       // Unfortunately this will also consume helpful failures, so add a
@@ -280,7 +289,9 @@ var PrintUtils = {
     this._closeHandlerPP = null;
 
     var webBrowserPrint = this.getWebBrowserPrint(aWindow);
-    webBrowserPrint.exitPrintPreview(); 
+    webBrowserPrint.exitPrintPreview();
+    if (typeof ZoomManager == "object")
+      ZoomManager.zoom = this._originalZoomValue;
 
     // remove the print preview toolbar
     var printPreviewTB = document.getElementById("print-preview-toolbar");

From 4b8b52791df2f3c9955175f3e66ff6afc069810a Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Sun, 2 Aug 2009 22:23:04 +0430
Subject: [PATCH 169/175] Bug 496595 - Privacy leak in "remember for this site"
 permission of geolocation - persists outside of private browsing; r=mconnor

---
 browser/components/nsBrowserGlue.js           | 24 +++--
 .../privatebrowsing/test/browser/Makefile.in  |  2 +
 .../browser_privatebrowsing_geoprompt.js      | 96 +++++++++++++++++++
 ...rowser_privatebrowsing_geoprompt_page.html | 13 +++
 4 files changed, 127 insertions(+), 8 deletions(-)
 create mode 100644 browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt.js
 create mode 100644 browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 6d49a79adc4..77edfebd1b9 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1117,8 +1117,9 @@ GeolocationPrompt.prototype = {
       var buttons = [{
               label: browserBundle.GetStringFromName("geolocation.shareLocation"),
               accessKey: browserBundle.GetStringFromName("geolocation.shareLocation.accesskey"),
-              callback: function(notification) {                  
-                  if (notification.getElementsByClassName("rememberChoice")[0].checked)
+              callback: function(notification) {
+                  var elements = notification.getElementsByClassName("rememberChoice");
+                  if (elements.length && elements[0].checked)
                       setPagePermission(request.requestingURI, true);
                   request.allow(); 
               },
@@ -1127,7 +1128,8 @@ GeolocationPrompt.prototype = {
               label: browserBundle.GetStringFromName("geolocation.dontShareLocation"),
               accessKey: browserBundle.GetStringFromName("geolocation.dontShareLocation.accesskey"),
               callback: function(notification) {
-                  if (notification.getElementsByClassName("rememberChoice")[0].checked)
+                  var elements = notification.getElementsByClassName("rememberChoice");
+                  if (elements.length && elements[0].checked)
                       setPagePermission(request.requestingURI, false);
                   request.cancel();
               },
@@ -1148,11 +1150,17 @@ GeolocationPrompt.prototype = {
       // bar.
       function geolocation_hacks_to_notification () {
 
-        var checkbox = newBar.ownerDocument.createElementNS(XULNS, "checkbox");
-        checkbox.className = "rememberChoice";
-        checkbox.setAttribute("label", browserBundle.GetStringFromName("geolocation.remember"));
-        checkbox.setAttribute("accesskey", browserBundle.GetStringFromName("geolocation.remember.accesskey"));
-        newBar.appendChild(checkbox);
+        // Never show a remember checkbox inside the private browsing mode
+        var inPrivateBrowsing = Cc["@mozilla.org/privatebrowsing;1"].
+                                getService(Ci.nsIPrivateBrowsingService).
+                                privateBrowsingEnabled;
+        if (!inPrivateBrowsing) {
+          var checkbox = newBar.ownerDocument.createElementNS(XULNS, "checkbox");
+          checkbox.className = "rememberChoice";
+          checkbox.setAttribute("label", browserBundle.GetStringFromName("geolocation.remember"));
+          checkbox.setAttribute("accesskey", browserBundle.GetStringFromName("geolocation.remember.accesskey"));
+          newBar.appendChild(checkbox);
+        }
 
         var link = newBar.ownerDocument.createElementNS(XULNS, "label");
         link.className = "text-link";
diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in
index ce41daa48d0..11f6f26e48d 100644
--- a/browser/components/privatebrowsing/test/browser/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/Makefile.in
@@ -62,6 +62,8 @@ _BROWSER_TEST_FILES =  \
 		browser_privatebrowsing_pageinfo.js \
 		browser_privatebrowsing_sslsite_transition.js \
 		browser_privatebrowsing_popupmode.js \
+		browser_privatebrowsing_geoprompt.js \
+		browser_privatebrowsing_geoprompt_page.html \
 		$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt.js
new file mode 100644
index 00000000000..82abe577ae6
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt.js
@@ -0,0 +1,96 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This test makes sure that the geolocation prompt does not show a remember
+// control inside the private browsing mode.
+
+function test() {
+  // initialization
+  let pb = Cc["@mozilla.org/privatebrowsing;1"].
+           getService(Ci.nsIPrivateBrowsingService);
+
+  const testPageURL = "http://localhost:8888/browser/" +
+    "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html";
+  waitForExplicitFinish();
+
+  let pageTab = gBrowser.addTab();
+  gBrowser.selectedTab = pageTab;
+  let pageBrowser = gBrowser.getBrowserForTab(pageTab);
+  pageBrowser.addEventListener("load", function () {
+    pageBrowser.removeEventListener("load", arguments.callee, true);
+
+    setTimeout(function() {
+      // Make sure the notification is correctly displayed with a remember control
+      let notificationBox = gBrowser.getNotificationBox(pageBrowser);
+      let notification = notificationBox.getNotificationWithValue("geolocation");
+      ok(notification, "Notification box should be displaying outside of private browsing mode");
+      is(notification.getElementsByClassName("rememberChoice").length, 1,
+         "The remember control must be displayed outside of private browsing mode");
+      notificationBox.currentNotification.close();
+
+      gBrowser.removeTab(pageTab);
+
+      // enter the private browsing mode
+      pb.privateBrowsingEnabled = true;
+
+      pageTab = gBrowser.addTab();
+      gBrowser.selectedTab = pageTab;
+      pageBrowser = gBrowser.getBrowserForTab(pageTab);
+      pageBrowser.addEventListener("load", function () {
+        pageBrowser.removeEventListener("load", arguments.callee, true);
+
+        setTimeout(function() {
+          // Make sure the notification is correctly displayed without a remember control
+          let notificationBox = gBrowser.getNotificationBox(pageBrowser);
+          let notification = notificationBox.getNotificationWithValue("geolocation");
+          ok(notification, "Notification box should be displaying outside of private browsing mode");
+          is(notification.getElementsByClassName("rememberChoice").length, 0,
+             "The remember control must not be displayed inside of private browsing mode");
+          notificationBox.currentNotification.close();
+
+          gBrowser.removeTab(pageTab);
+
+          // cleanup
+          pb.privateBrowsingEnabled = false;
+          finish();
+        }, 100); // remember control is added in a setTimeout(0) call
+      }, true);
+      pageBrowser.contentWindow.location = testPageURL;
+    }, 100); // remember control is added in a setTimeout(0) call
+  }, true);
+  pageBrowser.contentWindow.location = testPageURL;
+}
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html
new file mode 100644
index 00000000000..36d5e3ceccf
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+  <head>
+    <title>Geolocation invoker</title>
+  </head>
+  <body>
+    <script type="text/javascript">
+      navigator.geolocation.getCurrentPosition(function (pos) {
+        // ignore
+      });
+    </script>
+  </body>
+</html>

From 69c72dca295b3310929cf91f5662690c72efffd6 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Sun, 2 Aug 2009 22:23:08 +0430
Subject: [PATCH 170/175] Bug 496123 - the last download directory from private
 browsing persists as the initial directory for the filepicker after stopping
 private browsing; r=mconnor

---
 browser/base/content/browser.js               |  37 ++++-
 .../privatebrowsing/test/browser/Makefile.in  |   1 +
 .../browser_privatebrowsing_opendir.js        | 142 ++++++++++++++++++
 3 files changed, 179 insertions(+), 1 deletion(-)
 create mode 100644 browser/components/privatebrowsing/test/browser/browser_privatebrowsing_opendir.js

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index b886ea6192d..1466b42dc4f 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1840,6 +1840,35 @@ function delayedOpenTab(aUrl, aReferrer, aCharset, aPostData, aAllowThirdPartyFi
   gBrowser.loadOneTab(aUrl, aReferrer, aCharset, aPostData, false, aAllowThirdPartyFixup);
 }
 
+var gLastOpenDirectory = {
+  _lastDir: null,
+  get path() {
+    if (!this._lastDir || !this._lastDir.exists()) {
+      try {
+        this._lastDir = gPrefService.getComplexValue("browser.open.lastDir",
+                                                     Ci.nsILocalFile);
+        if (!this._lastDir.exists())
+          this._lastDir = null;
+      }
+      catch(e) {}
+    }
+    return this._lastDir;
+  },
+  set path(val) {
+    if (!val || !val.exists() || !val.isDirectory())
+      return;
+    this._lastDir = val.clone();
+
+    // Don't save the last open directory pref inside the Private Browsing mode
+    if (!gPrivateBrowsingUI.privateBrowsingEnabled)
+      gPrefService.setComplexValue("browser.open.lastDir", Ci.nsILocalFile,
+                                   this._lastDir);
+  },
+  reset: function() {
+    this._lastDir = null;
+  }
+};
+
 function BrowserOpenFileWindow()
 {
   // Get filepicker component.
@@ -1849,9 +1878,13 @@ function BrowserOpenFileWindow()
     fp.init(window, gNavigatorBundle.getString("openFile"), nsIFilePicker.modeOpen);
     fp.appendFilters(nsIFilePicker.filterAll | nsIFilePicker.filterText | nsIFilePicker.filterImages |
                      nsIFilePicker.filterXML | nsIFilePicker.filterHTML);
+    fp.displayDirectory = gLastOpenDirectory.path;
 
-    if (fp.show() == nsIFilePicker.returnOK)
+    if (fp.show() == nsIFilePicker.returnOK) {
+      if (fp.file && fp.file.exists())
+        gLastOpenDirectory.path = fp.file.parent.QueryInterface(Ci.nsILocalFile);
       openTopWin(fp.fileURL.spec);
+    }
   } catch (ex) {
   }
 }
@@ -6966,6 +6999,8 @@ let gPrivateBrowsingUI = {
             .removeAttribute("disabled");
 
     this._privateBrowsingAutoStarted = false;
+
+    gLastOpenDirectory.reset();
   },
 
   _setPBMenuTitle: function PBUI__setPBMenuTitle(aMode) {
diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in
index 11f6f26e48d..f65cfec2f97 100644
--- a/browser/components/privatebrowsing/test/browser/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/Makefile.in
@@ -64,6 +64,7 @@ _BROWSER_TEST_FILES =  \
 		browser_privatebrowsing_popupmode.js \
 		browser_privatebrowsing_geoprompt.js \
 		browser_privatebrowsing_geoprompt_page.html \
+		browser_privatebrowsing_opendir.js \
 		$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_opendir.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_opendir.js
new file mode 100644
index 00000000000..cb83edf610f
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_opendir.js
@@ -0,0 +1,142 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This test makes sure that the last open directory used inside the private
+// browsing mode is not remembered after leaving that mode.
+
+function test() {
+  // initialization
+  let pb = Cc["@mozilla.org/privatebrowsing;1"].
+           getService(Ci.nsIPrivateBrowsingService);
+  let ds = Cc["@mozilla.org/file/directory_service;1"].
+           getService(Ci.nsIProperties);
+  let dir1 = ds.get("ProfD", Ci.nsIFile);
+  let dir2 = ds.get("TmpD", Ci.nsIFile);
+  let file = dir2.clone();
+  file.append("pbtest.file");
+  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0600);
+
+  const kPrefName = "browser.open.lastDir";
+
+  function setupCleanSlate() {
+    gLastOpenDirectory.reset();
+    gPrefService.clearUserPref(kPrefName);
+  }
+
+  setupCleanSlate();
+
+  // Test 1: general workflow test
+
+  // initial checks
+  ok(!gLastOpenDirectory.path,
+     "Last open directory path should be initially empty");
+  gLastOpenDirectory.path = dir2;
+  is(gLastOpenDirectory.path.path, dir2.path,
+     "The path should be successfully set");
+  gLastOpenDirectory.path = null;
+  is(gLastOpenDirectory.path.path, dir2.path,
+     "The path should be not change when assigning it to null");
+  gLastOpenDirectory.path = dir1;
+  is(gLastOpenDirectory.path.path, dir1.path,
+     "The path should be successfully outside of the private browsing mode");
+
+  // enter private browsing mode
+  pb.privateBrowsingEnabled = true;
+
+  is(gLastOpenDirectory.path.path, dir1.path,
+     "The path should not change when entering the private browsing mode");
+  gLastOpenDirectory.path = dir2;
+  is(gLastOpenDirectory.path.path, dir2.path,
+     "The path should successfully change inside the private browsing mode");
+
+  // leave private browsing mode
+  pb.privateBrowsingEnabled = false;
+
+  is(gLastOpenDirectory.path.path, dir1.path,
+     "The path should be reset to the same path as before entering the private browsing mode");
+
+  setupCleanSlate();
+
+  // Test 2: the user first tries to open a file inside the private browsing mode
+
+  pb.privateBrowsingEnabled = true;
+  ok(!gLastOpenDirectory.path,
+     "No original path should exist inside the private browsing mode");
+  gLastOpenDirectory.path = dir1;
+  is(gLastOpenDirectory.path.path, dir1.path, 
+     "The path should be successfully set inside the private browsing mode");
+  pb.privateBrowsingEnabled = false;
+  ok(!gLastOpenDirectory.path,
+     "The path set inside the private browsing mode should not leak when leaving that mode");
+
+  setupCleanSlate();
+
+  // Test 3: the last open directory is set from a previous session, it should be used
+  // in normal mode
+
+  gPrefService.setComplexValue(kPrefName, Ci.nsILocalFile, dir1);
+  is(gLastOpenDirectory.path.path, dir1.path,
+     "The pref set from last session should take effect outside the private browsing mode");
+
+  setupCleanSlate();
+
+  // Test 4: the last open directory is set from a previous session, it should be used
+  // in private browsing mode mode
+
+  gPrefService.setComplexValue(kPrefName, Ci.nsILocalFile, dir1);
+  pb.privateBrowsingEnabled = true;
+  is(gLastOpenDirectory.path.path, dir1.path,
+     "The pref set from last session should take effect inside the private browsing mode");
+  pb.privateBrowsingEnabled = false;
+  is(gLastOpenDirectory.path.path, dir1.path,
+     "The pref set from last session should remain in effect after leaving the private browsing mode");
+
+  setupCleanSlate();
+
+  // Test 5: setting the path to a file shouldn't work
+
+  gLastOpenDirectory.path = file;
+  ok(!gLastOpenDirectory.path,
+     "Setting the path to a file shouldn't work when it's originally null");
+  gLastOpenDirectory.path = dir1;
+  gLastOpenDirectory.path = file;
+  is(gLastOpenDirectory.path.path, dir1.path,
+     "Setting the path to a file shouldn't work when it's not originally null");
+
+  // cleanup
+  file.remove(false);
+}

From 00d5e982a9e84295d3a2aff5ac273fa1ac415ca7 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Sun, 2 Aug 2009 22:23:10 +0430
Subject: [PATCH 171/175] Bug 495999 - Paused download label shown in status
 bar when leaving PB with active downloads; r=mconnor

---
 browser/base/content/browser.js               |  15 ++
 .../privatebrowsing/test/browser/Makefile.in  |   2 +
 ...browser_privatebrowsing_downloadmonitor.js | 168 ++++++++++++++++++
 .../privatebrowsing/test/browser/staller.sjs  |  55 ++++++
 4 files changed, 240 insertions(+)
 create mode 100644 browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadmonitor.js
 create mode 100644 browser/components/privatebrowsing/test/browser/staller.sjs

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 1466b42dc4f..e03e58eaf10 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6754,10 +6754,17 @@ let DownloadMonitorPanel = {
       gDownloadMgr.removeListener(this);
   },
 
+  inited: function DMP_inited() {
+    return this._panel != null;
+  },
+
   /**
    * Update status based on the number of active and paused downloads
    */
   updateStatus: function DMP_updateStatus() {
+    if (!this.inited())
+      return;
+
     let numActive = gDownloadMgr.activeDownloadCount;
 
     // Hide the panel and reset the "last time" if there's no downloads
@@ -6965,6 +6972,10 @@ let gPrivateBrowsingUI = {
         docElement.getAttribute("titlemodifier_privatebrowsing"));
       docElement.setAttribute("browsingmode", "private");
     }
+
+    setTimeout(function () {
+      DownloadMonitorPanel.updateStatus();
+    }, 0);
   },
 
   onExitPrivateBrowsing: function PBUI_onExitPrivateBrowsing() {
@@ -7001,6 +7012,10 @@ let gPrivateBrowsingUI = {
     this._privateBrowsingAutoStarted = false;
 
     gLastOpenDirectory.reset();
+
+    setTimeout(function () {
+      DownloadMonitorPanel.updateStatus();
+    }, 0);
   },
 
   _setPBMenuTitle: function PBUI__setPBMenuTitle(aMode) {
diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in
index f65cfec2f97..fa9f3e5d5d8 100644
--- a/browser/components/privatebrowsing/test/browser/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/Makefile.in
@@ -65,6 +65,8 @@ _BROWSER_TEST_FILES =  \
 		browser_privatebrowsing_geoprompt.js \
 		browser_privatebrowsing_geoprompt_page.html \
 		browser_privatebrowsing_opendir.js \
+		browser_privatebrowsing_downloadmonitor.js \
+		staller.sjs \
 		$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadmonitor.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadmonitor.js
new file mode 100644
index 00000000000..74f79197b5f
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadmonitor.js
@@ -0,0 +1,168 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This test makes sure that the download monitor status bar panel is correctly
+// cleared when switching the private browsing mode on or off.
+
+function test() {
+  // initialization
+  let pb = Cc["@mozilla.org/privatebrowsing;1"].
+           getService(Ci.nsIPrivateBrowsingService);
+  let dm = Cc["@mozilla.org/download-manager;1"].
+           getService(Ci.nsIDownloadManager);
+  if (!gDownloadMgr)
+    gDownloadMgr = dm;
+  let iosvc = Cc["@mozilla.org/network/io-service;1"].
+              getService(Ci.nsIIOService);
+  let panel = document.getElementById("download-monitor");
+  waitForExplicitFinish();
+
+  // Add a new download
+  addDownload(dm, {
+    resultFileName: "pbtest-1",
+    downloadName: "PB Test 1"
+  });
+
+  // Make sure that the download is being displayed in the monitor panel
+  if (!DownloadMonitorPanel.inited())
+    DownloadMonitorPanel.init();
+  else
+    DownloadMonitorPanel.updateStatus();
+  ok(!panel.hidden, "The download panel should be successfully added initially");
+
+  // Enter the private browsing mode
+  pb.privateBrowsingEnabled = true;
+
+  setTimeout(function () {
+    ok(panel.hidden, "The download panel should be hidden when entering the private browsing mode");
+
+    // Add a new download
+    let file = addDownload(dm, {
+      resultFileName: "pbtest-2",
+      downloadName: "PB Test 2"
+    }).targetFile;
+
+    // Update the panel
+    DownloadMonitorPanel.updateStatus();
+
+    // Make sure that the panel is visible
+    ok(!panel.hidden, "The download panel should show up when a new download is added");
+
+    // Exit the private browsing mode
+    pb.privateBrowsingEnabled = false;
+
+    setTimeout(function () {
+      ok(panel.hidden, "The download panel should be hidden when leaving the private browsing mode");
+
+      // cleanup
+      let dls = dm.activeDownloads;
+      while (dls.hasMoreElements()) {
+        let dl = dls.getNext().QueryInterface(Ci.nsIDownload);
+        dm.removeDownload(dl.id);
+        let file = dl.targetFile;
+        if (file.exists())
+          file.remove(false);
+      }
+      if (file.exists())
+        file.remove(false);
+
+      finish();
+    }, 0);
+  }, 0);
+}
+
+/**
+ * Adds a download to the DM, and starts it.
+ * (Copied from toolkit/componentns/downloads/test/unit/head_download_manager.js)
+ * @param aParams (optional): an optional object which contains the function
+ *                            parameters:
+ *                              resultFileName: leaf node for the target file
+ *                              targetFile: nsIFile for the target (overrides resultFileName)
+ *                              sourceURI: the download source URI
+ *                              downloadName: the display name of the download
+ *                              runBeforeStart: a function to run before starting the download
+ */
+function addDownload(dm, aParams)
+{
+  if (!aParams)
+    aParams = {};
+  if (!("resultFileName" in aParams))
+    aParams.resultFileName = "download.result";
+  if (!("targetFile" in aParams)) {
+    let dirSvc = Cc["@mozilla.org/file/directory_service;1"].
+                 getService(Ci.nsIProperties);
+    aParams.targetFile = dirSvc.get("ProfD", Ci.nsIFile);
+    aParams.targetFile.append(aParams.resultFileName);
+  }
+  if (!("sourceURI" in aParams))
+    aParams.sourceURI = "http://localhost:8888/browser/browser/components/privatebrowsing/test/browser/staller.sjs";
+  if (!("downloadName" in aParams))
+    aParams.downloadName = null;
+  if (!("runBeforeStart" in aParams))
+    aParams.runBeforeStart = function () {};
+
+  const nsIWBP = Ci.nsIWebBrowserPersist;
+  let persist = Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
+                .createInstance(Ci.nsIWebBrowserPersist);
+  persist.persistFlags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES |
+                         nsIWBP.PERSIST_FLAGS_BYPASS_CACHE |
+                         nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
+
+  let dl = dm.addDownload(Ci.nsIDownloadManager.DOWNLOAD_TYPE_DOWNLOAD,
+                          createURI(aParams.sourceURI),
+                          createURI(aParams.targetFile), aParams.downloadName, null,
+                          Math.round(Date.now() * 1000), null, persist);
+
+  // This will throw if it isn't found, and that would mean test failure, so no
+  // try catch block
+  let test = dm.getDownload(dl.id);
+
+  aParams.runBeforeStart.call(undefined, dl);
+
+  persist.progressListener = dl.QueryInterface(Ci.nsIWebProgressListener);
+  persist.saveURI(dl.source, null, null, null, null, dl.targetFile);
+
+  return dl;
+}
+
+function createURI(aObj)
+{
+  let ios = Cc["@mozilla.org/network/io-service;1"].
+            getService(Ci.nsIIOService);
+  return (aObj instanceof Ci.nsIFile) ? ios.newFileURI(aObj) :
+                                        ios.newURI(aObj, null, null);
+}
diff --git a/browser/components/privatebrowsing/test/browser/staller.sjs b/browser/components/privatebrowsing/test/browser/staller.sjs
new file mode 100644
index 00000000000..32dae372eaf
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/staller.sjs
@@ -0,0 +1,55 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This provides the tests with a download URL which never finishes.
+
+function handleRequest(request, response) {
+  response.setStatusLine(request.httpVersion, 200, "OK");
+  response.processAsync();
+
+  function stall() {
+    response.write("stalling...\n");
+  }
+
+  response.setHeader("Content-Type", "text/plain", false);
+  stall();
+
+  const nsITimer = Components.interfaces.nsITimer;
+  var timer = Components.classes["@mozilla.org/timer;1"]
+                        .createInstance(nsITimer);
+  timer.initWithCallback(stall, 500, nsITimer.TYPE_REPEATING_SLACK);
+}

From 67ba72ddf5195c35d3bd5a5934d175e43738a697 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Sun, 2 Aug 2009 22:23:14 +0430
Subject: [PATCH 172/175] Bug 461627 - Hide the UI for saving certificate
 exceptions permanently in Private Browsing mode (test); r=mconnor

---
 .../privatebrowsing/test/browser/Makefile.in  |   1 +
 ...rowser_privatebrowsing_certexceptionsui.js | 137 ++++++++++++++++++
 .../pki/resources/content/exceptionDialog.js  |   5 +
 3 files changed, 143 insertions(+)
 create mode 100644 browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js

diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in
index fa9f3e5d5d8..aed03d8195d 100644
--- a/browser/components/privatebrowsing/test/browser/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/Makefile.in
@@ -67,6 +67,7 @@ _BROWSER_TEST_FILES =  \
 		browser_privatebrowsing_opendir.js \
 		browser_privatebrowsing_downloadmonitor.js \
 		staller.sjs \
+		browser_privatebrowsing_certexceptionsui.js \
 		$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js
new file mode 100644
index 00000000000..1bfcc757835
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js
@@ -0,0 +1,137 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This test makes sure that certificate exceptions UI behaves correctly
+// inside the private browsing mode, based on whether it's opened from the prefs
+// window or from the SSL error page (see bug 461627).
+
+function test() {
+  // initialization
+  let pb = Cc["@mozilla.org/privatebrowsing;1"].
+           getService(Ci.nsIPrivateBrowsingService);
+  let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
+           getService(Ci.nsIWindowWatcher);
+
+  const EXCEPTIONS_DLG_URL = 'chrome://pippki/content/exceptionDialog.xul';
+  const EXCEPTIONS_DLG_FEATURES = 'chrome,centerscreen,modal';
+  const INVALID_CERT_LOCATION = 'https://nocert.example.com/';
+  waitForExplicitFinish();
+
+  // enter private browsing mode
+  pb.privateBrowsingEnabled = true;
+
+  let testCheckbox;
+  let obs = {
+      observe: function(aSubject, aTopic, aData) {
+          // unregister ourself
+          ww.unregisterNotification(this);
+
+          let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
+          win.addEventListener("load", function() {
+              win.removeEventListener("load", arguments.callee, false);
+              testCheckbox(win.document.defaultView);
+          }, false);
+      }
+  };
+
+  step1();
+
+  // Test the certificate exceptions dialog as it is invoked from about:certerror
+  function step1() {
+    ww.registerNotification(obs);
+    let params = {
+      exceptionAdded : false,
+      location: INVALID_CERT_LOCATION,
+      handlePrivateBrowsing : true,
+      prefetchCert: true,
+    };
+    testCheckbox = function(win) {
+      let obsSvc = Cc["@mozilla.org/observer-service;1"].
+                   getService(Ci.nsIObserverService);
+      obsSvc.addObserver({
+        observe: function(aSubject, aTopic, aData) {
+          obsSvc.removeObserver(this, "cert-exception-ui-ready", false);
+          ok(win.gCert, "The certificate information should be available now");
+
+          let checkbox = win.document.getElementById("permanent");
+          ok(checkbox.hasAttribute("disabled"),
+            "the permanent checkbox should be disabled when handling the private browsing mode");
+          ok(!checkbox.hasAttribute("checked"),
+            "the permanent checkbox should not be checked when handling the private browsing mode");
+          win.close();
+          step2();
+        }
+      }, "cert-exception-ui-ready", false);
+    };
+    window.openDialog(EXCEPTIONS_DLG_URL, '', EXCEPTIONS_DLG_FEATURES, params);
+  }
+
+  // Test the certificate excetions dialog as it is invoked from the Preferences dialog
+  function step2() {
+    ww.registerNotification(obs);
+    let params = {
+      exceptionAdded : false,
+      location: INVALID_CERT_LOCATION,
+      prefetchCert: true,
+    };
+    testCheckbox = function(win) {
+      let obsSvc = Cc["@mozilla.org/observer-service;1"].
+                   getService(Ci.nsIObserverService);
+      obsSvc.addObserver({
+        observe: function(aSubject, aTopic, aData) {
+          obsSvc.removeObserver(this, "cert-exception-ui-ready", false);
+          ok(win.gCert, "The certificate information should be available now");
+
+          let checkbox = win.document.getElementById("permanent");
+          ok(!checkbox.hasAttribute("disabled"),
+            "the permanent checkbox should not be disabled when not handling the private browsing mode");
+          ok(checkbox.hasAttribute("checked"),
+            "the permanent checkbox should be checked when not handling the private browsing mode");
+          win.close();
+          cleanup();
+        }
+      }, "cert-exception-ui-ready", false);
+    };
+    window.openDialog(EXCEPTIONS_DLG_URL, '', EXCEPTIONS_DLG_FEATURES, params);
+  }
+
+  function cleanup() {
+    // leave the private browsing mode
+    pb.privateBrowsingEnabled = false;
+    finish();
+  }
+}
diff --git a/security/manager/pki/resources/content/exceptionDialog.js b/security/manager/pki/resources/content/exceptionDialog.js
index ae36f0ad4ef..4e5ebfef75d 100644
--- a/security/manager/pki/resources/content/exceptionDialog.js
+++ b/security/manager/pki/resources/content/exceptionDialog.js
@@ -306,6 +306,11 @@ function updateCertStatus() {
     }
     
     document.getElementById("viewCertButton").disabled = false;
+
+    // Notify observers about the availability of the certificate
+    Components.classes["@mozilla.org/observer-service;1"]
+              .getService(Components.interfaces.nsIObserverService)
+              .notifyObservers(null, "cert-exception-ui-ready", null);
   }
   else if (gChecking) {
     shortDesc = "addExceptionCheckingShort";

From ac44d89a8f24b2c119323b556e91df5ddeffabd9 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Sun, 2 Aug 2009 22:23:17 +0430
Subject: [PATCH 173/175] Bug 462639 - Handle view-source windows in Private
 Browsing mode; r=mconnor

---
 .../src/nsPrivateBrowsingService.js           |  41 ++++
 .../privatebrowsing/test/browser/Makefile.in  |   1 +
 .../browser_privatebrowsing_viewsource.js     | 197 ++++++++++++++++++
 3 files changed, 239 insertions(+)
 create mode 100644 browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js

diff --git a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js b/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
index e10e032feb0..acd68ab7b9e 100644
--- a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
+++ b/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
@@ -123,6 +123,9 @@ PrivateBrowsingService.prototype = {
   // Whether the private browsing mode has been started automatically
   _autoStarted: false,
 
+  // List of view source window URIs for restoring later
+  _viewSrcURLs: [],
+
   // XPCOM registration
   classDescription: "PrivateBrowsing Service",
   contractID: "@mozilla.org/privatebrowsing;1",
@@ -177,6 +180,22 @@ PrivateBrowsingService.prototype = {
 
       this._closePageInfoWindows();
 
+      // save view-source windows URIs and close them
+      let viewSrcWindowsEnum = Cc["@mozilla.org/appshell/window-mediator;1"].
+                               getService(Ci.nsIWindowMediator).
+                               getEnumerator("navigator:view-source");
+      while (viewSrcWindowsEnum.hasMoreElements()) {
+        let win = viewSrcWindowsEnum.getNext();
+        if (this._inPrivateBrowsing) {
+          let plainURL = win.getBrowser().currentURI.spec;
+          if (plainURL.indexOf("view-source:") == 0) {
+            plainURL = plainURL.substr(12);
+            this._viewSrcURLs.push(plainURL);
+          }
+        }
+        win.close();
+      }
+
       if (!this._quitting && this._saveSession) {
         let browserWindow = this._getBrowserWindow();
 
@@ -215,6 +234,28 @@ PrivateBrowsingService.prototype = {
         this._savedBrowserState = null;
 
         this._closePageInfoWindows();
+
+        // re-open all view-source windows
+        let windowWatcher = Cc["@mozilla.org/embedcomp/window-watcher;1"].
+                            getService(Ci.nsIWindowWatcher);
+        this._viewSrcURLs.forEach(function(uri) {
+          let args = Cc["@mozilla.org/supports-array;1"].
+                     createInstance(Ci.nsISupportsArray);
+          let str = Cc["@mozilla.org/supports-string;1"].
+                    createInstance(Ci.nsISupportsString);
+          str.data = uri;
+          args.AppendElement(str);
+          args.AppendElement(null); // charset
+          args.AppendElement(null); // page descriptor
+          args.AppendElement(null); // line number
+          let forcedCharset = Cc["@mozilla.org/supports-PRBool;1"].
+                              createInstance(Ci.nsISupportsPRBool);
+          forcedCharset.data = false;
+          args.AppendElement(forcedCharset);
+          windowWatcher.openWindow(null, "chrome://global/content/viewSource.xul",
+            "_blank", "all,dialog=no", args);
+        });
+        this._viewSrcURLs = [];
       }
       else {
         // otherwise, if we have transitioned into private browsing mode, load
diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in
index aed03d8195d..a944fc68449 100644
--- a/browser/components/privatebrowsing/test/browser/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/Makefile.in
@@ -68,6 +68,7 @@ _BROWSER_TEST_FILES =  \
 		browser_privatebrowsing_downloadmonitor.js \
 		staller.sjs \
 		browser_privatebrowsing_certexceptionsui.js \
+		browser_privatebrowsing_viewsource.js \
 		$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js
new file mode 100644
index 00000000000..c61efc95df8
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js
@@ -0,0 +1,197 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This test makes sure that entering the private browsing mode closes
+// all view source windows, and leaving it restores them
+
+function test() {
+  // initialization
+  let pb = Cc["@mozilla.org/privatebrowsing;1"].
+           getService(Ci.nsIPrivateBrowsingService);
+
+  waitForExplicitFinish();
+
+  let tabAbout = gBrowser.addTab();
+  gBrowser.selectedTab = tabAbout;
+  let aboutBrowser = gBrowser.getBrowserForTab(tabAbout);
+  aboutBrowser.addEventListener("load", function () {
+    aboutBrowser.removeEventListener("load", arguments.callee, true);
+
+    let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
+             getService(Ci.nsIWindowWatcher);
+    let observer = {
+      observe: function(aSubject, aTopic, aData) {
+        if (aTopic == "domwindowopened") {
+          ww.unregisterNotification(this);
+
+          let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
+          win.addEventListener("load", function() {
+            win.removeEventListener("load", arguments.callee, false);
+
+            let browser = win.document.defaultView.getBrowser();
+            browser.addEventListener("load", function() {
+              browser.removeEventListener("load", arguments.callee, true);
+              
+              // view source window is loaded, proceed with the rest of the test
+              step1();
+            }, true);
+          }, false);
+        }
+      }
+    };
+    ww.registerNotification(observer);
+
+    openViewSource();
+
+    function openViewSource() {
+      // invoke the View Source command
+      let event = document.createEvent("Events");
+      event.initEvent("command", true, true);
+      document.getElementById("View:PageSource").dispatchEvent(event);
+    }
+
+    function step1() {
+      observer = {
+        observe: function(aSubject, aTopic, aData) {
+          if (aTopic == "domwindowclosed") {
+            ok(true, "Entering the private browsing mode should close the view source window");
+            ww.unregisterNotification(observer);
+
+            step2();
+          }
+          else if (aTopic == "domwindowopened")
+            ok(false, "Entering the private browsing mode should not open any view source window");
+        }
+      };
+      ww.registerNotification(observer);
+
+      gBrowser.addTabsProgressListener({
+        onLocationChange: function() {},
+        onProgressChange: function() {},
+        onSecurityChange: function() {},
+        onStatusChange: function() {},
+        onRefreshAttempted: function() {},
+        onLinkIconAvailable: function() {},
+        onStateChange: function(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
+          if (aStateFlags & (Ci.nsIWebProgressListener.STATE_STOP |
+                             Ci.nsIWebProgressListener.STATE_IS_WINDOW)) {
+            gBrowser.removeTabsProgressListener(this);
+
+            step3();
+          }
+        }
+      });
+
+      // enter private browsing mode
+      pb.privateBrowsingEnabled = true;
+    }
+
+    let events = 0, step2, step3;
+    step2 = step3 = function() {
+      if (++events == 2)
+        step4();
+    }
+
+    function step4() {
+      observer = {
+        observe: function(aSubject, aTopic, aData) {
+          if (aTopic == "domwindowopened") {
+            ww.unregisterNotification(this);
+
+            let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
+            win.addEventListener("load", function() {
+              win.removeEventListener("load", arguments.callee, false);
+
+              let browser = win.document.defaultView.getBrowser();
+              browser.addEventListener("load", function() {
+                browser.removeEventListener("load", arguments.callee, true);
+                
+                // view source window inside private browsing mode opened
+                step5();
+              }, true);
+            }, false);
+          }
+        }
+      };
+      ww.registerNotification(observer);
+
+      openViewSource();
+    }
+
+    function step5() {
+      let events = 0;
+
+      observer = {
+        observe: function(aSubject, aTopic, aData) {
+          if (aTopic == "domwindowclosed") {
+            ok(true, "Leaving the private browsing mode should close the existing view source window");
+            if (++events == 2)
+              ww.unregisterNotification(observer);
+          }
+          else if (aTopic == "domwindowopened") {
+            ok(true, "Leaving the private browsing mode should restore the previous view source window");
+            if (++events == 2)
+              ww.unregisterNotification(observer);
+
+            let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
+            win.addEventListener("load", function() {
+              win.removeEventListener("load", arguments.callee, false);
+
+              let browser = win.document.defaultView.getBrowser();
+              browser.addEventListener("load", function() {
+                browser.removeEventListener("load", arguments.callee, true);
+                
+                is(browser.currentURI.spec, "view-source:about:",
+                  "The correct view source window should be restored");
+
+                // cleanup
+                win.close();
+                gBrowser.removeTab(gBrowser.selectedTab);
+                finish();
+              }, true);
+            }, false);
+          }
+        }
+      };
+      ww.registerNotification(observer);
+
+      // exit private browsing mode
+      pb.privateBrowsingEnabled = false;
+    }
+  }, true);
+  aboutBrowser.loadURI("about:");
+}

From eb62c143c1b2401ffcd118e088a99c5271d9dbc1 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Sun, 2 Aug 2009 22:23:19 +0430
Subject: [PATCH 174/175] Bug 506126 - globalOverlay.js is full of caller-less
 functions; r=enndeakin

---
 toolkit/content/globalOverlay.js           | 22 ----------------------
 toolkit/obsolete/content/globalOverlay.xul | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/toolkit/content/globalOverlay.js b/toolkit/content/globalOverlay.js
index 677b548b37b..1703b3a007e 100644
--- a/toolkit/content/globalOverlay.js
+++ b/toolkit/content/globalOverlay.js
@@ -178,11 +178,6 @@ function visitLink(aEvent) {
     protocolSvc.loadUrl(uri);
 }
 
-function isValidLeftClick(aEvent, aName)
-{
-  return (aEvent.button == 0 && aEvent.originalTarget.localName == aName);
-}
-
 function setTooltipText(aID, aTooltipText)
 {
   var element = document.getElementById(aID);
@@ -190,23 +185,6 @@ function setTooltipText(aID, aTooltipText)
     element.setAttribute("tooltiptext", aTooltipText);
 }
 
-function FillInTooltip ( tipElement )
-{
-  var retVal = false;
-  var textNode = document.getElementById("TOOLTIP-tooltipText");
-  if (textNode) {
-    while (textNode.hasChildNodes())
-      textNode.removeChild(textNode.firstChild);
-    var tipText = tipElement.getAttribute("tooltiptext");
-    if (tipText) {
-      var node = document.createTextNode(tipText);
-      textNode.appendChild(node);
-      retVal = true;
-    }
-  }
-  return retVal;
-}
-
 __defineGetter__("NS_ASSERT", function() {
   delete this.NS_ASSERT;
   var tmpScope = {};
diff --git a/toolkit/obsolete/content/globalOverlay.xul b/toolkit/obsolete/content/globalOverlay.xul
index a44f79f7c86..6b37b808f3a 100644
--- a/toolkit/obsolete/content/globalOverlay.xul
+++ b/toolkit/obsolete/content/globalOverlay.xul
@@ -4,6 +4,26 @@
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript"><![CDATA[
+
+    function FillInTooltip ( tipElement )
+    {
+      var retVal = false;
+      var textNode = document.getElementById("TOOLTIP-tooltipText");
+      if (textNode) {
+        while (textNode.hasChildNodes())
+          textNode.removeChild(textNode.firstChild);
+        var tipText = tipElement.getAttribute("tooltiptext");
+        if (tipText) {
+          var node = document.createTextNode(tipText);
+          textNode.appendChild(node);
+          retVal = true;
+        }
+      }
+      return retVal;
+    }
+
+  ]]></script>
 
   <popupset id="aTooltipSet">
     <popup id="aTooltip" class="tooltip" onpopupshowing="return FillInTooltip(document.tooltipNode);" > 

From ce0a154a0d4d64bd7a28cbd8d57665c819358350 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Sun, 2 Aug 2009 22:25:44 +0430
Subject: [PATCH 175/175] Sort the private browsing browser-chrome test files
 alphabetically

---
 .../privatebrowsing/test/browser/Makefile.in  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in
index a944fc68449..b0090ef21e1 100644
--- a/browser/components/privatebrowsing/test/browser/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/Makefile.in
@@ -45,30 +45,30 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES =  \
-		browser_privatebrowsing_ui.js \
 		browser_console_clear.js \
-		browser_privatebrowsing_theming.js \
-		browser_privatebrowsing_searchbar.js \
-		browser_privatebrowsing_findbar.js \
-		browser_privatebrowsing_zoom.js \
-		browser_privatebrowsing_zoomrestore.js \
-		browser_privatebrowsing_transition.js \
-		browser_privatebrowsing_import.js \
+		browser_privatebrowsing_certexceptionsui.js \
 		browser_privatebrowsing_crh.js \
-		browser_privatebrowsing_windowtitle.js \
-		browser_privatebrowsing_windowtitle_page.html \
-		browser_privatebrowsing_urlbarfocus.js \
+		browser_privatebrowsing_downloadmonitor.js \
+		browser_privatebrowsing_findbar.js \
 		browser_privatebrowsing_forgetthissite.js \
-		browser_privatebrowsing_pageinfo.js \
-		browser_privatebrowsing_sslsite_transition.js \
-		browser_privatebrowsing_popupmode.js \
 		browser_privatebrowsing_geoprompt.js \
 		browser_privatebrowsing_geoprompt_page.html \
+		browser_privatebrowsing_import.js \
 		browser_privatebrowsing_opendir.js \
-		browser_privatebrowsing_downloadmonitor.js \
-		staller.sjs \
-		browser_privatebrowsing_certexceptionsui.js \
+		browser_privatebrowsing_pageinfo.js \
+		browser_privatebrowsing_popupmode.js \
+		browser_privatebrowsing_searchbar.js \
+		browser_privatebrowsing_sslsite_transition.js \
+		browser_privatebrowsing_theming.js \
+		browser_privatebrowsing_transition.js \
+		browser_privatebrowsing_ui.js \
+		browser_privatebrowsing_urlbarfocus.js \
 		browser_privatebrowsing_viewsource.js \
+		browser_privatebrowsing_windowtitle.js \
+		browser_privatebrowsing_windowtitle_page.html \
+		browser_privatebrowsing_zoom.js \
+		browser_privatebrowsing_zoomrestore.js \
+		staller.sjs \
 		$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)