diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 0982fde2f08..f0d26de1cb9 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -174,7 +174,6 @@
 @BINPATH@/components/dom_css.xpt
 @BINPATH@/components/dom_devicestorage.xpt
 @BINPATH@/components/dom_events.xpt
-@BINPATH@/components/dom_file.xpt
 @BINPATH@/components/dom_geolocation.xpt
 @BINPATH@/components/dom_media.xpt
 @BINPATH@/components/dom_network.xpt
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 97ca8b1334c..b5e1a02206d 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -197,7 +197,6 @@
 @BINPATH@/components/dom_css.xpt
 @BINPATH@/components/dom_devicestorage.xpt
 @BINPATH@/components/dom_events.xpt
-@BINPATH@/components/dom_file.xpt
 @BINPATH@/components/dom_geolocation.xpt
 @BINPATH@/components/dom_media.xpt
 @BINPATH@/components/dom_network.xpt
diff --git a/content/base/src/FragmentOrElement.cpp b/content/base/src/FragmentOrElement.cpp
index 7410b4dd936..4adb9e29db2 100644
--- a/content/base/src/FragmentOrElement.cpp
+++ b/content/base/src/FragmentOrElement.cpp
@@ -2361,20 +2361,21 @@ StartElement(Element* aContent, StringBuilder& aBuilder)
       continue;
     }
     
+    aBuilder.Append(" ");
+
     if (MOZ_LIKELY(attNs == kNameSpaceID_None) ||
         (attNs == kNameSpaceID_XMLNS &&
          attName == nsGkAtoms::xmlns)) {
-      aBuilder.Append(" ");
+      // Nothing else required
     } else if (attNs == kNameSpaceID_XML) {
-      aBuilder.Append(" xml:");
+      aBuilder.Append("xml:");
     } else if (attNs == kNameSpaceID_XMLNS) {
-      aBuilder.Append(" xmlns:");
+      aBuilder.Append("xmlns:");
     } else if (attNs == kNameSpaceID_XLink) {
-      aBuilder.Append(" xlink:");
+      aBuilder.Append("xlink:");
     } else {
       nsIAtom* prefix = name->GetPrefix();
       if (prefix) {
-        aBuilder.Append(" ");
         aBuilder.Append(prefix);
         aBuilder.Append(":");
       }
diff --git a/content/base/test/test_bug744830.html b/content/base/test/test_bug744830.html
index 4430f658719..7152b052c4c 100644
--- a/content/base/test/test_bug744830.html
+++ b/content/base/test/test_bug744830.html
@@ -88,6 +88,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=744830
   t.firstChild.textContent = "1&2<3>4\xA0";
   is(t.innerHTML, '<style>1&2<3>4\xA0\u003C/style>');
 
+  t.innerHTML = null;
+  t.appendChild(document.createElement("span"));
+  t.firstChild.setAttributeNS("ext", "attr", "foo");
+  t.firstChild.textContent = "1&2<3>4\xA0";
+  is(t.innerHTML, '<span attr="foo">1&amp;2&lt;3&gt;4&nbsp;\u003C/span>');
+
   t.innerHTML = null;
   t.appendChild(document.createElementNS("http://www.w3.org/2000/svg", "svg"));
   is(t.firstChild.namespaceURI, "http://www.w3.org/2000/svg");
diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp
index 0a37f9d166e..4dbf89d4216 100755
--- a/content/canvas/src/CanvasRenderingContext2D.cpp
+++ b/content/canvas/src/CanvasRenderingContext2D.cpp
@@ -94,6 +94,7 @@
 #include "nsGlobalWindow.h"
 #include "GLContext.h"
 #include "GLContextProvider.h"
+#include "SVGContentUtils.h"
 
 #undef free // apparently defined by some windows header, clashing with a free()
             // method in SkTypes.h
@@ -857,7 +858,7 @@ CanvasRenderingContext2D::EnsureTarget()
 
         SkiaGLGlue* glue = gfxPlatform::GetPlatform()->GetSkiaGLGlue();
 
-        if (glue) {
+        if (glue && glue->GetGrContext() && glue->GetGLContext()) {
           mTarget = Factory::CreateDrawTargetSkiaWithGrContext(glue->GetGrContext(), size, format);
           if (mTarget) {
             mStream = gfx::SurfaceStream::CreateForType(SurfaceStreamType::TripleBuffer, glue->GetGLContext());
@@ -4362,6 +4363,18 @@ CanvasPath::Constructor(const GlobalObject& aGlobal, CanvasPath& aCanvasPath, Er
   return path.forget();
 }
 
+already_AddRefed<CanvasPath>
+CanvasPath::Constructor(const GlobalObject& aGlobal, const nsAString& aPathString, ErrorResult& aRv)
+{
+  RefPtr<gfx::Path> tempPath = SVGContentUtils::GetPath(aPathString);
+  if (!tempPath) {
+    return Constructor(aGlobal, aRv);
+  }
+
+  nsRefPtr<CanvasPath> path = new CanvasPath(aGlobal.GetAsSupports(), tempPath->CopyToBuilder());
+  return path.forget();
+}
+
 void
 CanvasPath::ClosePath()
 {
diff --git a/content/canvas/src/CanvasRenderingContext2D.h b/content/canvas/src/CanvasRenderingContext2D.h
index 9503884aa79..594899677ef 100644
--- a/content/canvas/src/CanvasRenderingContext2D.h
+++ b/content/canvas/src/CanvasRenderingContext2D.h
@@ -61,6 +61,9 @@ public:
   static already_AddRefed<CanvasPath> Constructor(const GlobalObject& aGlobal,
                                                   CanvasPath& aCanvasPath,
                                                   ErrorResult& rv);
+  static already_AddRefed<CanvasPath> Constructor(const GlobalObject& aGlobal,
+                                                  const nsAString& aPathString,
+                                                  ErrorResult& rv);
 
   void ClosePath();
   void MoveTo(double x, double y);
diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build
index b5b5489b14c..d103574501b 100644
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -97,6 +97,7 @@ FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
+    '/content/svg/content/src',
     '/content/xul/content/src',
     '/dom/base',
     '/image/src',
diff --git a/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html b/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
index 2ca9a342427..2eaa38e133f 100644
--- a/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
+++ b/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>WebGL cross-origin textures test</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
@@ -64,7 +63,7 @@
     image.src = url;
   }
 
-  MochiKit.DOM.addLoadEvent(function () {
+  addLoadEvent(function () {
     var canvas = document.getElementById("canvas");
     gl = canvas.getContext("experimental-webgl");
     if (!gl) {
diff --git a/content/canvas/test/test_2d.clip.winding.html b/content/canvas/test/test_2d.clip.winding.html
index 1dca69d2807..10303fe3f01 100644
--- a/content/canvas/test/test_2d.clip.winding.html
+++ b/content/canvas/test/test_2d.clip.winding.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.clip.winding</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.color-burn.html b/content/canvas/test/test_2d.composite.canvas.color-burn.html
index 194d16309de..7639eb2156d 100644
--- a/content/canvas/test/test_2d.composite.canvas.color-burn.html
+++ b/content/canvas/test/test_2d.composite.canvas.color-burn.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.color-dodge.html b/content/canvas/test/test_2d.composite.canvas.color-dodge.html
index 56c1b60ee17..13330c0fad8 100644
--- a/content/canvas/test/test_2d.composite.canvas.color-dodge.html
+++ b/content/canvas/test/test_2d.composite.canvas.color-dodge.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.color.html b/content/canvas/test/test_2d.composite.canvas.color.html
index c7fa8b29b2c..048da5d5f02 100644
--- a/content/canvas/test/test_2d.composite.canvas.color.html
+++ b/content/canvas/test/test_2d.composite.canvas.color.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.darken.html b/content/canvas/test/test_2d.composite.canvas.darken.html
index b03e25683f6..9af5a44457d 100644
--- a/content/canvas/test/test_2d.composite.canvas.darken.html
+++ b/content/canvas/test/test_2d.composite.canvas.darken.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.destination-atop.html b/content/canvas/test/test_2d.composite.canvas.destination-atop.html
index c5b6cca95e6..ee05a6e7371 100644
--- a/content/canvas/test/test_2d.composite.canvas.destination-atop.html
+++ b/content/canvas/test/test_2d.composite.canvas.destination-atop.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.destination-atop</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.destination-in.html b/content/canvas/test/test_2d.composite.canvas.destination-in.html
index af8e6b8c444..2bccfe49d0f 100644
--- a/content/canvas/test/test_2d.composite.canvas.destination-in.html
+++ b/content/canvas/test/test_2d.composite.canvas.destination-in.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.destination-in</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.difference.html b/content/canvas/test/test_2d.composite.canvas.difference.html
index 63e8eb64518..c8ce4bf5806 100644
--- a/content/canvas/test/test_2d.composite.canvas.difference.html
+++ b/content/canvas/test/test_2d.composite.canvas.difference.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.exclusion.html b/content/canvas/test/test_2d.composite.canvas.exclusion.html
index 8c45f57bec1..dd90d56d0e2 100644
--- a/content/canvas/test/test_2d.composite.canvas.exclusion.html
+++ b/content/canvas/test/test_2d.composite.canvas.exclusion.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.hard-light.html b/content/canvas/test/test_2d.composite.canvas.hard-light.html
index dc34ae80570..bd533ba5b9a 100644
--- a/content/canvas/test/test_2d.composite.canvas.hard-light.html
+++ b/content/canvas/test/test_2d.composite.canvas.hard-light.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.hue.html b/content/canvas/test/test_2d.composite.canvas.hue.html
index 95d981299f7..0c49aaf9744 100644
--- a/content/canvas/test/test_2d.composite.canvas.hue.html
+++ b/content/canvas/test/test_2d.composite.canvas.hue.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.lighten.html b/content/canvas/test/test_2d.composite.canvas.lighten.html
index ca065650de9..7620970cfe8 100644
--- a/content/canvas/test/test_2d.composite.canvas.lighten.html
+++ b/content/canvas/test/test_2d.composite.canvas.lighten.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.lighter.html b/content/canvas/test/test_2d.composite.canvas.lighter.html
index 8d625b8b20d..0748bdde4da 100644
--- a/content/canvas/test/test_2d.composite.canvas.lighter.html
+++ b/content/canvas/test/test_2d.composite.canvas.lighter.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.luminosity.html b/content/canvas/test/test_2d.composite.canvas.luminosity.html
index 09f3219f751..169bd2b5c10 100644
--- a/content/canvas/test/test_2d.composite.canvas.luminosity.html
+++ b/content/canvas/test/test_2d.composite.canvas.luminosity.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.multiply.html b/content/canvas/test/test_2d.composite.canvas.multiply.html
index 994a2dac6d4..4a1fccdfb03 100644
--- a/content/canvas/test/test_2d.composite.canvas.multiply.html
+++ b/content/canvas/test/test_2d.composite.canvas.multiply.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.overlay.html b/content/canvas/test/test_2d.composite.canvas.overlay.html
index a5c80656a2a..c3eaaa7819f 100644
--- a/content/canvas/test/test_2d.composite.canvas.overlay.html
+++ b/content/canvas/test/test_2d.composite.canvas.overlay.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.saturation.html b/content/canvas/test/test_2d.composite.canvas.saturation.html
index c750055cb8e..cd1e61fb9bb 100644
--- a/content/canvas/test/test_2d.composite.canvas.saturation.html
+++ b/content/canvas/test/test_2d.composite.canvas.saturation.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.screen.html b/content/canvas/test/test_2d.composite.canvas.screen.html
index 693d8b7908b..919d0d5011b 100644
--- a/content/canvas/test/test_2d.composite.canvas.screen.html
+++ b/content/canvas/test/test_2d.composite.canvas.screen.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.soft-light.html b/content/canvas/test/test_2d.composite.canvas.soft-light.html
index c7fa8b29b2c..048da5d5f02 100644
--- a/content/canvas/test/test_2d.composite.canvas.soft-light.html
+++ b/content/canvas/test/test_2d.composite.canvas.soft-light.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.source-in.html b/content/canvas/test/test_2d.composite.canvas.source-in.html
index f425bc24dc7..30ebe67bd4c 100644
--- a/content/canvas/test/test_2d.composite.canvas.source-in.html
+++ b/content/canvas/test/test_2d.composite.canvas.source-in.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.source-in</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.source-out.html b/content/canvas/test/test_2d.composite.canvas.source-out.html
index b5899bfc94f..1048f820cb1 100644
--- a/content/canvas/test/test_2d.composite.canvas.source-out.html
+++ b/content/canvas/test/test_2d.composite.canvas.source-out.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.source-out</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.canvas.xor.html b/content/canvas/test/test_2d.composite.canvas.xor.html
index c7fa8b29b2c..048da5d5f02 100644
--- a/content/canvas/test/test_2d.composite.canvas.xor.html
+++ b/content/canvas/test/test_2d.composite.canvas.xor.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.clip.lighter.html b/content/canvas/test/test_2d.composite.clip.lighter.html
index 6ab0a654b45..ede6dadf65a 100644
--- a/content/canvas/test/test_2d.composite.clip.lighter.html
+++ b/content/canvas/test/test_2d.composite.clip.lighter.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.clip.lighter</title>
 <!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.clip.xor.html b/content/canvas/test/test_2d.composite.clip.xor.html
index ea57f2cdb0f..84ec8c65a2c 100644
--- a/content/canvas/test/test_2d.composite.clip.xor.html
+++ b/content/canvas/test/test_2d.composite.clip.xor.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.clip.xor</title>
 <!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.image.destination-atop.html b/content/canvas/test/test_2d.composite.image.destination-atop.html
index a1417a0fca7..798383060fc 100644
--- a/content/canvas/test/test_2d.composite.image.destination-atop.html
+++ b/content/canvas/test/test_2d.composite.image.destination-atop.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.image.destination-atop</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.image.destination-in.html b/content/canvas/test/test_2d.composite.image.destination-in.html
index e2874175d65..d0fed661d17 100644
--- a/content/canvas/test/test_2d.composite.image.destination-in.html
+++ b/content/canvas/test/test_2d.composite.image.destination-in.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.image.destination-in</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.image.lighter.html b/content/canvas/test/test_2d.composite.image.lighter.html
index feb62e01138..0d9c9e34eb1 100644
--- a/content/canvas/test/test_2d.composite.image.lighter.html
+++ b/content/canvas/test/test_2d.composite.image.lighter.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.image.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.image.source-in.html b/content/canvas/test/test_2d.composite.image.source-in.html
index 955a39e3246..e87c89c36bd 100644
--- a/content/canvas/test/test_2d.composite.image.source-in.html
+++ b/content/canvas/test/test_2d.composite.image.source-in.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.image.source-in</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.image.source-out.html b/content/canvas/test/test_2d.composite.image.source-out.html
index 7b8fa11acc6..27249939a9f 100644
--- a/content/canvas/test/test_2d.composite.image.source-out.html
+++ b/content/canvas/test/test_2d.composite.image.source-out.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.image.source-out</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.image.xor.html b/content/canvas/test/test_2d.composite.image.xor.html
index c5b208bd1d5..c3d6ee34978 100644
--- a/content/canvas/test/test_2d.composite.image.xor.html
+++ b/content/canvas/test/test_2d.composite.image.xor.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.image.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.color-burn.html b/content/canvas/test/test_2d.composite.solid.color-burn.html
index 0611551a193..902858ed933 100644
--- a/content/canvas/test/test_2d.composite.solid.color-burn.html
+++ b/content/canvas/test/test_2d.composite.solid.color-burn.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.color-dodge.html b/content/canvas/test/test_2d.composite.solid.color-dodge.html
index f19eada968f..dd2008ee9fe 100644
--- a/content/canvas/test/test_2d.composite.solid.color-dodge.html
+++ b/content/canvas/test/test_2d.composite.solid.color-dodge.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.color.html b/content/canvas/test/test_2d.composite.solid.color.html
index dff43b318cf..6becadbaa42 100644
--- a/content/canvas/test/test_2d.composite.solid.color.html
+++ b/content/canvas/test/test_2d.composite.solid.color.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.darken.html b/content/canvas/test/test_2d.composite.solid.darken.html
index d9bd097f4c9..88c281ba888 100644
--- a/content/canvas/test/test_2d.composite.solid.darken.html
+++ b/content/canvas/test/test_2d.composite.solid.darken.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.difference.html b/content/canvas/test/test_2d.composite.solid.difference.html
index 72d64e9d771..202d27a7736 100644
--- a/content/canvas/test/test_2d.composite.solid.difference.html
+++ b/content/canvas/test/test_2d.composite.solid.difference.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.exclusion.html b/content/canvas/test/test_2d.composite.solid.exclusion.html
index 748f55b7775..3c07e68e9cd 100644
--- a/content/canvas/test/test_2d.composite.solid.exclusion.html
+++ b/content/canvas/test/test_2d.composite.solid.exclusion.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.hard-light.html b/content/canvas/test/test_2d.composite.solid.hard-light.html
index 909991008cd..36648dc0b86 100644
--- a/content/canvas/test/test_2d.composite.solid.hard-light.html
+++ b/content/canvas/test/test_2d.composite.solid.hard-light.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.hue.html b/content/canvas/test/test_2d.composite.solid.hue.html
index 382aa68b663..c531fe328de 100644
--- a/content/canvas/test/test_2d.composite.solid.hue.html
+++ b/content/canvas/test/test_2d.composite.solid.hue.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.lighten.html b/content/canvas/test/test_2d.composite.solid.lighten.html
index b4968138837..ced8d2abd92 100644
--- a/content/canvas/test/test_2d.composite.solid.lighten.html
+++ b/content/canvas/test/test_2d.composite.solid.lighten.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.lighter.html b/content/canvas/test/test_2d.composite.solid.lighter.html
index 0f601e3a362..00f33a8b6aa 100644
--- a/content/canvas/test/test_2d.composite.solid.lighter.html
+++ b/content/canvas/test/test_2d.composite.solid.lighter.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.luminosity.html b/content/canvas/test/test_2d.composite.solid.luminosity.html
index d2fcdccc4fb..ccb4eea8b36 100644
--- a/content/canvas/test/test_2d.composite.solid.luminosity.html
+++ b/content/canvas/test/test_2d.composite.solid.luminosity.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.multiply.html b/content/canvas/test/test_2d.composite.solid.multiply.html
index 097ab4a3f53..cd09000b347 100644
--- a/content/canvas/test/test_2d.composite.solid.multiply.html
+++ b/content/canvas/test/test_2d.composite.solid.multiply.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.overlay.html b/content/canvas/test/test_2d.composite.solid.overlay.html
index a425fb9ca58..1037636af53 100644
--- a/content/canvas/test/test_2d.composite.solid.overlay.html
+++ b/content/canvas/test/test_2d.composite.solid.overlay.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.saturation.html b/content/canvas/test/test_2d.composite.solid.saturation.html
index fbc00d85108..7c10313504f 100644
--- a/content/canvas/test/test_2d.composite.solid.saturation.html
+++ b/content/canvas/test/test_2d.composite.solid.saturation.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.screen.html b/content/canvas/test/test_2d.composite.solid.screen.html
index 0deb79f2569..71da5859ec4 100644
--- a/content/canvas/test/test_2d.composite.solid.screen.html
+++ b/content/canvas/test/test_2d.composite.solid.screen.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.soft-light.html b/content/canvas/test/test_2d.composite.solid.soft-light.html
index aaded9204bc..b2ef4982b1c 100644
--- a/content/canvas/test/test_2d.composite.solid.soft-light.html
+++ b/content/canvas/test/test_2d.composite.solid.soft-light.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.solid.xor.html b/content/canvas/test/test_2d.composite.solid.xor.html
index c2c3655c4ce..1c545bba60a 100644
--- a/content/canvas/test/test_2d.composite.solid.xor.html
+++ b/content/canvas/test/test_2d.composite.solid.xor.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.solid.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.transparent.lighter.html b/content/canvas/test/test_2d.composite.transparent.lighter.html
index 483acf5d51a..2529475c425 100644
--- a/content/canvas/test/test_2d.composite.transparent.lighter.html
+++ b/content/canvas/test/test_2d.composite.transparent.lighter.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.transparent.lighter</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.transparent.xor.html b/content/canvas/test/test_2d.composite.transparent.xor.html
index c0cdc06e0ba..779875f293a 100644
--- a/content/canvas/test/test_2d.composite.transparent.xor.html
+++ b/content/canvas/test/test_2d.composite.transparent.xor.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.transparent.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.color-burn.html b/content/canvas/test/test_2d.composite.uncovered.fill.color-burn.html
index 22aa29400df..45697da2af1 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.color-burn.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.color-burn.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html b/content/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html
index db88c44baea..ef985545916 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.color.html b/content/canvas/test/test_2d.composite.uncovered.fill.color.html
index 8043dad3b28..6354b2a7fb1 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.color.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.color.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.darken.html b/content/canvas/test/test_2d.composite.uncovered.fill.darken.html
index 8f22d5c5469..5513e7dea85 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.darken.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.darken.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html b/content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html
index 9f300384f1d..da78d2123a5 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.destination-atop</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html b/content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html
index 5c450e21cf8..5bca1f0c48c 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.destination-in</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.difference.html b/content/canvas/test/test_2d.composite.uncovered.fill.difference.html
index 48c7ff0df08..4393dedbf62 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.difference.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.difference.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.exclusion.html b/content/canvas/test/test_2d.composite.uncovered.fill.exclusion.html
index 6c796244801..745f0978b89 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.exclusion.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.exclusion.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.hard-light.html b/content/canvas/test/test_2d.composite.uncovered.fill.hard-light.html
index 10ee8e53e48..7d6eade4574 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.hard-light.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.hard-light.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.hue.html b/content/canvas/test/test_2d.composite.uncovered.fill.hue.html
index d1fbaf3d2e4..7c529ffb5b8 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.hue.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.hue.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.lighten.html b/content/canvas/test/test_2d.composite.uncovered.fill.lighten.html
index 0daa770b159..8f80beab239 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.lighten.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.lighten.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.luminosity.html b/content/canvas/test/test_2d.composite.uncovered.fill.luminosity.html
index 46fba975da5..1676106409a 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.luminosity.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.luminosity.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.multiply.html b/content/canvas/test/test_2d.composite.uncovered.fill.multiply.html
index 968e2b1fc57..f47df241643 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.multiply.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.multiply.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.overlay.html b/content/canvas/test/test_2d.composite.uncovered.fill.overlay.html
index d12534ec486..d93a2311fe5 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.overlay.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.overlay.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.saturation.html b/content/canvas/test/test_2d.composite.uncovered.fill.saturation.html
index 69099dce756..af7bd229038 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.saturation.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.saturation.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.screen.html b/content/canvas/test/test_2d.composite.uncovered.fill.screen.html
index 97e1e930eb3..56b1ec04674 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.screen.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.screen.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.soft-light.html b/content/canvas/test/test_2d.composite.uncovered.fill.soft-light.html
index 6e82a750ed9..8cbf1b6df00 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.soft-light.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.soft-light.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.source-in.html b/content/canvas/test/test_2d.composite.uncovered.fill.source-in.html
index e166052c16e..fb1a04a6433 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.source-in.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.source-in.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-in</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.source-out.html b/content/canvas/test/test_2d.composite.uncovered.fill.source-out.html
index 9a149908af8..af2782a84bb 100644
--- a/content/canvas/test/test_2d.composite.uncovered.fill.source-out.html
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.source-out.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
 <!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html b/content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html
index 7a2f2eecac5..df2efaf182d 100644
--- a/content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html
+++ b/content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.pattern.destination-atop</title>
 <!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html b/content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html
index fbd2e305303..2431688f46a 100644
--- a/content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html
+++ b/content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.pattern.destination-in</title>
 <!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html b/content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html
index fde4ef299a9..b73e96418c8 100644
--- a/content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html
+++ b/content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.pattern.source-in</title>
 <!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html b/content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html
index 95774276bf9..333033e8cd0 100644
--- a/content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html
+++ b/content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.uncovered.pattern.source-out</title>
 <!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.drawImage.zerocanvas.html b/content/canvas/test/test_2d.drawImage.zerocanvas.html
index 06a4206041e..aa9ea21402a 100644
--- a/content/canvas/test/test_2d.drawImage.zerocanvas.html
+++ b/content/canvas/test/test_2d.drawImage.zerocanvas.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.drawImage.zerocanvas</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.fill.winding.html b/content/canvas/test/test_2d.fill.winding.html
index d8fa6f548c7..56d7d978259 100644
--- a/content/canvas/test/test_2d.fill.winding.html
+++ b/content/canvas/test/test_2d.fill.winding.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.fill.winding</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.fillText.gradient.html b/content/canvas/test/test_2d.fillText.gradient.html
index 329fc88281b..72183bd505c 100644
--- a/content/canvas/test/test_2d.fillText.gradient.html
+++ b/content/canvas/test/test_2d.fillText.gradient.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.composite.canvas.xor</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.behind.html b/content/canvas/test/test_2d.gradient.radial.cone.behind.html
index 26c18026dd1..45fcdd2f406 100644
--- a/content/canvas/test/test_2d.gradient.radial.cone.behind.html
+++ b/content/canvas/test/test_2d.gradient.radial.cone.behind.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.radial.cone.behind</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.beside.html b/content/canvas/test/test_2d.gradient.radial.cone.beside.html
index f8b08adbe69..456920cfa44 100644
--- a/content/canvas/test/test_2d.gradient.radial.cone.beside.html
+++ b/content/canvas/test/test_2d.gradient.radial.cone.beside.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.radial.cone.beside</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.shape2.html b/content/canvas/test/test_2d.gradient.radial.cone.shape2.html
index ed3b1f13864..d15d1dd4e48 100644
--- a/content/canvas/test/test_2d.gradient.radial.cone.shape2.html
+++ b/content/canvas/test/test_2d.gradient.radial.cone.shape2.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.radial.cone.shape2</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.gradient.radial.equal.html b/content/canvas/test/test_2d.gradient.radial.equal.html
index cbadc277b61..ecf7a8e1afd 100644
--- a/content/canvas/test/test_2d.gradient.radial.equal.html
+++ b/content/canvas/test/test_2d.gradient.radial.equal.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.radial.equal</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.gradient.radial.outside2.html b/content/canvas/test/test_2d.gradient.radial.outside2.html
index a28b88406ec..d7fc7510571 100644
--- a/content/canvas/test/test_2d.gradient.radial.outside2.html
+++ b/content/canvas/test/test_2d.gradient.radial.outside2.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.radial.outside2</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.gradient.radial.outside3.html b/content/canvas/test/test_2d.gradient.radial.outside3.html
index 10fee019964..029a28d1ad9 100644
--- a/content/canvas/test/test_2d.gradient.radial.outside3.html
+++ b/content/canvas/test/test_2d.gradient.radial.outside3.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.radial.outside3</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.gradient.radial.touch1.html b/content/canvas/test/test_2d.gradient.radial.touch1.html
index f19c569cffc..1ed681ebfff 100644
--- a/content/canvas/test/test_2d.gradient.radial.touch1.html
+++ b/content/canvas/test/test_2d.gradient.radial.touch1.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.radial.touch1</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.gradient.radial.touch2.html b/content/canvas/test/test_2d.gradient.radial.touch2.html
index a4789bd3fa4..33c3e2174c4 100644
--- a/content/canvas/test/test_2d.gradient.radial.touch2.html
+++ b/content/canvas/test/test_2d.gradient.radial.touch2.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.radial.touch2</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.gradient.radial.touch3.html b/content/canvas/test/test_2d.gradient.radial.touch3.html
index 224ac8174f0..eb7eebcd548 100644
--- a/content/canvas/test/test_2d.gradient.radial.touch3.html
+++ b/content/canvas/test/test_2d.gradient.radial.touch3.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.radial.touch3</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.isPointInPath.winding.html b/content/canvas/test/test_2d.isPointInPath.winding.html
index 9cd549c858f..f947475e127 100644
--- a/content/canvas/test/test_2d.isPointInPath.winding.html
+++ b/content/canvas/test/test_2d.isPointInPath.winding.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.isPointInPath.winding</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.path.arc.shape.3.html b/content/canvas/test/test_2d.path.arc.shape.3.html
index d66286f68f5..15fac23afaf 100644
--- a/content/canvas/test/test_2d.path.arc.shape.3.html
+++ b/content/canvas/test/test_2d.path.arc.shape.3.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.shape.3</title>
 <!-- Testing: arc() from 0 to -pi/2 does not draw anything in the wrong quadrant -->
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.path.rect.selfintersect.html b/content/canvas/test/test_2d.path.rect.selfintersect.html
index efc875d37af..e4fc13ede25 100644
--- a/content/canvas/test/test_2d.path.rect.selfintersect.html
+++ b/content/canvas/test/test_2d.path.rect.selfintersect.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.rect.selfintersect</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_2d.path.rect.zero.6.html b/content/canvas/test/test_2d.path.rect.zero.6.html
index e4347184103..3e61e119d37 100644
--- a/content/canvas/test/test_2d.path.rect.zero.6.html
+++ b/content/canvas/test/test_2d.path.rect.zero.6.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.rect.zero.6</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_bug902651.html b/content/canvas/test/test_bug902651.html
index 9ddb2960993..2eac64f2aa0 100644
--- a/content/canvas/test/test_bug902651.html
+++ b/content/canvas/test/test_bug902651.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: canvas demotion</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_canvas_path.html b/content/canvas/test/test_canvas_path.html
index 52f85e06b5a..4a34479af68 100644
--- a/content/canvas/test/test_canvas_path.html
+++ b/content/canvas/test/test_canvas_path.html
@@ -315,6 +315,23 @@ function test_isPointInStroke_canvas() {
 }
 </script>
 
+<p>Canvas test: test_pathconstructor_canvas</p>
+<canvas id="c7" class="output" width="200" height="100">+
+</canvas>
+<script type="text/javascript">
+
+function test_pathconstructor_canvas() {
+  var c = document.getElementById("c7");
+  var ctx = c.getContext("2d");
+
+  var p = new Path2D("M100,0L200,0L200,100L100,100z");
+  ctx.fillStyle = 'blue';
+  ctx.fill(p);
+  isPixel(ctx, 105, 5, [0, 0, 255, 255], 0);
+  isPixel(ctx, 5, 5, [0, 0, 0, 0], 0);
+}
+</script>
+
 <script>
 
 function runTests() {
@@ -354,6 +371,12 @@ function runTests() {
   throw e;
   ok(false, "unexpected exception thrown in: test_isPointInStroke_canvas");
  }
+ try {
+  test_pathconstructor_canvas();
+ } catch(e) {
+  throw e;
+  ok(false, "unexpected exception thrown in: test_pathconstructor_canvas");
+ }
  SpecialPowers.setBoolPref("canvas.path.enabled", false);
  SimpleTest.finish();
 }
diff --git a/content/canvas/test/test_mozGetAsFile.html b/content/canvas/test/test_mozGetAsFile.html
index 3beecb11c0b..0975fcb9c43 100644
--- a/content/canvas/test/test_mozGetAsFile.html
+++ b/content/canvas/test/test_mozGetAsFile.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: mozGetAsFile</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_toBlob.html b/content/canvas/test/test_toBlob.html
index 537bb27d3eb..34d87dba8a9 100644
--- a/content/canvas/test/test_toBlob.html
+++ b/content/canvas/test/test_toBlob.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: toBlob</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_toDataURL_alpha.html b/content/canvas/test/test_toDataURL_alpha.html
index 23b003d562f..7f86f13421e 100644
--- a/content/canvas/test/test_toDataURL_alpha.html
+++ b/content/canvas/test/test_toDataURL_alpha.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>Canvas test: toDataURL parameters (Bug 564388)</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 </head>
diff --git a/content/canvas/test/test_toDataURL_lowercase_ascii.html b/content/canvas/test/test_toDataURL_lowercase_ascii.html
index 942d5835ef9..4f0061e90bc 100644
--- a/content/canvas/test/test_toDataURL_lowercase_ascii.html
+++ b/content/canvas/test/test_toDataURL_lowercase_ascii.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: toDataURL.lowercase.ascii</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/test_toDataURL_parameters.html b/content/canvas/test/test_toDataURL_parameters.html
index 0a58ec3a441..2cc8b0bb7f2 100644
--- a/content/canvas/test/test_toDataURL_parameters.html
+++ b/content/canvas/test/test_toDataURL_parameters.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>Canvas test: toDataURL parameters (Bug 564388)</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/canvas/test/webgl-mochitest/test_depth_readpixels.html b/content/canvas/test/webgl-mochitest/test_depth_readpixels.html
index e82ef42901c..895e7c98f42 100644
--- a/content/canvas/test/webgl-mochitest/test_depth_readpixels.html
+++ b/content/canvas/test/webgl-mochitest/test_depth_readpixels.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>WebGL test: Check for error on ReadPixels from a depth-only FB.</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="webgl-util.js"></script>
diff --git a/content/canvas/test/webgl-mochitest/test_fb_param.html b/content/canvas/test/webgl-mochitest/test_fb_param.html
index 00fc70cd236..5907221dd79 100644
--- a/content/canvas/test/webgl-mochitest/test_fb_param.html
+++ b/content/canvas/test/webgl-mochitest/test_fb_param.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>WebGL test: bug 958491</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="driver-info.js"></script>
diff --git a/content/canvas/test/webgl-mochitest/test_fb_param_crash.html b/content/canvas/test/webgl-mochitest/test_fb_param_crash.html
index 10b8d3db31c..56a29be46c1 100644
--- a/content/canvas/test/webgl-mochitest/test_fb_param_crash.html
+++ b/content/canvas/test/webgl-mochitest/test_fb_param_crash.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>WebGL test: bug 958723</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="driver-info.js"></script>
diff --git a/content/canvas/test/webgl-mochitest/test_highp_fs.html b/content/canvas/test/webgl-mochitest/test_highp_fs.html
index 165767da538..8d82c33e484 100644
--- a/content/canvas/test/webgl-mochitest/test_highp_fs.html
+++ b/content/canvas/test/webgl-mochitest/test_highp_fs.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>WebGL test: `highp` support</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="driver-info.js"></script>
diff --git a/content/canvas/test/webgl-mochitest/test_no_arr_points.html b/content/canvas/test/webgl-mochitest/test_no_arr_points.html
index d7cb91db906..caeea696ec6 100644
--- a/content/canvas/test/webgl-mochitest/test_no_arr_points.html
+++ b/content/canvas/test/webgl-mochitest/test_no_arr_points.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>WebGL test: Drawing without attrib arrays</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="driver-info.js"></script>
diff --git a/content/canvas/test/webgl-mochitest/test_privileged_exts.html b/content/canvas/test/webgl-mochitest/test_privileged_exts.html
index d84af4e7f03..936b4d5658e 100644
--- a/content/canvas/test/webgl-mochitest/test_privileged_exts.html
+++ b/content/canvas/test/webgl-mochitest/test_privileged_exts.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>WebGL test: Check for privileged ext access.</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="webgl-util.js"></script>
diff --git a/content/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html b/content/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html
index 63dc965532d..68d90617f62 100644
--- a/content/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html
+++ b/content/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>WebGL test: WebGL2RenderingContext not exposed</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 </head>
diff --git a/content/canvas/test/webgl-mochitest/test_webgl_available.html b/content/canvas/test/webgl-mochitest/test_webgl_available.html
index bc85a5c2c29..4b4611dd2db 100644
--- a/content/canvas/test/webgl-mochitest/test_webgl_available.html
+++ b/content/canvas/test/webgl-mochitest/test_webgl_available.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>WebGL test: Check that WebGL works (or not) if it should (or should not).</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="webgl-util.js"></script>
diff --git a/content/canvas/test/webgl-mochitest/test_webgl_conformance.html b/content/canvas/test/webgl-mochitest/test_webgl_conformance.html
index a0c3af289f8..b4d1407f9dc 100644
--- a/content/canvas/test/webgl-mochitest/test_webgl_conformance.html
+++ b/content/canvas/test/webgl-mochitest/test_webgl_conformance.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>WebGL test: 'webgl' context request</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="webgl-util.js"></script>
diff --git a/content/canvas/test/webgl-mochitest/test_webgl_request_context.html b/content/canvas/test/webgl-mochitest/test_webgl_request_context.html
index 9678d324390..d11584e08cc 100644
--- a/content/canvas/test/webgl-mochitest/test_webgl_request_context.html
+++ b/content/canvas/test/webgl-mochitest/test_webgl_request_context.html
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML>
 <title>WebGL test: 'webgl' and 'experimental-webgl' context requests succeed,
     'moz-webgl' context requests fail.</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="driver-info.js"></script>
diff --git a/content/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html b/content/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html
index 18da7fc89f2..f4b1df51079 100644
--- a/content/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html
+++ b/content/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML>
 <title>WebGL test: Mismatched 'webgl' and 'experimental-webgl' context requests</title>
-<script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
diff --git a/content/media/TextTrack.cpp b/content/media/TextTrack.cpp
index 912f0d536db..42d12a945cd 100644
--- a/content/media/TextTrack.cpp
+++ b/content/media/TextTrack.cpp
@@ -95,6 +95,16 @@ TextTrack::SetMode(TextTrackMode aValue)
   }
 }
 
+void
+TextTrack::GetId(nsAString& aId) const
+{
+  // If the track has a track element then its id should be the same as the
+  // track element's id.
+  if (mTrackElement) {
+    mTrackElement->GetAttribute(NS_LITERAL_STRING("id"), aId);
+  }
+}
+
 void
 TextTrack::AddCue(TextTrackCue& aCue)
 {
diff --git a/content/media/TextTrack.h b/content/media/TextTrack.h
index 9dc893ebbff..efbb4501a4b 100644
--- a/content/media/TextTrack.h
+++ b/content/media/TextTrack.h
@@ -84,10 +84,7 @@ public:
   {
     aType = mType;
   }
-  void GetId(nsAString& aId) const
-  {
-    aId = mId;
-  }
+  void GetId(nsAString& aId) const;
 
   TextTrackMode Mode() const
   {
@@ -134,7 +131,6 @@ private:
   nsString mLabel;
   nsString mLanguage;
   nsString mType;
-  nsString mId;
   TextTrackMode mMode;
 
   nsRefPtr<TextTrackCueList> mCueList;
diff --git a/content/media/test/test_texttrack.html b/content/media/test/test_texttrack.html
index 988aa91cb03..74bef3d4309 100644
--- a/content/media/test/test_texttrack.html
+++ b/content/media/test/test_texttrack.html
@@ -67,6 +67,7 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true],
     trackOne.label = "first";
     trackOne.src = "basic.vtt";
     trackOne.default = true;
+    trackOne.id = "2";
     video.appendChild(trackOne);
 
     video.addTextTrack("subtitles", "fourth", "en-CA");
@@ -102,10 +103,10 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true],
       // method, will occupy the last two indexes in the order that they were
       // added in.
       var trackData = [
-        { label: "first", mode: "showing" },
-        { label: "second", mode: "disabled" },
-        { label: "third", mode: "hidden" },
-        { label: "fourth", mode: "hidden"}
+        { label: "first", mode: "showing", id: "2" },
+        { label: "second", mode: "disabled", id: "" },
+        { label: "third", mode: "hidden", id: "" },
+        { label: "fourth", mode: "hidden", id: "" }
       ];
       is(video.textTracks.length, trackData.length, "TextTracks length should be " + trackData.length);
       for (var i = 0; i < trackData.length; i++) {
diff --git a/content/svg/content/src/SVGContentUtils.cpp b/content/svg/content/src/SVGContentUtils.cpp
index 6cc327d6c6d..fac4872f492 100644
--- a/content/svg/content/src/SVGContentUtils.cpp
+++ b/content/svg/content/src/SVGContentUtils.cpp
@@ -19,7 +19,10 @@
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "nsContentUtils.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Types.h"
 #include "gfx2DGlue.h"
+#include "nsSVGPathDataParser.h"
+#include "SVGPathData.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -584,3 +587,15 @@ SVGContentUtils::CoordToFloat(nsPresContext *aPresContext,
     return 0.0f;
   }
 }
+
+RefPtr<gfx::Path>
+SVGContentUtils::GetPath(const nsAString& aPathString)
+{
+  SVGPathData pathData;
+  nsSVGPathDataParser parser(aPathString, &pathData);
+  if (!parser.Parse()) {
+    return NULL;
+  }
+
+  return pathData.BuildPath(mozilla::gfx::FillRule::FILL_WINDING, NS_STYLE_STROKE_LINECAP_BUTT, 1);
+}
diff --git a/content/svg/content/src/SVGContentUtils.h b/content/svg/content/src/SVGContentUtils.h
index 50adc05bb60..aa3208b6a5e 100644
--- a/content/svg/content/src/SVGContentUtils.h
+++ b/content/svg/content/src/SVGContentUtils.h
@@ -14,6 +14,7 @@
 #include "mozilla/RangedPtr.h"
 #include "nsError.h"
 #include "nsStringFwd.h"
+#include "gfx2DGlue.h"
 
 class nsIContent;
 class nsIDocument;
@@ -243,6 +244,13 @@ public:
   static float CoordToFloat(nsPresContext *aPresContext,
                             nsSVGElement *aContent,
                             const nsStyleCoord &aCoord);
+  /**
+   * Parse the SVG path string
+   * Returns a path
+   * string formatted as an SVG path
+   */
+  static mozilla::RefPtr<mozilla::gfx::Path>
+  GetPath(const nsAString& aPathString);
 };
 
 #endif
diff --git a/content/test/unit/test_range.js b/content/test/unit/test_range.js
index 4ea380c46ef..24f3b4cfffa 100644
--- a/content/test/unit/test_range.js
+++ b/content/test/unit/test_range.js
@@ -360,7 +360,7 @@ function run_miscellaneous_tests() {
       baseRange.setStart(null, 0);
       do_throw("Should have thrown NOT_OBJECT_ERR!");
     } catch (e) {
-      do_check_eq(e instanceof TypeError, true);
+      do_check_eq(e.constructor.name, "TypeError");
     }
 
     // Invalid start node
@@ -368,7 +368,7 @@ function run_miscellaneous_tests() {
       baseRange.setStart({}, 0);
       do_throw("Should have thrown SecurityError!");
     } catch (e) {
-      do_check_true(e instanceof TypeError);
+      do_check_eq(e.constructor.name, "TypeError");
     }
 
     // Invalid index
diff --git a/dom/apps/src/Webapps.js b/dom/apps/src/Webapps.js
index 7dd80030d8c..8407063716e 100644
--- a/dom/apps/src/Webapps.js
+++ b/dom/apps/src/Webapps.js
@@ -18,7 +18,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
                                    "nsIMessageSender");
 
 function convertAppsArray(aApps, aWindow) {
-  let apps = Cu.createArrayIn(aWindow);
+  let apps = new aWindow.Array();
   for (let i = 0; i < aApps.length; i++) {
     let app = aApps[i];
     apps.push(createApplicationObject(aWindow, app));
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 72576b8bb4e..fccf8b995f8 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -158,7 +158,6 @@
 #endif
 
 #include "nsIDOMGlobalObjectConstructor.h"
-#include "nsIDOMLockedFile.h"
 #include "nsDebug.h"
 
 #include "mozilla/dom/BindingUtils.h"
@@ -459,8 +458,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 #endif
 
-  NS_DEFINE_CLASSINFO_DATA(LockedFile, nsEventTargetSH,
-                           EVENTTARGET_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(CSSFontFeatureValuesRule, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 
@@ -1154,10 +1151,6 @@ nsDOMClassInfo::Init()
 
 #endif
 
-  DOM_CLASSINFO_MAP_BEGIN(LockedFile, nsIDOMLockedFile)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMLockedFile)
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(CSSFontFeatureValuesRule, nsIDOMCSSFontFeatureValuesRule)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSFontFeatureValuesRule)
   DOM_CLASSINFO_MAP_END
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index a2cca4632ba..ee95b311fc9 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -98,8 +98,6 @@ DOMCI_CLASS(CSSPageRule)
 DOMCI_CLASS(MozIccManager)
 #endif
 
-DOMCI_CLASS(LockedFile)
-
 DOMCI_CLASS(CSSFontFeatureValuesRule)
 
 DOMCI_CLASS(UserDataHandler)
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index e3afdcb20e1..6afb2009fc5 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -692,6 +692,10 @@ DOMInterfaces = {
     'register': False
 },
 
+'LockedFile': {
+    'nativeType': 'mozilla::dom::file::LockedFile',
+},
+
 'MediaList': {
     'nativeType': 'nsMediaList',
     'headerFile': 'nsIMediaList.h',
@@ -1853,7 +1857,6 @@ addExternalIface('File')
 addExternalIface('HitRegionOptions', nativeType='nsISupports')
 addExternalIface('imgINotificationObserver', nativeType='imgINotificationObserver')
 addExternalIface('imgIRequest', nativeType='imgIRequest', notflattened=True)
-addExternalIface('LockedFile')
 addExternalIface('MenuBuilder', nativeType='nsIMenuBuilder', notflattened=True)
 addExternalIface('MozBoxObject', nativeType='nsIBoxObject')
 addExternalIface('MozControllers', nativeType='nsIControllers')
diff --git a/dom/bindings/Errors.msg b/dom/bindings/Errors.msg
index af50d8b5dec..acc12c82246 100644
--- a/dom/bindings/Errors.msg
+++ b/dom/bindings/Errors.msg
@@ -52,3 +52,5 @@ MSG_DEF(MSG_NOT_DATE, 1, "{0} is not a date.")
 MSG_DEF(MSG_INVALID_ADVANCE_COUNT, 0, "0 (Zero) is not a valid advance count.")
 MSG_DEF(MSG_DEFINEPROPERTY_ON_GSP, 0, "Not allowed to define a property on the named properties object.")
 MSG_DEF(MSG_INVALID_URL, 1, "{0} is not a valid URL.")
+MSG_DEF(MSG_METADATA_NOT_CONFIGURED, 0, "Either size or lastModified should be true.")
+MSG_DEF(MSG_INVALID_READ_SIZE, 0, "0 (Zero) is not a valid read size.")
diff --git a/dom/downloads/src/DownloadsAPI.js b/dom/downloads/src/DownloadsAPI.js
index 653b60dd93a..167fc895343 100644
--- a/dom/downloads/src/DownloadsAPI.js
+++ b/dom/downloads/src/DownloadsAPI.js
@@ -59,7 +59,7 @@ DOMDownloadManagerImpl.prototype = {
         function(aDownloads) {
           // Turn the list of download objects into DOM objects and
           // send them.
-          let array = Cu.createArrayIn(this._window);
+          let array = new this._window.Array();
           for (let id in aDownloads) {
             let dom = createDOMDownloadObject(this._window, aDownloads[id]);
             array.push(this._prepareForContent(dom));
@@ -80,7 +80,7 @@ DOMDownloadManagerImpl.prototype = {
         function(aDownloads) {
           // Turn the list of download objects into DOM objects and
           // send them.
-          let array = Cu.createArrayIn(this._window);
+          let array = new this._window.Array();
           for (let id in aDownloads) {
             let dom = createDOMDownloadObject(this._window, aDownloads[id]);
             array.push(this._prepareForContent(dom));
diff --git a/dom/file/FileHandle.cpp b/dom/file/FileHandle.cpp
index 7f68903ddf2..89e86cdebbe 100644
--- a/dom/file/FileHandle.cpp
+++ b/dom/file/FileHandle.cpp
@@ -128,7 +128,7 @@ FileHandle::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
   return FileHandleBinding::Wrap(aCx, aScope, this);
 }
 
-already_AddRefed<nsIDOMLockedFile>
+already_AddRefed<LockedFile>
 FileHandle::Open(FileMode aMode, ErrorResult& aError)
 {
   MOZ_ASSERT(NS_IsMainThread());
diff --git a/dom/file/FileHandle.h b/dom/file/FileHandle.h
index 43eae9b1f96..deda8a9547e 100644
--- a/dom/file/FileHandle.h
+++ b/dom/file/FileHandle.h
@@ -113,7 +113,7 @@ public:
     aType = mType;
   }
 
-  already_AddRefed<nsIDOMLockedFile>
+  already_AddRefed<LockedFile>
   Open(FileMode aMode, ErrorResult& aError);
 
   already_AddRefed<DOMRequest>
diff --git a/dom/file/FileRequest.cpp b/dom/file/FileRequest.cpp
index 9d5db0ba474..ed2f405522c 100644
--- a/dom/file/FileRequest.cpp
+++ b/dom/file/FileRequest.cpp
@@ -115,7 +115,7 @@ FileRequest::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
   return FileRequestBinding::Wrap(aCx, aScope, this);
 }
 
-nsIDOMLockedFile*
+LockedFile*
 FileRequest::GetLockedFile() const
 {
   MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
diff --git a/dom/file/FileRequest.h b/dom/file/FileRequest.h
index 7b2159f3955..ee9c9e979ff 100644
--- a/dom/file/FileRequest.h
+++ b/dom/file/FileRequest.h
@@ -51,7 +51,7 @@ public:
   WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
 
   // WebIDL
-  nsIDOMLockedFile*
+  LockedFile*
   GetLockedFile() const;
 
   IMPL_EVENT_HANDLER(progress)
diff --git a/dom/file/FileService.cpp b/dom/file/FileService.cpp
index d8a04f53348..22ee65ad419 100644
--- a/dom/file/FileService.cpp
+++ b/dom/file/FileService.cpp
@@ -284,7 +284,8 @@ FileService::AbortLockedFilesForStorage(nsIFileStorage* aFileStorage)
                                                        lockedFiles);
 
   for (uint32_t index = 0; index < lockedFiles.Length(); index++) {
-    lockedFiles[index]->Abort();
+    ErrorResult ignored;
+    lockedFiles[index]->Abort(ignored);
   }
 }
 
diff --git a/dom/file/LockedFile.cpp b/dom/file/LockedFile.cpp
index a4dd64f9c9c..4e5e516a404 100644
--- a/dom/file/LockedFile.cpp
+++ b/dom/file/LockedFile.cpp
@@ -6,21 +6,8 @@
 
 #include "LockedFile.h"
 
-#include "nsIAppShell.h"
-#include "nsIDOMEvent.h"
-#include "nsIDOMFile.h"
-#include "nsIFileStorage.h"
-#include "nsISeekableStream.h"
-
-#include "jsfriendapi.h"
-#include "nsNetUtil.h"
-#include "nsDOMClassInfoID.h"
-#include "nsJSUtils.h"
-#include "nsStringStream.h"
-#include "nsWidgetsCID.h"
-#include "xpcpublic.h"
-
 #include "AsyncHelper.h"
+#include "nsIDOMEvent.h"
 #include "FileHandle.h"
 #include "FileHelper.h"
 #include "FileRequest.h"
@@ -28,18 +15,25 @@
 #include "FileStreamWrappers.h"
 #include "MemoryStreams.h"
 #include "MetadataHelper.h"
-#include "nsError.h"
-#include "nsContentUtils.h"
-
-#include "mozilla/EventDispatcher.h"
+#include "mozilla/dom/DOMRequest.h"
 #include "mozilla/dom/EncodingUtils.h"
 #include "mozilla/dom/LockedFileBinding.h"
+#include "mozilla/dom/TypedArray.h"
+#include "mozilla/dom/UnionTypes.h"
+#include "mozilla/EventDispatcher.h"
+#include "nsContentUtils.h"
+#include "nsError.h"
+#include "nsIAppShell.h"
+#include "nsIDOMFile.h"
+#include "nsIFileStorage.h"
+#include "nsISeekableStream.h"
+#include "nsNetUtil.h"
+#include "nsStringStream.h"
+#include "nsWidgetsCID.h"
 
 #define STREAM_COPY_BLOCK_SIZE 32768
 
-using namespace mozilla;
-using namespace mozilla::dom;
-USING_FILE_NAMESPACE
+BEGIN_FILE_NAMESPACE
 
 namespace {
 
@@ -215,61 +209,6 @@ CreateGenericEvent(mozilla::dom::EventTarget* aEventOwner,
   return event.forget();
 }
 
-inline nsresult
-GetInputStreamForJSVal(JS::Handle<JS::Value> aValue, JSContext* aCx,
-                       nsIInputStream** aInputStream, uint64_t* aInputLength)
-{
-  nsresult rv;
-
-  if (aValue.isObject()) {
-    JS::Rooted<JSObject*> obj(aCx, &aValue.toObject());
-    if (JS_IsArrayBufferObject(obj)) {
-      char* data = reinterpret_cast<char*>(JS_GetArrayBufferData(obj));
-      uint32_t length = JS_GetArrayBufferByteLength(obj);
-
-      rv = NS_NewByteInputStream(aInputStream, data, length,
-                                 NS_ASSIGNMENT_COPY);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      *aInputLength = length;
-
-      return NS_OK;
-    }
-
-    nsCOMPtr<nsIDOMBlob> blob = do_QueryInterface(
-      nsContentUtils::XPConnect()->GetNativeOfWrapper(aCx, obj));
-    if (blob) {
-      rv = blob->GetSize(aInputLength);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      rv = blob->GetInternalStream(aInputStream);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      return NS_OK;
-    }
-  }
-
-  JSString* jsstr = JS::ToString(aCx, aValue);
-  NS_ENSURE_TRUE(jsstr, NS_ERROR_XPC_BAD_CONVERT_JS);
-
-  nsDependentJSString str;
-  if (!str.init(aCx, jsstr)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsCString cstr;
-  CopyUTF16toUTF8(str, cstr);
-
-  nsCOMPtr<nsIInputStream> stream;
-  rv = NS_NewCStringInputStream(getter_AddRefs(stream), cstr);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  stream.forget(aInputStream);
-  *aInputLength = cstr.Length();
-
-  return NS_OK;
-}
-
 } // anonymous namespace
 
 // static
@@ -305,6 +244,54 @@ LockedFile::Create(FileHandle* aFileHandle,
   return lockedFile.forget();
 }
 
+/* static */ already_AddRefed<nsIInputStream>
+LockedFile::GetInputStream(const ArrayBuffer& aValue, uint64_t* aInputLength,
+                           ErrorResult& aRv)
+{
+  const char* data = reinterpret_cast<const char*>(aValue.Data());
+  uint32_t length = aValue.Length();
+
+  nsCOMPtr<nsIInputStream> stream;
+  aRv = NS_NewByteInputStream(getter_AddRefs(stream), data, length,
+                              NS_ASSIGNMENT_COPY);
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+
+  *aInputLength = length;
+  return stream.forget();
+}
+
+/* static */ already_AddRefed<nsIInputStream>
+LockedFile::GetInputStream(nsIDOMBlob* aValue, uint64_t* aInputLength,
+                           ErrorResult& aRv)
+{
+  aRv = aValue->GetSize(aInputLength);
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIInputStream> stream;
+  aRv = aValue->GetInternalStream(getter_AddRefs(stream));
+  return stream.forget();
+}
+
+/* static */ already_AddRefed<nsIInputStream>
+LockedFile::GetInputStream(const nsAString& aValue, uint64_t* aInputLength,
+                           ErrorResult& aRv)
+{
+  NS_ConvertUTF16toUTF8 cstr(aValue);
+
+  nsCOMPtr<nsIInputStream> stream;
+  aRv = NS_NewCStringInputStream(getter_AddRefs(stream), cstr);
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+
+  *aInputLength = cstr.Length();
+  return stream.forget();
+}
+
 LockedFile::LockedFile()
 : mReadyState(INITIAL),
   mMode(FileMode::Readonly),
@@ -315,6 +302,7 @@ LockedFile::LockedFile()
   mCreating(false)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
+  SetIsDOMBinding();
 }
 
 LockedFile::~LockedFile()
@@ -326,20 +314,12 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED_1(LockedFile, nsDOMEventTargetHelper,
                                      mFileHandle)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(LockedFile)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMLockedFile)
   NS_INTERFACE_MAP_ENTRY(nsIRunnable)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(LockedFile)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
 
 NS_IMPL_ADDREF_INHERITED(LockedFile, nsDOMEventTargetHelper)
 NS_IMPL_RELEASE_INHERITED(LockedFile, nsDOMEventTargetHelper)
 
-DOMCI_DATA(LockedFile, LockedFile)
-
-NS_IMPL_EVENT_HANDLER(LockedFile, complete)
-NS_IMPL_EVENT_HANDLER(LockedFile, abort)
-NS_IMPL_EVENT_HANDLER(LockedFile, error)
-
 nsresult
 LockedFile::PreHandleEvent(EventChainPreVisitor& aVisitor)
 {
@@ -457,103 +437,27 @@ LockedFile::IsOpen() const
   return false;
 }
 
-NS_IMETHODIMP
-LockedFile::GetFileHandle(nsISupports** aFileHandle)
-{
-  nsCOMPtr<nsISupports> result(mFileHandle);
-  result.forget(aFileHandle);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-LockedFile::GetMode(nsAString& aMode)
-{
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-
-  switch (mMode) {
-   case FileMode::Readonly:
-     aMode.AssignLiteral("readonly");
-     break;
-   case FileMode::Readwrite:
-     aMode.AssignLiteral("readwrite");
-     break;
-   default:
-     NS_NOTREACHED("Unknown mode!");
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-LockedFile::GetActive(bool* aActive)
-{
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-  *aActive = IsOpen();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-LockedFile::GetLocation(JSContext* aCx,
-                        JS::MutableHandle<JS::Value> aLocation)
-{
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-
-  if (mLocation == UINT64_MAX) {
-    aLocation.setNull();
-  }
-  else {
-    aLocation.setDouble(double(mLocation));
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-LockedFile::SetLocation(JSContext* aCx,
-                        JS::Handle<JS::Value> aLocation)
-{
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-
-  // Null means the end-of-file.
-  if (aLocation.isNull()) {
-    mLocation = UINT64_MAX;
-    return NS_OK;
-  }
-
-  uint64_t location;
-  if (!JS::ToUint64(aCx, aLocation, &location)) {
-    return NS_ERROR_TYPE_ERR;
-  }
-
-  mLocation = location;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-LockedFile::GetMetadata(JS::Handle<JS::Value> aParameters,
-                        JSContext* aCx,
-                        nsISupports** _retval)
+already_AddRefed<FileRequest>
+LockedFile::GetMetadata(const DOMFileMetadataParameters& aParameters,
+                        ErrorResult& aRv)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
   if (!IsOpen()) {
-    return NS_ERROR_DOM_FILEHANDLE_LOCKEDFILE_INACTIVE_ERR;
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_LOCKEDFILE_INACTIVE_ERR);
+    return nullptr;
   }
 
   // Do nothing if the window is closed
   if (!GetOwner()) {
-    return NS_OK;
+    return nullptr;
   }
 
-  // Get optional arguments.
-  DOMFileMetadataParameters config;
-  JS::Rooted<JS::Value> parameters(aCx, aParameters);
-  bool result = config.Init(aCx, parameters);
-  NS_ENSURE_TRUE(result, NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
-
   nsRefPtr<MetadataParameters> params =
-    new MetadataParameters(config.mSize, config.mLastModified);
+    new MetadataParameters(aParameters.mSize, aParameters.mLastModified);
   if (!params->IsConfigured()) {
-    return NS_ERROR_TYPE_ERR;
+    aRv.ThrowTypeError(MSG_METADATA_NOT_CONFIGURED);
+    return nullptr;
   }
 
   nsRefPtr<FileRequest> fileRequest = GenerateFileRequest();
@@ -561,36 +465,47 @@ LockedFile::GetMetadata(JS::Handle<JS::Value> aParameters,
   nsRefPtr<MetadataHelper> helper =
     new MetadataHelper(this, fileRequest, params);
 
-  nsresult rv = helper->Enqueue();
-  NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+  if (NS_FAILED(helper->Enqueue())) {
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+    return nullptr;
+  }
 
-  nsRefPtr<nsIDOMDOMRequest> request = fileRequest.forget();
-  request.forget(_retval);
-  return NS_OK;
+  return fileRequest.forget();
 }
 
-NS_IMETHODIMP
-LockedFile::ReadAsArrayBuffer(uint64_t aSize,
-                              JSContext* aCx,
-                              nsISupports** _retval)
+bool
+LockedFile::CheckStateAndArgumentsForRead(uint64_t aSize, ErrorResult& aRv)
 {
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-
   if (!IsOpen()) {
-    return NS_ERROR_DOM_FILEHANDLE_LOCKEDFILE_INACTIVE_ERR;
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_LOCKEDFILE_INACTIVE_ERR);
+    return false;
   }
 
   if (mLocation == UINT64_MAX) {
-    return NS_ERROR_DOM_FILEHANDLE_NOT_ALLOWED_ERR;
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_NOT_ALLOWED_ERR);
+    return false;
   }
 
   if (!aSize) {
-    return NS_ERROR_TYPE_ERR;
+    aRv.ThrowTypeError(MSG_INVALID_READ_SIZE);
+    return false;
   }
 
   // Do nothing if the window is closed
   if (!GetOwner()) {
-    return NS_OK;
+    return false;
+  }
+
+  return true;
+}
+
+already_AddRefed<FileRequest>
+LockedFile::ReadAsArrayBuffer(uint64_t aSize, ErrorResult& aRv)
+{
+  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
+
+  if (!CheckStateAndArgumentsForRead(aSize, aRv)) {
+    return nullptr;
   }
 
   nsRefPtr<FileRequest> fileRequest = GenerateFileRequest();
@@ -598,41 +513,24 @@ LockedFile::ReadAsArrayBuffer(uint64_t aSize,
   nsRefPtr<ReadHelper> helper =
     new ReadHelper(this, fileRequest, mLocation, aSize);
 
-  nsresult rv = helper->Init();
-  NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
-
-  rv = helper->Enqueue();
-  NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+  if (NS_FAILED(helper->Init()) || NS_FAILED(helper->Enqueue())) {
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+    return nullptr;
+  }
 
   mLocation += aSize;
 
-  nsRefPtr<nsIDOMDOMRequest> request = fileRequest.forget();
-  request.forget(_retval);
-  return NS_OK;
+  return fileRequest.forget();
 }
 
-NS_IMETHODIMP
-LockedFile::ReadAsText(uint64_t aSize,
-                       const nsAString& aEncoding,
-                       nsISupports** _retval)
+already_AddRefed<FileRequest>
+LockedFile::ReadAsText(uint64_t aSize, const nsAString& aEncoding,
+                       ErrorResult& aRv)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  if (!IsOpen()) {
-    return NS_ERROR_DOM_FILEHANDLE_LOCKEDFILE_INACTIVE_ERR;
-  }
-
-  if (mLocation == UINT64_MAX) {
-    return NS_ERROR_DOM_FILEHANDLE_NOT_ALLOWED_ERR;
-  }
-
-  if (!aSize) {
-    return NS_ERROR_TYPE_ERR;
-  }
-
-  // Do nothing if the window is closed
-  if (!GetOwner()) {
-    return NS_OK;
+  if (!CheckStateAndArgumentsForRead(aSize, aRv)) {
+    return nullptr;
   }
 
   nsRefPtr<FileRequest> fileRequest = GenerateFileRequest();
@@ -640,70 +538,57 @@ LockedFile::ReadAsText(uint64_t aSize,
   nsRefPtr<ReadTextHelper> helper =
     new ReadTextHelper(this, fileRequest, mLocation, aSize, aEncoding);
 
-  nsresult rv = helper->Init();
-  NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
-
-  rv = helper->Enqueue();
-  NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+  if (NS_FAILED(helper->Init()) || NS_FAILED(helper->Enqueue())) {
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+    return nullptr;
+  }
 
   mLocation += aSize;
 
-  nsRefPtr<nsIDOMDOMRequest> request = fileRequest.forget();
-  request.forget(_retval);
-  return NS_OK;
+  return fileRequest.forget();
 }
 
-NS_IMETHODIMP
-LockedFile::Write(JS::Handle<JS::Value> aValue,
-                  JSContext* aCx,
-                  nsISupports** _retval)
+bool
+LockedFile::CheckStateForWrite(ErrorResult& aRv)
 {
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-
-  return WriteOrAppend(aValue, aCx, _retval, false);
-}
-
-NS_IMETHODIMP
-LockedFile::Append(JS::Handle<JS::Value> aValue,
-                   JSContext* aCx,
-                   nsISupports** _retval)
-{
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-
-  return WriteOrAppend(aValue, aCx, _retval, true);
-}
-
-NS_IMETHODIMP
-LockedFile::Truncate(uint64_t aSize,
-                     uint8_t aOptionalArgCount,
-                     nsISupports** _retval)
-{
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-
   if (!IsOpen()) {
-    return NS_ERROR_DOM_FILEHANDLE_LOCKEDFILE_INACTIVE_ERR;
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_LOCKEDFILE_INACTIVE_ERR);
+    return false;
   }
 
   if (mMode != FileMode::Readwrite) {
-    return NS_ERROR_DOM_FILEHANDLE_READ_ONLY_ERR;
-  }
-
-  uint64_t location;
-  if (aOptionalArgCount) {
-    // Just in case someone calls us from C++
-    NS_ASSERTION(aSize != UINT64_MAX, "Passed wrong size!");
-    location = aSize;
-  }
-  else {
-    if (mLocation == UINT64_MAX) {
-      return NS_ERROR_DOM_FILEHANDLE_NOT_ALLOWED_ERR;
-    }
-    location = mLocation;
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_READ_ONLY_ERR);
+    return false;
   }
 
   // Do nothing if the window is closed
   if (!GetOwner()) {
-    return NS_OK;
+    return false;
+  }
+
+  return true;
+}
+
+already_AddRefed<FileRequest>
+LockedFile::Truncate(const Optional<uint64_t>& aSize, ErrorResult& aRv)
+{
+  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
+
+  uint64_t location;
+  if (aSize.WasPassed()) {
+    // Just in case someone calls us from C++
+    NS_ASSERTION(aSize.Value() != UINT64_MAX, "Passed wrong size!");
+    location = aSize.Value();
+  } else {
+    if (mLocation == UINT64_MAX) {
+      aRv.Throw(NS_ERROR_DOM_FILEHANDLE_NOT_ALLOWED_ERR);
+      return nullptr;
+    }
+    location = mLocation;
+  }
+
+  if (!CheckStateForWrite(aRv)) {
+    return nullptr;
   }
 
   nsRefPtr<FileRequest> fileRequest = GenerateFileRequest();
@@ -711,50 +596,41 @@ LockedFile::Truncate(uint64_t aSize,
   nsRefPtr<TruncateHelper> helper =
     new TruncateHelper(this, fileRequest, location);
 
-  nsresult rv = helper->Enqueue();
-  NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
-
-  if (aOptionalArgCount) {
-    mLocation = aSize;
+  if (NS_FAILED(helper->Enqueue())) {
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+    return nullptr;
   }
 
-  nsRefPtr<nsIDOMDOMRequest> request = fileRequest.forget();
-  request.forget(_retval);
-  return NS_OK;
+  if (aSize.WasPassed()) {
+    mLocation = aSize.Value();
+  }
+
+  return fileRequest.forget();
 }
 
-NS_IMETHODIMP
-LockedFile::Flush(nsISupports** _retval)
+already_AddRefed<FileRequest>
+LockedFile::Flush(ErrorResult& aRv)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  if (!IsOpen()) {
-    return NS_ERROR_DOM_FILEHANDLE_LOCKEDFILE_INACTIVE_ERR;
-  }
-
-  if (mMode != FileMode::Readwrite) {
-    return NS_ERROR_DOM_FILEHANDLE_READ_ONLY_ERR;
-  }
-
-  // Do nothing if the window is closed
-  if (!GetOwner()) {
-    return NS_OK;
+  if (!CheckStateForWrite(aRv)) {
+    return nullptr;
   }
 
   nsRefPtr<FileRequest> fileRequest = GenerateFileRequest();
 
   nsRefPtr<FlushHelper> helper = new FlushHelper(this, fileRequest);
 
-  nsresult rv = helper->Enqueue();
-  NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+  if (NS_FAILED(helper->Enqueue())) {
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+    return nullptr;
+  }
 
-  nsRefPtr<nsIDOMDOMRequest> request = fileRequest.forget();
-  request.forget(_retval);
-  return NS_OK;
+  return fileRequest.forget();
 }
 
-NS_IMETHODIMP
-LockedFile::Abort()
+void
+LockedFile::Abort(ErrorResult& aRv)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -762,7 +638,8 @@ LockedFile::Abort()
   // even from outside of transaction callbacks.
   if (mReadyState != LockedFile::INITIAL &&
       mReadyState != LockedFile::LOADING) {
-    return NS_ERROR_DOM_FILEHANDLE_NOT_ALLOWED_ERR;
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_NOT_ALLOWED_ERR);
+    return;
   }
 
   bool needToFinish = mReadyState == INITIAL;
@@ -773,10 +650,8 @@ LockedFile::Abort()
   // Fire the abort event if there are no outstanding requests. Otherwise the
   // abort event will be fired when all outstanding requests finish.
   if (needToFinish) {
-    return Finish();
+    aRv = Finish();
   }
-
-  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -829,38 +704,23 @@ LockedFile::OpenInputStream(bool aWholeFile, uint64_t aStart, uint64_t aLength,
   return NS_OK;
 }
 
-nsresult
-LockedFile::WriteOrAppend(JS::Handle<JS::Value> aValue,
-                          JSContext* aCx,
-                          nsISupports** _retval,
-                          bool aAppend)
+already_AddRefed<FileRequest>
+LockedFile::WriteOrAppend(nsIInputStream* aInputStream, uint64_t aInputLength,
+                          bool aAppend, ErrorResult& aRv)
 {
-  if (!IsOpen()) {
-    return NS_ERROR_DOM_FILEHANDLE_LOCKEDFILE_INACTIVE_ERR;
-  }
-
-  if (mMode != FileMode::Readwrite) {
-    return NS_ERROR_DOM_FILEHANDLE_READ_ONLY_ERR;
-  }
+  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
   if (!aAppend && mLocation == UINT64_MAX) {
-    return NS_ERROR_DOM_FILEHANDLE_NOT_ALLOWED_ERR;
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_NOT_ALLOWED_ERR);
+    return nullptr;
   }
 
-  // Do nothing if the window is closed
-  if (!GetOwner()) {
-    return NS_OK;
+  if (!CheckStateForWrite(aRv)) {
+    return nullptr;
   }
 
-  nsCOMPtr<nsIInputStream> inputStream;
-  uint64_t inputLength;
-  nsresult rv =
-    GetInputStreamForJSVal(aValue, aCx, getter_AddRefs(inputStream),
-                           &inputLength);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!inputLength) {
-    return NS_OK;
+  if (!aInputLength) {
+    return nullptr;
   }
 
   nsRefPtr<FileRequest> fileRequest = GenerateFileRequest();
@@ -868,21 +728,21 @@ LockedFile::WriteOrAppend(JS::Handle<JS::Value> aValue,
   uint64_t location = aAppend ? UINT64_MAX : mLocation;
 
   nsRefPtr<WriteHelper> helper =
-    new WriteHelper(this, fileRequest, location, inputStream, inputLength);
+    new WriteHelper(this, fileRequest, location, aInputStream, aInputLength);
 
-  rv = helper->Enqueue();
-  NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+  if (NS_FAILED(helper->Enqueue())) {
+    aRv.Throw(NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR);
+    return nullptr;
+  }
 
   if (aAppend) {
     mLocation = UINT64_MAX;
   }
   else {
-    mLocation += inputLength;
+    mLocation += aInputLength;
   }
 
-  nsRefPtr<nsIDOMDOMRequest> request = fileRequest.forget();
-  request.forget(_retval);
-  return NS_OK;
+  return fileRequest.forget();
 }
 
 nsresult
@@ -903,6 +763,13 @@ LockedFile::Finish()
   return NS_OK;
 }
 
+/* virtual */ JSObject*
+LockedFile::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
+{
+  return LockedFileBinding::Wrap(aCx, aScope, this);
+}
+
+
 FinishHelper::FinishHelper(LockedFile* aLockedFile)
 : mLockedFile(aLockedFile),
   mAborted(aLockedFile->mAborted)
@@ -1152,3 +1019,5 @@ OpenStreamHelper::DoAsyncRun(nsISupports* aStream)
 
   return NS_OK;
 }
+
+END_FILE_NAMESPACE
diff --git a/dom/file/LockedFile.h b/dom/file/LockedFile.h
index 5f00ac125b2..4b5a03f9164 100644
--- a/dom/file/LockedFile.h
+++ b/dom/file/LockedFile.h
@@ -7,15 +7,20 @@
 #ifndef mozilla_dom_file_lockedfile_h__
 #define mozilla_dom_file_lockedfile_h__
 
-#include "mozilla/Attributes.h"
 #include "FileCommon.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/dom/FileModeBinding.h"
-#include "nsIDOMLockedFile.h"
+#include "mozilla/dom/TypedArray.h"
+#include "nsDOMEventTargetHelper.h"
+#include "nsIInputStream.h"
 #include "nsIRunnable.h"
 
-#include "nsDOMEventTargetHelper.h"
-
-class nsIInputStream;
+namespace mozilla {
+namespace dom {
+class DOMFileMetadataParameters;
+class DOMRequest;
+} // namespace dom
+} // namespace mozilla
 
 namespace mozilla {
 class EventChainPreVisitor;
@@ -28,7 +33,6 @@ class FileRequest;
 class MetadataHelper;
 
 class LockedFile : public nsDOMEventTargetHelper,
-                   public nsIDOMLockedFile,
                    public nsIRunnable
 {
   friend class FinishHelper;
@@ -38,7 +42,6 @@ class LockedFile : public nsDOMEventTargetHelper,
 
 public:
   NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIDOMLOCKEDFILE
   NS_DECL_NSIRUNNABLE
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(LockedFile, nsDOMEventTargetHelper)
@@ -91,6 +94,94 @@ public:
   OpenInputStream(bool aWholeFile, uint64_t aStart, uint64_t aLength,
                   nsIInputStream** aResult);
 
+  // WrapperCache
+  nsPIDOMWindow* GetParentObject() const
+  {
+    return GetOwner();
+  }
+
+  virtual JSObject*
+  WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+  // WebIDL
+  FileHandle* GetFileHandle() const
+  {
+    return Handle();
+  }
+
+  FileMode Mode() const
+  {
+    return mMode;
+  }
+
+  bool Active() const
+  {
+    return IsOpen();
+  }
+
+  Nullable<uint64_t> GetLocation() const
+  {
+    if (mLocation == UINT64_MAX) {
+      return Nullable<uint64_t>();
+    }
+    return Nullable<uint64_t>(mLocation);
+  }
+
+  void SetLocation(const Nullable<uint64_t>& aLocation)
+  {
+    // Null means the end-of-file.
+    if (aLocation.IsNull()) {
+      mLocation = UINT64_MAX;
+    } else {
+      mLocation = aLocation.Value();
+    }
+  }
+
+  already_AddRefed<FileRequest>
+  GetMetadata(const DOMFileMetadataParameters& aParameters, ErrorResult& aRv);
+
+  already_AddRefed<FileRequest>
+  ReadAsArrayBuffer(uint64_t aSize, ErrorResult& aRv);
+
+  already_AddRefed<FileRequest>
+  ReadAsText(uint64_t aSize, const nsAString& aEncoding, ErrorResult& aRv);
+
+  template<class T>
+  already_AddRefed<FileRequest>
+  Write(const T& aValue, ErrorResult& aRv)
+  {
+    uint64_t length;
+    nsCOMPtr<nsIInputStream> stream = GetInputStream(aValue, &length, aRv);
+    if (aRv.Failed()) {
+      return nullptr;
+    }
+    return Write(stream, length, aRv);
+  }
+
+  template<class T>
+  already_AddRefed<FileRequest>
+  Append(const T& aValue, ErrorResult& aRv)
+  {
+    uint64_t length;
+    nsCOMPtr<nsIInputStream> stream = GetInputStream(aValue, &length, aRv);
+    if (aRv.Failed()) {
+      return nullptr;
+    }
+    return Append(stream, length, aRv);
+  }
+
+  already_AddRefed<FileRequest>
+  Truncate(const Optional<uint64_t>& aSize, ErrorResult& aRv);
+
+  already_AddRefed<FileRequest>
+  Flush(ErrorResult& aRv);
+
+  void Abort(ErrorResult& aRv);
+
+  IMPL_EVENT_HANDLER(complete)
+  IMPL_EVENT_HANDLER(abort)
+  IMPL_EVENT_HANDLER(error)
+
 private:
   LockedFile();
   ~LockedFile();
@@ -101,16 +192,40 @@ private:
   void
   OnRequestFinished();
 
+  bool CheckStateAndArgumentsForRead(uint64_t aSize, ErrorResult& aRv);
+  bool CheckStateForWrite(ErrorResult& aRv);
+
   already_AddRefed<FileRequest>
   GenerateFileRequest();
 
-  nsresult
-  WriteOrAppend(JS::Handle<JS::Value> aValue, JSContext* aCx,
-                nsISupports** _retval, bool aAppend);
+  already_AddRefed<FileRequest>
+  Write(nsIInputStream* aInputStream, uint64_t aInputLength, ErrorResult& aRv)
+  {
+    return WriteOrAppend(aInputStream, aInputLength, false, aRv);
+  }
+
+  already_AddRefed<FileRequest>
+  Append(nsIInputStream* aInputStream, uint64_t aInputLength, ErrorResult& aRv)
+  {
+    return WriteOrAppend(aInputStream, aInputLength, true, aRv);
+  }
+
+  already_AddRefed<FileRequest>
+  WriteOrAppend(nsIInputStream* aInputStream, uint64_t aInputLength,
+                bool aAppend, ErrorResult& aRv);
 
   nsresult
   Finish();
 
+  static already_AddRefed<nsIInputStream>
+  GetInputStream(const ArrayBuffer& aValue, uint64_t* aInputLength,
+                 ErrorResult& aRv);
+  static already_AddRefed<nsIInputStream>
+  GetInputStream(nsIDOMBlob* aValue, uint64_t* aInputLength, ErrorResult& aRv);
+  static already_AddRefed<nsIInputStream>
+  GetInputStream(const nsAString& aValue, uint64_t* aInputLength,
+                 ErrorResult& aRv);
+
   nsRefPtr<FileHandle> mFileHandle;
   ReadyState mReadyState;
   FileMode mMode;
diff --git a/dom/file/moz.build b/dom/file/moz.build
index 5418baa3032..7dbcd85f0b6 100644
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -6,12 +6,6 @@
 
 TEST_DIRS += ['test']
 
-XPIDL_SOURCES += [
-    'nsIDOMLockedFile.idl',
-]
-
-XPIDL_MODULE = 'dom_file'
-
 EXPORTS += [
     'nsIFileStorage.h',
 ]
diff --git a/dom/file/nsIDOMLockedFile.idl b/dom/file/nsIDOMLockedFile.idl
deleted file mode 100644
index 6532f1fb9fc..00000000000
--- a/dom/file/nsIDOMLockedFile.idl
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsIDOMEventListener;
-
-[scriptable, builtinclass, uuid(a09cdc35-6b1e-42ce-95bb-f8f10a354202)]
-interface nsIDOMLockedFile : nsISupports
-{
-  readonly attribute nsISupports /* FileHandle */ fileHandle;
-
-  // "readonly" or "readwrite"
-  readonly attribute DOMString mode;
-
-  readonly attribute boolean active;
-
-  [implicit_jscontext]
-  attribute jsval location;
-
-  [implicit_jscontext]
-  nsISupports /* FileRequest */
-  getMetadata(/* DOMFileMetadataParameters */
-              [optional /* all */] in jsval parameters);
-
-  [implicit_jscontext]
-  nsISupports /* FileRequest */
-  readAsArrayBuffer(in unsigned long long size);
-
-  nsISupports /* FileRequest */
-  readAsText(in unsigned long long size,
-             [optional] in DOMString encoding);
-
-  [implicit_jscontext]
-  nsISupports /* FileRequest */
-  write(in jsval value);
-
-  [implicit_jscontext]
-  nsISupports /* FileRequest */
-  append(in jsval value);
-
-  [optional_argc]
-  nsISupports /* FileRequest */
-  truncate([optional] in unsigned long long size);
-
-  nsISupports /* FileRequest */
-  flush();
-
-  void
-  abort();
-
-  [implicit_jscontext] attribute jsval oncomplete;
-
-  [implicit_jscontext] attribute jsval onabort;
-
-  [implicit_jscontext] attribute jsval onerror;
-};
diff --git a/dom/network/src/NetworkStatsManager.js b/dom/network/src/NetworkStatsManager.js
index 51e60fce017..969f8e3545e 100644
--- a/dom/network/src/NetworkStatsManager.js
+++ b/dom/network/src/NetworkStatsManager.js
@@ -98,7 +98,7 @@ function NetworkStats(aWindow, aStats) {
   this.start = aStats.start ? new aWindow.Date(aStats.start.getTime()) : null;
   this.end = aStats.end ? new aWindow.Date(aStats.end.getTime()) : null;
 
-  let samples = this.data = Cu.createArrayIn(aWindow);
+  let samples = this.data = new aWindow.Array();
   for (let i = 0; i < aStats.data.length; i++) {
     samples.push(new NetworkStatsData(aWindow, aStats.data[i]));
   }
@@ -342,7 +342,7 @@ NetworkStatsManager.prototype = {
           return;
         }
 
-        let networks = Cu.createArrayIn(this._window);
+        let networks = new this._window.Array();
         for (let i = 0; i < msg.result.length; i++) {
           networks.push(new NetworkStatsInterface(msg.result[i]));
         }
@@ -356,7 +356,7 @@ NetworkStatsManager.prototype = {
           return;
         }
 
-        let serviceTypes = Cu.createArrayIn(this._window);
+        let serviceTypes = new this._window.Array();
         for (let i = 0; i < msg.result.length; i++) {
           serviceTypes.push(msg.result[i]);
         }
@@ -390,7 +390,7 @@ NetworkStatsManager.prototype = {
           return;
         }
 
-        let alarms = Cu.createArrayIn(this._window);
+        let alarms = new this._window.Array();
         for (let i = 0; i < msg.result.length; i++) {
           alarms.push(new NetworkStatsAlarm(msg.result[i]));
         }
diff --git a/dom/webidl/CanvasRenderingContext2D.webidl b/dom/webidl/CanvasRenderingContext2D.webidl
index e8941e32a2f..8815d8f5eb5 100644
--- a/dom/webidl/CanvasRenderingContext2D.webidl
+++ b/dom/webidl/CanvasRenderingContext2D.webidl
@@ -316,7 +316,8 @@ interface TextMetrics {
 
 [Pref="canvas.path.enabled",
  Constructor,
- Constructor(Path2D other)]
+ Constructor(Path2D other),
+ Constructor(DOMString pathString)]
 interface Path2D
 {};
 Path2D implements CanvasPathMethods;
diff --git a/dom/webidl/FileHandle.webidl b/dom/webidl/FileHandle.webidl
index 5e8212a6284..a35bcbb1c0a 100644
--- a/dom/webidl/FileHandle.webidl
+++ b/dom/webidl/FileHandle.webidl
@@ -3,8 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-interface LockedFile;
-
 interface FileHandle : EventTarget {
   readonly attribute DOMString name;
   readonly attribute DOMString type;
diff --git a/dom/webidl/FileRequest.webidl b/dom/webidl/FileRequest.webidl
index e052dc845ee..3a9927b9354 100644
--- a/dom/webidl/FileRequest.webidl
+++ b/dom/webidl/FileRequest.webidl
@@ -4,8 +4,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-interface LockedFile;
-
 interface FileRequest : DOMRequest {
   readonly attribute LockedFile? lockedFile;
 
diff --git a/dom/webidl/LockedFile.webidl b/dom/webidl/LockedFile.webidl
index cc42a8662b7..b1cf1dd517a 100644
--- a/dom/webidl/LockedFile.webidl
+++ b/dom/webidl/LockedFile.webidl
@@ -7,3 +7,42 @@ dictionary DOMFileMetadataParameters
   boolean size = true;
   boolean lastModified = true;
 };
+
+interface LockedFile : EventTarget
+{
+  readonly attribute FileHandle? fileHandle;
+  readonly attribute FileMode mode;
+  readonly attribute boolean active;
+  attribute unsigned long long? location;
+
+  [Throws]
+  FileRequest? getMetadata(optional DOMFileMetadataParameters parameters);
+  [Throws]
+  FileRequest? readAsArrayBuffer(unsigned long long size);
+  [Throws]
+  FileRequest? readAsText(unsigned long long size,
+                         optional DOMString? encoding = null);
+
+  [Throws]
+  FileRequest? write(ArrayBuffer value);
+  [Throws]
+  FileRequest? write(Blob value);
+  [Throws]
+  FileRequest? write(DOMString value);
+  [Throws]
+  FileRequest? append(ArrayBuffer value);
+  [Throws]
+  FileRequest? append(Blob value);
+  [Throws]
+  FileRequest? append(DOMString value);
+  [Throws]
+  FileRequest? truncate(optional unsigned long long size);
+  [Throws]
+  FileRequest? flush();
+  [Throws]
+  void abort();
+
+  attribute EventHandler oncomplete;
+  attribute EventHandler onabort;
+  attribute EventHandler onerror;
+};
diff --git a/embedding/test/test_window_open_position_constraint.html b/embedding/test/test_window_open_position_constraint.html
index d0012b07940..d2c777c74b3 100644
--- a/embedding/test/test_window_open_position_constraint.html
+++ b/embedding/test/test_window_open_position_constraint.html
@@ -27,28 +27,27 @@ SimpleTest.waitForFocus(function() {
     x = w1.screenX;
     y = w1.screenY;
     w1.close();
+
+    // larger window dimensions should result in a shift of the constrained location
+    var w2 = window.open("about:blank", "", "left=16000,top=16000,width=150,height=150");
+    SimpleTest.waitForFocus(function() {
+      ok(w2.screenX == x - 50 && w2.screenY == y - 50,
+         "constrained window position did not depend on size as expected: got " +
+         w2.screenX + "," + w2.screenY + ", expected " + (x - 50) + "," + (y - 50));
+      w2.close();
+
+      // now try with coordinates that are close to MAXINT,
+      // so adding width/height risks 32-bit integer overflow
+      var w3 = window.open("about:blank", "", "left=2147483600,top=2147483600,width=100,height=100");
+      SimpleTest.waitForFocus(function() {
+        ok(w3.screenX < 10000 && w3.screenY < 10000,
+           "window should not be opened off-screen: got location " +
+           w3.screenX + "," + w3.screenY);
+        w3.close();
+        SimpleTest.finish();
+      }, w3, true);
+    }, w2, true);
   }, w1, true);
-
-  // larger window dimensions should result in a shift of the constrained location
-  var w2 = window.open("about:blank", "", "left=16000,top=16000,width=150,height=150");
-  SimpleTest.waitForFocus(function() {
-    ok(w2.screenX == x - 50 && w2.screenY == y - 50,
-       "constrained window position did not depend on size as expected: got " +
-       w2.screenX + "," + w2.screenY + ", expected " + (x - 50) + "," + (y - 50));
-    w2.close();
-  }, w2, true);
-
-  // now try with coordinates that are close to MAXINT,
-  // so adding width/height risks 32-bit integer overflow
-  var w3 = window.open("about:blank", "", "left=2147483600,top=2147483600,width=100,height=100");
-  SimpleTest.waitForFocus(function() {
-    ok(w3.screenX < 10000 && w3.screenY < 10000,
-       "window should not be opened off-screen: got location " +
-       w3.screenX + "," + w3.screenY);
-    w3.close();
-    SimpleTest.finish();
-  }, w3, true);
-
 }, window, false);
 
 </script>
diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
index 70297a4b7af..964296e4818 100644
--- a/gfx/2d/DrawTargetSkia.cpp
+++ b/gfx/2d/DrawTargetSkia.cpp
@@ -664,6 +664,8 @@ DrawTargetSkia::InitWithGrContext(GrContext* aGrContext,
                                   const IntSize &aSize,
                                   SurfaceFormat aFormat)
 {
+  MOZ_ASSERT(aGrContext, "null GrContext");
+
   mGrContext = aGrContext;
 
   mSize = aSize;
diff --git a/gfx/cairo/cairo/src/cairo-image-surface.c b/gfx/cairo/cairo/src/cairo-image-surface.c
index a655f4d67f4..6fed589e908 100644
--- a/gfx/cairo/cairo/src/cairo-image-surface.c
+++ b/gfx/cairo/cairo/src/cairo-image-surface.c
@@ -4009,7 +4009,9 @@ _composite_glyphs (void				*closure,
 		y2 = extents->y + extents->height;
 
 	    if (glyph_surface->format == CAIRO_FORMAT_A8 ||
-	        glyph_surface->format == CAIRO_FORMAT_A1)
+	        glyph_surface->format == CAIRO_FORMAT_A1 ||
+	        (glyph_surface->format == CAIRO_FORMAT_ARGB32 &&
+	         pixman_image_get_component_alpha (glyph_surface->pixman_image)))
 	    {
 		if (unlikely (src == NULL)) {
 		    if (pattern != NULL) {
diff --git a/ipc/nfc/Nfc.cpp b/ipc/nfc/Nfc.cpp
index 37ec894002e..cc6189f6d45 100644
--- a/ipc/nfc/Nfc.cpp
+++ b/ipc/nfc/Nfc.cpp
@@ -75,16 +75,17 @@ private:
 bool
 PostToNFC(JSContext* aCx,
           unsigned aArgc,
-          JS::Value* aArgv)
+          JS::Value* aVp)
 {
+    JS::CallArgs args = JS::CallArgsFromVp(aArgc, aVp);
     NS_ASSERTION(!NS_IsMainThread(), "Expecting to be on the worker thread");
 
-    if (aArgc != 1) {
+    if (args.length() != 1) {
         JS_ReportError(aCx, "Expecting one argument with the NFC message");
         return false;
     }
 
-    JS::Value v = JS_ARGV(aCx, aArgv)[0];
+    JS::Value v = args[0];
 
     JSAutoByteString abs;
     void* data;
diff --git a/ipc/ril/Ril.cpp b/ipc/ril/Ril.cpp
index 52c9663a502..84f9b16ad7a 100644
--- a/ipc/ril/Ril.cpp
+++ b/ipc/ril/Ril.cpp
@@ -79,19 +79,18 @@ private:
 bool
 PostToRIL(JSContext *aCx,
           unsigned aArgc,
-          JS::Value *aArgv)
+          JS::Value *aVp)
 {
+    JS::CallArgs args = JS::CallArgsFromVp(aArgc, aVp);
     NS_ASSERTION(!NS_IsMainThread(), "Expecting to be on the worker thread");
 
-    if (aArgc != 2) {
+    if (args.length() != 2) {
         JS_ReportError(aCx, "Expecting two arguments with the RIL message");
         return false;
     }
 
-    JS::Value cv = JS_ARGV(aCx, aArgv)[0];
-    int clientId = cv.toInt32();
-
-    JS::Value v = JS_ARGV(aCx, aArgv)[1];
+    int clientId = args[0].toInt32();
+    JS::Value v = args[1];
 
     JSAutoByteString abs;
     void *data;
diff --git a/js/src/builtin/Intl.cpp b/js/src/builtin/Intl.cpp
index 03f4c9e15c5..29dda165de0 100644
--- a/js/src/builtin/Intl.cpp
+++ b/js/src/builtin/Intl.cpp
@@ -563,7 +563,8 @@ static const Class CollatorClass = {
 static bool
 collator_toSource(JSContext *cx, unsigned argc, Value *vp)
 {
-    vp->setString(cx->names().Collator);
+    CallArgs args = CallArgsFromVp(argc, vp);
+    args.rval().setString(cx->names().Collator);
     return true;
 }
 #endif
@@ -1049,7 +1050,8 @@ static const Class NumberFormatClass = {
 static bool
 numberFormat_toSource(JSContext *cx, unsigned argc, Value *vp)
 {
-    vp->setString(cx->names().NumberFormat);
+    CallArgs args = CallArgsFromVp(argc, vp);
+    args.rval().setString(cx->names().NumberFormat);
     return true;
 }
 #endif
@@ -1507,7 +1509,8 @@ static const Class DateTimeFormatClass = {
 static bool
 dateTimeFormat_toSource(JSContext *cx, unsigned argc, Value *vp)
 {
-    vp->setString(cx->names().DateTimeFormat);
+    CallArgs args = CallArgsFromVp(argc, vp);
+    args.rval().setString(cx->names().DateTimeFormat);
     return true;
 }
 #endif
@@ -1990,7 +1993,8 @@ const Class js::IntlClass = {
 static bool
 intl_toSource(JSContext *cx, unsigned argc, Value *vp)
 {
-    vp->setString(cx->names().Intl);
+    CallArgs args = CallArgsFromVp(argc, vp);
+    args.rval().setString(cx->names().Intl);
     return true;
 }
 #endif
diff --git a/js/src/builtin/Object.cpp b/js/src/builtin/Object.cpp
index a1ad7027973..5a5739a7257 100644
--- a/js/src/builtin/Object.cpp
+++ b/js/src/builtin/Object.cpp
@@ -73,7 +73,7 @@ obj_propertyIsEnumerable(JSContext *cx, unsigned argc, Value *vp)
     }
 
     if (pobj != obj) {
-        vp->setBoolean(false);
+        args.rval().setBoolean(false);
         return true;
     }
 
@@ -703,13 +703,13 @@ obj_isPrototypeOf(JSContext *cx, unsigned argc, Value *vp)
 static bool
 obj_create(JSContext *cx, unsigned argc, Value *vp)
 {
-    if (argc == 0) {
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() == 0) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "Object.create", "0", "s");
         return false;
     }
 
-    CallArgs args = CallArgsFromVp(argc, vp);
     RootedValue v(cx, args[0]);
     if (!v.isObjectOrNull()) {
         char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, NullPtr());
diff --git a/js/src/builtin/SIMD.cpp b/js/src/builtin/SIMD.cpp
index ec6248e06ef..ff8d2faa654 100644
--- a/js/src/builtin/SIMD.cpp
+++ b/js/src/builtin/SIMD.cpp
@@ -527,7 +527,7 @@ Func(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (argc == 1) {
+    if (args.length() == 1) {
         if((!args[0].isObject() || !ObjectIsVector<V>(args[0].toObject()))) {
             JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
             return false;
@@ -546,7 +546,7 @@ Func(JSContext *cx, unsigned argc, Value *vp)
         args.rval().setObject(*obj);
         return true;
 
-    } else if (argc == 2) {
+    } else if (args.length() == 2) {
         if((!args[0].isObject() || !ObjectIsVector<V>(args[0].toObject())) ||
            (!args[1].isObject() || !ObjectIsVector<V>(args[1].toObject())))
         {
@@ -583,7 +583,7 @@ FuncWith(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if ((argc != 2) ||
+    if ((args.length() != 2) ||
         (!args[0].isObject() || !ObjectIsVector<V>(args[0].toObject())) ||
         (!args[1].isNumber() && !args[1].isBoolean()))
     {
@@ -619,7 +619,7 @@ FuncShuffle(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if(argc == 2){
+    if (args.length() == 2) {
         if ((!args[0].isObject() || !ObjectIsVector<V>(args[0].toObject())) ||
             (!args[1].isNumber()))
         {
@@ -642,7 +642,7 @@ FuncShuffle(JSContext *cx, unsigned argc, Value *vp)
 
         args.rval().setObject(*obj);
         return true;
-    } else if (argc == 3){
+    } else if (args.length() == 3) {
         if ((!args[0].isObject() || !ObjectIsVector<V>(args[0].toObject())) ||
             (!args[1].isObject() || !ObjectIsVector<V>(args[1].toObject())) ||
             (!args[2].isNumber()))
@@ -684,7 +684,7 @@ FuncConvert(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if ((argc != 1) ||
+    if ((args.length() != 1) ||
        (!args[0].isObject() || !ObjectIsVector<V>(args[0].toObject())))
     {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
@@ -711,7 +711,7 @@ FuncConvertBits(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if ((argc != 1) ||
+    if ((args.length() != 1) ||
        (!args[0].isObject() || !ObjectIsVector<V>(args[0].toObject())))
     {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
@@ -735,7 +735,7 @@ FuncZero(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (argc != 0) {
+    if (args.length() != 0) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
         return false;
     }
@@ -757,7 +757,7 @@ FuncSplat(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if ((argc != 1) || (!args[0].isNumber())) {
+    if ((args.length() != 1) || (!args[0].isNumber())) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
         return false;
     }
@@ -781,7 +781,7 @@ Int32x4Bool(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if ((argc != 4) ||
+    if ((args.length() != 4) ||
         (!args[0].isBoolean()) || !args[1].isBoolean() ||
         (!args[2].isBoolean()) || !args[3].isBoolean())
     {
@@ -805,7 +805,7 @@ Float32x4Clamp(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if ((argc != 3) ||
+    if ((args.length() != 3) ||
         (!args[0].isObject() || !ObjectIsVector<Float32x4>(args[0].toObject())) ||
         (!args[1].isObject() || !ObjectIsVector<Float32x4>(args[1].toObject())) ||
         (!args[2].isObject() || !ObjectIsVector<Float32x4>(args[2].toObject())))
@@ -842,7 +842,7 @@ Int32x4Select(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if ((argc != 3) ||
+    if ((args.length() != 3) ||
         (!args[0].isObject() || !ObjectIsVector<Int32x4>(args[0].toObject())) ||
         (!args[1].isObject() || !ObjectIsVector<Float32x4>(args[1].toObject())) ||
         (!args[2].isObject() || !ObjectIsVector<Float32x4>(args[2].toObject())))
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index c2649e5918f..d18f22e4f73 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -39,6 +39,7 @@ static bool fuzzingSafe = false;
 static bool
 GetBuildConfiguration(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     RootedObject info(cx, JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr()));
     if (!info)
         return false;
@@ -196,13 +197,15 @@ GetBuildConfiguration(JSContext *cx, unsigned argc, jsval *vp)
     if (!JS_SetProperty(cx, info, "binary-data", value))
         return false;
 
-    *vp = ObjectValue(*info);
+    args.rval().setObject(*info);
     return true;
 }
 
 static bool
 GC(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
+
     /*
      * If the first argument is 'compartment', we collect any compartments
      * previously scheduled for GC via schedulegc. If the first argument is an
@@ -210,8 +213,8 @@ GC(JSContext *cx, unsigned argc, jsval *vp)
      * scheduled for GC). Otherwise, we collect all compartments.
      */
     bool compartment = false;
-    if (argc == 1) {
-        Value arg = vp[2];
+    if (args.length() == 1) {
+        Value arg = args[0];
         if (arg.isString()) {
             if (!JS_StringEqualsAscii(cx, arg.toString(), "compartment", &compartment))
                 return false;
@@ -239,7 +242,7 @@ GC(JSContext *cx, unsigned argc, jsval *vp)
     JSString *str = JS_NewStringCopyZ(cx, buf);
     if (!str)
         return false;
-    *vp = STRING_TO_JSVAL(str);
+    args.rval().setString(str);
     return true;
 }
 
@@ -345,7 +348,7 @@ static bool
 IsProxy(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (argc != 1) {
+    if (args.length() != 1) {
         JS_ReportError(cx, "the function takes exactly one argument");
         return false;
     }
@@ -361,7 +364,7 @@ static bool
 IsLazyFunction(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (argc != 1) {
+    if (args.length() != 1) {
         JS_ReportError(cx, "The function takes exactly one argument.");
         return false;
     }
@@ -377,7 +380,7 @@ static bool
 IsRelazifiableFunction(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (argc != 1) {
+    if (args.length() != 1) {
         JS_ReportError(cx, "The function takes exactly one argument.");
         return false;
     }
@@ -410,7 +413,7 @@ InternalConst(JSContext *cx, unsigned argc, jsval *vp)
         return false;
 
     if (JS_FlatStringEqualsAscii(flat, "INCREMENTAL_MARK_STACK_BASE_CAPACITY")) {
-        vp[0] = UINT_TO_JSVAL(js::INCREMENTAL_MARK_STACK_BASE_CAPACITY);
+        args.rval().setNumber(uint32_t(js::INCREMENTAL_MARK_STACK_BASE_CAPACITY));
     } else {
         JS_ReportError(cx, "unknown const name");
         return false;
@@ -423,7 +426,7 @@ GCPreserveCode(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (argc != 0) {
+    if (args.length() != 0) {
         RootedObject callee(cx, &args.callee());
         ReportUsageError(cx, callee, "Wrong number of arguments");
         return false;
@@ -431,7 +434,7 @@ GCPreserveCode(JSContext *cx, unsigned argc, jsval *vp)
 
     cx->runtime()->alwaysPreserveCode = true;
 
-    *vp = JSVAL_VOID;
+    args.rval().setUndefined();
     return true;
 }
 
@@ -467,7 +470,7 @@ ScheduleGC(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (argc != 1) {
+    if (args.length() != 1) {
         RootedObject callee(cx, &args.callee());
         ReportUsageError(cx, callee, "Wrong number of arguments");
         return false;
@@ -525,13 +528,14 @@ VerifyPreBarriers(JSContext *cx, unsigned argc, jsval *vp)
 static bool
 VerifyPostBarriers(JSContext *cx, unsigned argc, jsval *vp)
 {
-    if (argc) {
-        RootedObject callee(cx, &JS_CALLEE(cx, vp).toObject());
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length()) {
+        RootedObject callee(cx, &args.callee());
         ReportUsageError(cx, callee, "Too many arguments");
         return false;
     }
     gc::VerifyBarriers(cx->runtime(), gc::PostBarrierVerifier);
-    *vp = JSVAL_VOID;
+    args.rval().setUndefined();
     return true;
 }
 
@@ -540,7 +544,7 @@ GCState(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (argc != 0) {
+    if (args.length() != 0) {
         RootedObject callee(cx, &args.callee());
         ReportUsageError(cx, callee, "Too many arguments");
         return false;
@@ -560,7 +564,7 @@ GCState(JSContext *cx, unsigned argc, jsval *vp)
     JSString *str = JS_NewStringCopyZ(cx, state);
     if (!str)
         return false;
-    *vp = StringValue(str);
+    args.rval().setString(str);
     return true;
 }
 
@@ -643,7 +647,7 @@ NondeterministicGetWeakMapKeys(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (argc != 1) {
+    if (args.length() != 1) {
         RootedObject callee(cx, &args.callee());
         ReportUsageError(cx, callee, "Wrong number of arguments");
         return false;
@@ -827,7 +831,7 @@ CountHeap(JSContext *cx, unsigned argc, jsval *vp)
         return false;
     }
 
-    *vp = JS_NumberValue((double) counter);
+    args.rval().setNumber(double(counter));
     return true;
 }
 
@@ -873,6 +877,7 @@ static const JSClass FinalizeCounterClass = {
 static bool
 MakeFinalizeObserver(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     RootedObject scope(cx, JS::CurrentGlobalOrNull(cx));
     if (!scope)
         return false;
@@ -881,14 +886,15 @@ MakeFinalizeObserver(JSContext *cx, unsigned argc, jsval *vp)
     if (!obj)
         return false;
 
-    *vp = OBJECT_TO_JSVAL(obj);
+    args.rval().setObject(*obj);
     return true;
 }
 
 static bool
 FinalizeCount(JSContext *cx, unsigned argc, jsval *vp)
 {
-    *vp = INT_TO_JSVAL(finalizeCount);
+    CallArgs args = CallArgsFromVp(argc, vp);
+    args.rval().setInt32(finalizeCount);
     return true;
 }
 
@@ -901,7 +907,7 @@ DumpHeapComplete(JSContext *cx, unsigned argc, jsval *vp)
     FILE *dumpFile = nullptr;
 
     unsigned i = 0;
-    if (argc > i) {
+    if (args.length() > i) {
         Value v = args[i];
         if (v.isString()) {
             JSString *str = v.toString();
@@ -915,7 +921,7 @@ DumpHeapComplete(JSContext *cx, unsigned argc, jsval *vp)
         }
     }
 
-    if (argc > i) {
+    if (args.length() > i) {
         Value v = args[i];
         if (v.isString()) {
             if (!fuzzingSafe) {
@@ -934,7 +940,7 @@ DumpHeapComplete(JSContext *cx, unsigned argc, jsval *vp)
         }
     }
 
-    if (i != argc) {
+    if (i != args.length()) {
         JS_ReportError(cx, "bad arguments passed to dumpHeapComplete");
         return false;
     }
@@ -944,7 +950,7 @@ DumpHeapComplete(JSContext *cx, unsigned argc, jsval *vp)
     if (dumpFile)
         fclose(dumpFile);
 
-    JS_SET_RVAL(cx, vp, JSVAL_VOID);
+    args.rval().setUndefined();
     return true;
 }
 
@@ -965,7 +971,7 @@ static bool
 EnableSPSProfilingAssertions(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (argc == 0 || !args[0].isBoolean()) {
+    if (!args.get(0).isBoolean()) {
         RootedObject arg(cx, &args.callee());
         ReportUsageError(cx, arg, "Must have one boolean argument");
         return false;
@@ -978,7 +984,7 @@ EnableSPSProfilingAssertions(JSContext *cx, unsigned argc, jsval *vp)
     cx->runtime()->spsProfiler.enableSlowAssertions(args[0].toBoolean());
     cx->runtime()->spsProfiler.enable(true);
 
-    JS_SET_RVAL(cx, vp, JSVAL_VOID);
+    args.rval().setUndefined();
     return true;
 }
 
@@ -991,12 +997,13 @@ DisableSPSProfiling(JSContext *cx, unsigned argc, jsval *vp)
 }
 
 static bool
-EnableOsiPointRegisterChecks(JSContext *, unsigned, jsval *vp)
+EnableOsiPointRegisterChecks(JSContext *, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
 #if defined(JS_ION) && defined(CHECK_OSIPOINT_REGISTERS)
     jit::js_JitOptions.checkOsiPointRegisters = true;
 #endif
-    JS_SET_RVAL(cx, vp, JSVAL_VOID);
+    args.rval().setUndefined();
     return true;
 }
 
@@ -1004,7 +1011,7 @@ static bool
 DisplayName(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (argc == 0 || !args[0].isObject() || !args[0].toObject().is<JSFunction>()) {
+    if (!args.get(0).isObject() || !args[0].toObject().is<JSFunction>()) {
         RootedObject arg(cx, &args.callee());
         ReportUsageError(cx, arg, "Must have one function argument");
         return false;
@@ -1012,17 +1019,19 @@ DisplayName(JSContext *cx, unsigned argc, jsval *vp)
 
     JSFunction *fun = &args[0].toObject().as<JSFunction>();
     JSString *str = fun->displayAtom();
-    vp->setString(str == nullptr ? cx->runtime()->emptyString : str);
+    args.rval().setString(str ? str : cx->runtime()->emptyString);
     return true;
 }
 
 bool
 js::testingFunc_inParallelSection(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
+
     // If we were actually *in* a parallel section, then this function
     // would be inlined to TRUE in ion-generated code.
     JS_ASSERT(!InParallelSection());
-    JS_SET_RVAL(cx, vp, JSVAL_FALSE);
+    args.rval().setBoolean(false);
     return true;
 }
 
@@ -1073,7 +1082,7 @@ SetObjectMetadataCallback(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    bool enabled = argc ? ToBoolean(args[0]) : false;
+    bool enabled = args.length() ? ToBoolean(args[0]) : false;
     SetObjectMetadataCallback(cx, enabled ? ShellObjectMetadataCallback : nullptr);
 
     args.rval().setUndefined();
@@ -1084,7 +1093,7 @@ static bool
 SetObjectMetadata(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (argc != 2 || !args[0].isObject() || !args[1].isObject()) {
+    if (args.length() != 2 || !args[0].isObject() || !args[1].isObject()) {
         JS_ReportError(cx, "Both arguments must be objects");
         return false;
     }
@@ -1100,7 +1109,7 @@ static bool
 GetObjectMetadata(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (argc != 1 || !args[0].isObject()) {
+    if (args.length() != 1 || !args[0].isObject()) {
         JS_ReportError(cx, "Argument must be an object");
         return false;
     }
@@ -1112,16 +1121,20 @@ GetObjectMetadata(JSContext *cx, unsigned argc, jsval *vp)
 bool
 js::testingFunc_bailout(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
+
     // NOP when not in IonMonkey
-    JS_SET_RVAL(cx, vp, JSVAL_VOID);
+    args.rval().setUndefined();
     return true;
 }
 
 bool
 js::testingFunc_assertFloat32(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
+
     // NOP when not in IonMonkey
-    JS_SET_RVAL(cx, vp, JSVAL_VOID);
+    args.rval().setUndefined();
     return true;
 }
 
@@ -1175,6 +1188,7 @@ SetJitCompilerOption(JSContext *cx, unsigned argc, jsval *vp)
 static bool
 GetJitCompilerOptions(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     RootedObject info(cx, JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr()));
     if (!info)
         return false;
@@ -1191,7 +1205,7 @@ GetJitCompilerOptions(JSContext *cx, unsigned argc, jsval *vp)
     JIT_COMPILER_OPTIONS(JIT_COMPILER_MATCH);
 #undef JIT_COMPILER_MATCH
 
-    *vp = ObjectValue(*info);
+    args.rval().setObject(*info);
 
     return true;
 }
diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp
index 646a9561793..76c84174f3e 100644
--- a/js/src/builtin/TypedObject.cpp
+++ b/js/src/builtin/TypedObject.cpp
@@ -2651,7 +2651,7 @@ bool
 js::SetTypedObjectOffset(ThreadSafeContext *, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    JS_ASSERT(argc == 2);
+    JS_ASSERT(args.length() == 2);
     JS_ASSERT(args[0].isObject() && args[0].toObject().is<TypedObject>());
     JS_ASSERT(args[1].isInt32());
 
diff --git a/js/src/ctypes/Library.cpp b/js/src/ctypes/Library.cpp
index b9da8c3ddc5..325186dee4b 100644
--- a/js/src/ctypes/Library.cpp
+++ b/js/src/ctypes/Library.cpp
@@ -50,19 +50,20 @@ static const JSFunctionSpec sLibraryFunctions[] = {
 bool
 Library::Name(JSContext* cx, unsigned argc, jsval *vp)
 {
-  if (argc != 1) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  if (args.length() != 1) {
     JS_ReportError(cx, "libraryName takes one argument");
     return false;
   }
 
-  jsval arg = JS_ARGV(cx, vp)[0];
+  Value arg = args[0];
   JSString* str = nullptr;
   if (JSVAL_IS_STRING(arg)) {
     str = JSVAL_TO_STRING(arg);
   }
   else {
     JS_ReportError(cx, "name argument must be a string");
-      return false;
+    return false;
   }
 
   AutoString resultString;
@@ -75,7 +76,7 @@ Library::Name(JSContext* cx, unsigned argc, jsval *vp)
   if (!result)
     return false;
 
-  JS_SET_RVAL(cx, vp, STRING_TO_JSVAL(result));
+  args.rval().setString(result);
   return true;
 }
 
@@ -198,6 +199,7 @@ Library::Finalize(JSFreeOp *fop, JSObject* obj)
 bool
 Library::Open(JSContext* cx, unsigned argc, jsval *vp)
 {
+  CallArgs args = CallArgsFromVp(argc, vp);
   JSObject* ctypesObj = JS_THIS_OBJECT(cx, vp);
   if (!ctypesObj)
     return false;
@@ -206,22 +208,23 @@ Library::Open(JSContext* cx, unsigned argc, jsval *vp)
     return false;
   }
 
-  if (argc != 1 || JSVAL_IS_VOID(JS_ARGV(cx, vp)[0])) {
+  if (args.length() != 1 || args[0].isUndefined()) {
     JS_ReportError(cx, "open requires a single argument");
     return false;
   }
 
-  JSObject* library = Create(cx, JS_ARGV(cx, vp)[0], GetCallbacks(ctypesObj));
+  JSObject* library = Create(cx, args[0], GetCallbacks(ctypesObj));
   if (!library)
     return false;
 
-  JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(library));
+  args.rval().setObject(*library);
   return true;
 }
 
 bool
 Library::Close(JSContext* cx, unsigned argc, jsval* vp)
 {
+  CallArgs args = CallArgsFromVp(argc, vp);
   JSObject* obj = JS_THIS_OBJECT(cx, vp);
   if (!obj)
     return false;
@@ -230,7 +233,7 @@ Library::Close(JSContext* cx, unsigned argc, jsval* vp)
     return false;
   }
 
-  if (argc != 0) {
+  if (args.length() != 0) {
     JS_ReportError(cx, "close doesn't take any arguments");
     return false;
   }
@@ -239,13 +242,14 @@ Library::Close(JSContext* cx, unsigned argc, jsval* vp)
   UnloadLibrary(obj);
   JS_SetReservedSlot(obj, SLOT_LIBRARY, PRIVATE_TO_JSVAL(nullptr));
 
-  JS_SET_RVAL(cx, vp, JSVAL_VOID);
+  args.rval().setUndefined();
   return true;
 }
 
 bool
 Library::Declare(JSContext* cx, unsigned argc, jsval* vp)
 {
+  CallArgs args = CallArgsFromVp(argc, vp);
   RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
   if (!obj)
     return false;
@@ -270,25 +274,24 @@ Library::Declare(JSContext* cx, unsigned argc, jsval* vp)
   //    This data will be both readable and writable via the usual CData
   //    accessors. If 'type' is a PointerType to a FunctionType, the result will
   //    be a function pointer, as with 1). 
-  if (argc < 2) {
+  if (args.length() < 2) {
     JS_ReportError(cx, "declare requires at least two arguments");
     return false;
   }
 
-  jsval* argv = JS_ARGV(cx, vp);
-  if (!JSVAL_IS_STRING(argv[0])) {
+  if (!args[0].isString()) {
     JS_ReportError(cx, "first argument must be a string");
     return false;
   }
 
   RootedObject fnObj(cx, nullptr);
   RootedObject typeObj(cx);
-  bool isFunction = argc > 2;
+  bool isFunction = args.length() > 2;
   if (isFunction) {
     // Case 1).
     // Create a FunctionType representing the function.
     fnObj = FunctionType::CreateInternal(cx,
-              argv[1], argv[2], &argv[3], argc - 3);
+              args[1], args[2], &args.array()[3], args.length() - 3);
     if (!fnObj)
       return false;
 
@@ -298,14 +301,14 @@ Library::Declare(JSContext* cx, unsigned argc, jsval* vp)
       return false;
   } else {
     // Case 2).
-    if (JSVAL_IS_PRIMITIVE(argv[1]) ||
-        !CType::IsCType(JSVAL_TO_OBJECT(argv[1])) ||
-        !CType::IsSizeDefined(JSVAL_TO_OBJECT(argv[1]))) {
+    if (args[1].isPrimitive() ||
+        !CType::IsCType(args[1].toObjectOrNull()) ||
+        !CType::IsSizeDefined(args[1].toObjectOrNull())) {
       JS_ReportError(cx, "second argument must be a type of defined size");
       return false;
     }
 
-    typeObj = JSVAL_TO_OBJECT(argv[1]);
+    typeObj = args[1].toObjectOrNull();
     if (CType::GetTypeCode(typeObj) == TYPE_pointer) {
       fnObj = PointerType::GetBaseType(typeObj);
       isFunction = fnObj && CType::GetTypeCode(fnObj) == TYPE_function;
@@ -314,7 +317,7 @@ Library::Declare(JSContext* cx, unsigned argc, jsval* vp)
 
   void* data;
   PRFuncPtr fnptr;
-  JSString* nameStr = JSVAL_TO_STRING(argv[0]);
+  JSString* nameStr = args[0].toString();
   AutoCString symbol;
   if (isFunction) {
     // Build the symbol, with mangling if necessary.
@@ -345,7 +348,7 @@ Library::Declare(JSContext* cx, unsigned argc, jsval* vp)
   if (!result)
     return false;
 
-  JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(result));
+  args.rval().setObject(*result);
 
   // Seal the CData object, to prevent modification of the function pointer.
   // This permanently associates this object with the library, and avoids
diff --git a/js/src/jsapi-tests/testCustomIterator.cpp b/js/src/jsapi-tests/testCustomIterator.cpp
index 4625fa5a996..378171eedcc 100644
--- a/js/src/jsapi-tests/testCustomIterator.cpp
+++ b/js/src/jsapi-tests/testCustomIterator.cpp
@@ -10,9 +10,10 @@ static int iterCount = 0;
 static bool
 IterNext(JSContext *cx, unsigned argc, jsval *vp)
 {
+    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
     if (iterCount++ == 100)
         return JS_ThrowStopIteration(cx);
-    JS_SET_RVAL(cx, vp, INT_TO_JSVAL(iterCount));
+    args.rval().setInt32(iterCount);
     return true;
 }
 
diff --git a/js/src/jsapi-tests/testParseJSON.cpp b/js/src/jsapi-tests/testParseJSON.cpp
index c62ee9a93b2..3f4300f85c9 100644
--- a/js/src/jsapi-tests/testParseJSON.cpp
+++ b/js/src/jsapi-tests/testParseJSON.cpp
@@ -329,12 +329,12 @@ END_TEST(testParseJSON_error)
 static bool
 Censor(JSContext *cx, unsigned argc, jsval *vp)
 {
-    JS_ASSERT(argc == 2);
+    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+    JS_ASSERT(args.length() == 2);
 #ifdef DEBUG
-    jsval *argv = JS_ARGV(cx, vp);
-    JS_ASSERT(JSVAL_IS_STRING(argv[0]));
+    JS_ASSERT(args[0].isString());
 #endif
-    JS_SET_RVAL(cx, vp, JSVAL_NULL);
+    args.rval().setNull();
     return true;
 }
 
diff --git a/js/src/jsapi-tests/testSlowScript.cpp b/js/src/jsapi-tests/testSlowScript.cpp
index 33d897db813..403328206bb 100644
--- a/js/src/jsapi-tests/testSlowScript.cpp
+++ b/js/src/jsapi-tests/testSlowScript.cpp
@@ -15,9 +15,10 @@ static unsigned sRemain;
 static bool
 RequestInterruptCallback(JSContext *cx, unsigned argc, jsval *vp)
 {
+    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
     if (!sRemain--)
         JS_RequestInterruptCallback(JS_GetRuntime(cx));
-    *vp = JSVAL_VOID;
+    args.rval().setUndefined();
     return true;
 }
 
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 4d55984e15e..85b84d6eb4f 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3977,7 +3977,7 @@ js_generic_native_method_dispatcher(JSContext *cx, unsigned argc, Value *vp)
     CallArgs args = CallArgsFromVp(argc, vp);
 
     const JSFunctionSpec *fs = (JSFunctionSpec *)
-        vp->toObject().as<JSFunction>().getExtendedSlot(0).toPrivate();
+        args.callee().as<JSFunction>().getExtendedSlot(0).toPrivate();
     JS_ASSERT((fs->flags & JSFUN_GENERIC_NATIVE) != 0);
 
     if (argc < 1) {
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index ad316a27c18..37e280a3804 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -2382,9 +2382,9 @@ array_splice(JSContext *cx, unsigned argc, Value *vp)
 
     /* Step 7. */
     uint32_t actualDeleteCount;
-    if (argc != 1) {
+    if (args.length() != 1) {
         double deleteCountDouble;
-        RootedValue cnt(cx, argc >= 2 ? args[1] : Int32Value(0));
+        RootedValue cnt(cx, args.length() >= 2 ? args[1] : Int32Value(0));
         if (!ToInteger(cx, cnt, &deleteCountDouble))
             return false;
         actualDeleteCount = Min(Max(deleteCountDouble, 0.0), double(len - actualStart));
@@ -2424,7 +2424,7 @@ array_splice(JSContext *cx, unsigned argc, Value *vp)
     }
 
     /* Step 11. */
-    uint32_t itemCount = (argc >= 2) ? (argc - 2) : 0;
+    uint32_t itemCount = (args.length() >= 2) ? (args.length() - 2) : 0;
 
     if (itemCount < actualDeleteCount) {
         /* Step 12: the array is being shrunk. */
@@ -2913,7 +2913,7 @@ array_of(JSContext *cx, unsigned argc, Value *vp)
     RootedObject obj(cx);
     {
         RootedValue v(cx);
-        Value argv[1] = {NumberValue(argc)};
+        Value argv[1] = {NumberValue(args.length())};
         if (!InvokeConstructor(cx, args.thisv(), 1, argv, v.address()))
             return false;
         obj = ToObject(cx, v);
@@ -2922,13 +2922,13 @@ array_of(JSContext *cx, unsigned argc, Value *vp)
     }
 
     // Step 8.
-    for (unsigned k = 0; k < argc; k++) {
+    for (unsigned k = 0; k < args.length(); k++) {
         if (!JSObject::defineElement(cx, obj, k, args[k]))
             return false;
     }
 
     // Steps 9-10.
-    RootedValue v(cx, NumberValue(argc));
+    RootedValue v(cx, NumberValue(args.length()));
     if (!JSObject::setProperty(cx, obj, obj, cx->names().length, &v, true))
         return false;
 
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index dcbc453cd26..fbad2df1d9b 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -1185,7 +1185,7 @@ date_parse(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.length() == 0) {
-        vp->setNaN();
+        args.rval().setNaN();
         return true;
     }
 
@@ -1199,12 +1199,12 @@ date_parse(JSContext *cx, unsigned argc, Value *vp)
 
     double result;
     if (!date_parseString(linearStr, &result, &cx->runtime()->dateTimeInfo)) {
-        vp->setNaN();
+        args.rval().setNaN();
         return true;
     }
 
     result = TimeClip(result);
-    vp->setNumber(result);
+    args.rval().setNumber(result);
     return true;
 }
 
@@ -1217,7 +1217,8 @@ NowAsMillis()
 static bool
 date_now(JSContext *cx, unsigned argc, Value *vp)
 {
-    vp->setDouble(NowAsMillis());
+    CallArgs args = CallArgsFromVp(argc, vp);
+    args.rval().setDouble(NowAsMillis());
     return true;
 }
 
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index e3e3b8913a4..685242152b4 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -953,7 +953,7 @@ js_fun_apply(JSContext *cx, unsigned argc, Value *vp)
 
     // Step 2.
     if (args.length() < 2 || args[1].isNullOrUndefined())
-        return js_fun_call(cx, (argc > 0) ? 1 : 0, vp);
+        return js_fun_call(cx, (args.length() > 0) ? 1 : 0, vp);
 
     InvokeArgs args2(cx);
 
@@ -1253,7 +1253,7 @@ js::CallOrConstructBoundFunction(JSContext *cx, unsigned argc, Value *vp)
     /* 15.3.4.5.1 step 1, 15.3.4.5.2 step 3. */
     unsigned argslen = fun->getBoundFunctionArgumentCount();
 
-    if (argc + argslen > ARGS_LENGTH_MAX) {
+    if (args.length() + argslen > ARGS_LENGTH_MAX) {
         js_ReportAllocationOverflow(cx);
         return false;
     }
@@ -1265,13 +1265,13 @@ js::CallOrConstructBoundFunction(JSContext *cx, unsigned argc, Value *vp)
     const Value &boundThis = fun->getBoundFunctionThis();
 
     InvokeArgs invokeArgs(cx);
-    if (!invokeArgs.init(argc + argslen))
+    if (!invokeArgs.init(args.length() + argslen))
         return false;
 
     /* 15.3.4.5.1, 15.3.4.5.2 step 4. */
     for (unsigned i = 0; i < argslen; i++)
         invokeArgs[i].set(fun->getBoundFunctionArgument(i));
-    PodCopy(invokeArgs.array() + argslen, vp + 2, argc);
+    PodCopy(invokeArgs.array() + argslen, vp + 2, args.length());
 
     /* 15.3.4.5.1, 15.3.4.5.2 step 5. */
     invokeArgs.setCallee(ObjectValue(*target));
@@ -1282,20 +1282,21 @@ js::CallOrConstructBoundFunction(JSContext *cx, unsigned argc, Value *vp)
     if (constructing ? !InvokeConstructor(cx, invokeArgs) : !Invoke(cx, invokeArgs))
         return false;
 
-    *vp = invokeArgs.rval();
+    args.rval().set(invokeArgs.rval());
     return true;
 }
 
 static bool
 fun_isGenerator(JSContext *cx, unsigned argc, Value *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     JSFunction *fun;
-    if (!IsFunctionObject(vp[1], &fun)) {
-        JS_SET_RVAL(cx, vp, BooleanValue(false));
+    if (!IsFunctionObject(args.thisv(), &fun)) {
+        args.rval().setBoolean(false);
         return true;
     }
 
-    JS_SET_RVAL(cx, vp, BooleanValue(fun->isGenerator()));
+    args.rval().setBoolean(fun->isGenerator());
     return true;
 }
 
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 172fc0a44a2..1f8f1f9978b 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -792,7 +792,8 @@ js::ParseJSONWithReviver(JSContext *cx, ConstTwoByteChars chars, size_t length,
 static bool
 json_toSource(JSContext *cx, unsigned argc, Value *vp)
 {
-    vp->setString(cx->names().JSON);
+    CallArgs args = CallArgsFromVp(argc, vp);
+    args.rval().setString(cx->names().JSON);
     return true;
 }
 #endif
@@ -816,7 +817,7 @@ json_parse(JSContext *cx, unsigned argc, Value *vp)
 
     JS::Anchor<JSString *> anchor(flat);
 
-    RootedValue reviver(cx, (argc >= 2) ? args[1] : UndefinedValue());
+    RootedValue reviver(cx, args.get(1));
 
     /* Steps 2-5. */
     return ParseJSONWithReviver(cx, ConstTwoByteChars(flat->chars(), flat->length()),
@@ -827,11 +828,10 @@ json_parse(JSContext *cx, unsigned argc, Value *vp)
 bool
 json_stringify(JSContext *cx, unsigned argc, Value *vp)
 {
-    RootedObject replacer(cx, (argc >= 2 && vp[3].isObject())
-                              ? &vp[3].toObject()
-                              : nullptr);
-    RootedValue value(cx, (argc >= 1) ? vp[2] : UndefinedValue());
-    RootedValue space(cx, (argc >= 3) ? vp[4] : UndefinedValue());
+    CallArgs args = CallArgsFromVp(argc, vp);
+    RootedObject replacer(cx, args.get(1).isObject() ? &args[1].toObject() : nullptr);
+    RootedValue value(cx, args.get(0));
+    RootedValue space(cx, args.get(2));
 
     StringBuffer sb(cx);
     if (!js_Stringify(cx, &value, replacer, space, sb))
@@ -844,9 +844,9 @@ json_stringify(JSContext *cx, unsigned argc, Value *vp)
         JSString *str = sb.finishString();
         if (!str)
             return false;
-        vp->setString(str);
+        args.rval().setString(str);
     } else {
-        vp->setUndefined();
+        args.rval().setUndefined();
     }
 
     return true;
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index 1440066732c..62af5faffc1 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -3129,38 +3129,39 @@ proxy(JSContext *cx, unsigned argc, jsval *vp)
     if (!proxy)
         return false;
     proxy->setExtra(0, ObjectOrNullValue(handler));
-    vp->setObject(*proxy);
+    args.rval().setObject(*proxy);
     return true;
 }
 
 static bool
 proxy_create(JSContext *cx, unsigned argc, Value *vp)
 {
-    if (argc < 1) {
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() < 1) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "create", "0", "s");
         return false;
     }
-    JSObject *handler = NonNullObject(cx, vp[2]);
+    JSObject *handler = NonNullObject(cx, args[0]);
     if (!handler)
         return false;
     JSObject *proto, *parent = nullptr;
-    if (argc > 1 && vp[3].isObject()) {
-        proto = &vp[3].toObject();
+    if (args.get(1).isObject()) {
+        proto = &args[1].toObject();
         parent = proto->getParent();
     } else {
-        JS_ASSERT(IsFunctionObject(vp[0]));
+        JS_ASSERT(IsFunctionObject(&args.callee()));
         proto = nullptr;
     }
     if (!parent)
-        parent = vp[0].toObject().getParent();
+        parent = args.callee().getParent();
     RootedValue priv(cx, ObjectValue(*handler));
     JSObject *proxy = NewProxyObject(cx, &ScriptedIndirectProxyHandler::singleton,
                                      priv, proto, parent);
     if (!proxy)
         return false;
 
-    vp->setObject(*proxy);
+    args.rval().setObject(*proxy);
     return true;
 }
 
@@ -3214,7 +3215,7 @@ proxy_createFunction(JSContext *cx, unsigned argc, Value *vp)
         return false;
     proxy->as<ProxyObject>().setExtra(0, ObjectValue(*ccHolder));
 
-    vp->setObject(*proxy);
+    args.rval().setObject(*proxy);
     return true;
 }
 
diff --git a/js/src/jsweakmap.cpp b/js/src/jsweakmap.cpp
index 5bae62d0a59..4876b2dc8d7 100644
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -402,11 +402,12 @@ WeakMap_finalize(FreeOp *fop, JSObject *obj)
 static bool
 WeakMap_construct(JSContext *cx, unsigned argc, Value *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     JSObject *obj = NewBuiltinClassInstance(cx, &WeakMapObject::class_);
     if (!obj)
         return false;
 
-    vp->setObject(*obj);
+    args.rval().setObject(*obj);
     return true;
 }
 
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index e01c8f5b21f..75ba3e298f2 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -2533,29 +2533,29 @@ Clone(JSContext *cx, unsigned argc, jsval *vp)
         }
     }
 
-    if (argc > 1) {
+    if (args.length() > 1) {
         if (!JS_ValueToObject(cx, args[1], &parent))
             return false;
     } else {
-        parent = JS_GetParent(JSVAL_TO_OBJECT(JS_CALLEE(cx, vp)));
+        parent = JS_GetParent(&args.callee());
     }
 
     JSObject *clone = JS_CloneFunctionObject(cx, funobj, parent);
     if (!clone)
         return false;
-    JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(clone));
+    args.rval().setObject(*clone);
     return true;
 }
 
 static bool
 GetPDA(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     RootedObject vobj(cx);
     bool ok;
     JSPropertyDescArray pda;
     JSPropertyDesc *pd;
 
-    CallArgs args = CallArgsFromVp(argc, vp);
     if (!JS_ValueToObject(cx, args.get(0), &vobj))
         return false;
     if (!vobj) {
@@ -2609,12 +2609,13 @@ GetPDA(JSContext *cx, unsigned argc, jsval *vp)
 static bool
 GetSLX(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     RootedScript script(cx);
 
-    script = ValueToScript(cx, argc == 0 ? UndefinedValue() : vp[2]);
+    script = ValueToScript(cx, args.get(0));
     if (!script)
         return false;
-    JS_SET_RVAL(cx, vp, INT_TO_JSVAL(js_GetScriptLineExtent(script)));
+    args.rval().setInt32(js_GetScriptLineExtent(script));
     return true;
 }
 
@@ -2777,20 +2778,15 @@ EvalInContext(JSContext *cx, unsigned argc, jsval *vp)
 static bool
 EvalInFrame(JSContext *cx, unsigned argc, jsval *vp)
 {
-    jsval *argv = JS_ARGV(cx, vp);
-    if (argc < 2 ||
-        !JSVAL_IS_INT(argv[0]) ||
-        !JSVAL_IS_STRING(argv[1])) {
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (!args.get(0).isInt32() || !args.get(1).isString()) {
         JS_ReportError(cx, "Invalid arguments to evalInFrame");
         return false;
     }
 
-    uint32_t upCount = JSVAL_TO_INT(argv[0]);
-    RootedString str(cx, JSVAL_TO_STRING(argv[1]));
-
-    bool saveCurrent = (argc >= 3 && JSVAL_IS_BOOLEAN(argv[2]))
-                        ? !!(JSVAL_TO_BOOLEAN(argv[2]))
-                        : false;
+    uint32_t upCount = args[0].toInt32();
+    RootedString str(cx, args[1].toString());
+    bool saveCurrent = args.get(2).isBoolean() ? args[2].toBoolean() : false;
 
     /* This is a copy of CheckDebugMode. */
     if (!JS_GetDebugMode(cx)) {
@@ -2902,7 +2898,7 @@ static bool
 EvalInWorker(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (argc < 1 || !args[0].isString()) {
+    if (!args.get(0).isString()) {
         JS_ReportError(cx, "Invalid arguments to evalInWorker");
         return false;
     }
@@ -2933,13 +2929,13 @@ EvalInWorker(JSContext *cx, unsigned argc, jsval *vp)
 static bool
 ShapeOf(JSContext *cx, unsigned argc, JS::Value *vp)
 {
-    JS::Value v;
-    if (argc < 1 || !((v = JS_ARGV(cx, vp)[0]).isObject())) {
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (!args.get(0).isObject()) {
         JS_ReportError(cx, "shapeOf: object expected");
         return false;
     }
-    JSObject *obj = &v.toObject();
-    JS_SET_RVAL(cx, vp, JS_NumberValue((double) ((uintptr_t)obj->lastProperty() >> 3)));
+    JSObject *obj = &args[0].toObject();
+    args.rval().set(JS_NumberValue(double(uintptr_t(obj->lastProperty()) >> 3)));
     return true;
 }
 
@@ -3059,7 +3055,7 @@ Resolver(JSContext *cx, unsigned argc, jsval *vp)
     }
 
     RootedObject parent(cx, JS_GetParent(referent));
-    JSObject *result = (argc > 1
+    JSObject *result = (args.length() > 1
                         ? JS_NewObjectWithGivenProto
                         : JS_NewObject)(cx, &resolver_class, proto, parent);
     if (!result)
@@ -3377,12 +3373,13 @@ Timeout(JSContext *cx, unsigned argc, Value *vp)
 static bool
 Elapsed(JSContext *cx, unsigned argc, jsval *vp)
 {
-    if (argc == 0) {
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() == 0) {
         double d = 0.0;
         JSShellContextData *data = GetContextData(cx);
         if (data)
             d = PRMJ_Now() - data->startTime;
-        JS_SET_RVAL(cx, vp, JS_NumberValue(d));
+        args.rval().setDouble(d);
         return true;
     }
     JS_ReportError(cx, "Wrong number of arguments");
@@ -3392,24 +3389,25 @@ Elapsed(JSContext *cx, unsigned argc, jsval *vp)
 static bool
 Parent(JSContext *cx, unsigned argc, jsval *vp)
 {
-    if (argc != 1) {
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() != 1) {
         JS_ReportError(cx, "Wrong number of arguments");
         return false;
     }
 
-    jsval v = JS_ARGV(cx, vp)[0];
+    Value v = args[0];
     if (JSVAL_IS_PRIMITIVE(v)) {
         JS_ReportError(cx, "Only objects have parents!");
         return false;
     }
 
     Rooted<JSObject*> parent(cx, JS_GetParent(&v.toObject()));
-    JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(parent));
+    args.rval().setObjectOrNull(parent);
 
     /* Outerize if necessary.  Embrace the ugliness! */
     if (parent) {
         if (JSObjectOp op = parent->getClass()->ext.outerObject)
-            JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(op(cx, parent)));
+            args.rval().setObjectOrNull(op(cx, parent));
     }
 
     return true;
@@ -3764,14 +3762,14 @@ ReadFile(JSContext *cx, unsigned argc, jsval *vp, bool scriptRelative)
             JSObject *obj;
             if (!(obj = FileAsTypedArray(cx, filename.ptr())))
                 return false;
-            JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(obj));
+            args.rval().setObject(*obj);
             return true;
         }
     }
 
     if (!(str = FileAsString(cx, filename.ptr())))
         return false;
-    JS_SET_RVAL(cx, vp, STRING_TO_JSVAL(str));
+    args.rval().setString(str);
     return true;
 }
 
@@ -4102,9 +4100,10 @@ ThisFilename(JSContext *cx, unsigned argc, Value *vp)
 static bool
 Wrap(JSContext *cx, unsigned argc, jsval *vp)
 {
-    jsval v = argc > 0 ? JS_ARGV(cx, vp)[0] : UndefinedValue();
+    CallArgs args = CallArgsFromVp(argc, vp);
+    Value v = args.get(0);
     if (JSVAL_IS_PRIMITIVE(v)) {
-        JS_SET_RVAL(cx, vp, v);
+        args.rval().set(v);
         return true;
     }
 
@@ -4114,17 +4113,18 @@ Wrap(JSContext *cx, unsigned argc, jsval *vp)
     if (!wrapped)
         return false;
 
-    JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(wrapped));
+    args.rval().setObject(*wrapped);
     return true;
 }
 
 static bool
 WrapWithProto(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     Value obj = UndefinedValue(), proto = UndefinedValue();
-    if (argc == 2) {
-        obj = JS_ARGV(cx, vp)[0];
-        proto = JS_ARGV(cx, vp)[1];
+    if (args.length() == 2) {
+        obj = args[0];
+        proto = args[1];
     }
     if (!obj.isObject() || !proto.isObjectOrNull()) {
         JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr, JSSMSG_INVALID_ARGS,
@@ -4140,7 +4140,7 @@ WrapWithProto(JSContext *cx, unsigned argc, jsval *vp)
     if (!wrapped)
         return false;
 
-    JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(wrapped));
+    args.rval().setObject(*wrapped);
     return true;
 }
 
@@ -4195,30 +4195,34 @@ NewGlobal(JSContext *cx, unsigned argc, jsval *vp)
 static bool
 EnableStackWalkingAssertion(JSContext *cx, unsigned argc, jsval *vp)
 {
-    if (argc == 0 || !JSVAL_IS_BOOLEAN(JS_ARGV(cx, vp)[0])) {
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (!args.get(0).isBoolean()) {
         JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr, JSSMSG_INVALID_ARGS,
                              "enableStackWalkingAssertion");
         return false;
     }
 
 #ifdef DEBUG
-    cx->stackIterAssertionEnabled = JSVAL_TO_BOOLEAN(JS_ARGV(cx, vp)[0]);
+    cx->stackIterAssertionEnabled = args[0].toBoolean();
 #endif
 
-    JS_SET_RVAL(cx, vp, UndefinedValue());
+    args.rval().setUndefined();
     return true;
 }
 
 static bool
-GetMaxArgs(JSContext *cx, unsigned arg, jsval *vp)
+GetMaxArgs(JSContext *cx, unsigned argc, jsval *vp)
 {
-    JS_SET_RVAL(cx, vp, INT_TO_JSVAL(ARGS_LENGTH_MAX));
+    CallArgs args = CallArgsFromVp(argc, vp);
+    args.rval().setInt32(ARGS_LENGTH_MAX);
     return true;
 }
 
 static bool
 ObjectEmulatingUndefined(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
+
     static const JSClass cls = {
         "ObjectEmulatingUndefined",
         JSCLASS_EMULATES_UNDEFINED,
@@ -4234,7 +4238,7 @@ ObjectEmulatingUndefined(JSContext *cx, unsigned argc, jsval *vp)
     RootedObject obj(cx, JS_NewObject(cx, &cls, JS::NullPtr(), JS::NullPtr()));
     if (!obj)
         return false;
-    JS_SET_RVAL(cx, vp, ObjectValue(*obj));
+    args.rval().setObject(*obj);
     return true;
 }
 
@@ -4243,7 +4247,7 @@ GetSelfHostedValue(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (argc != 1 || !args[0].isString()) {
+    if (args.length() != 1 || !args[0].isString()) {
         JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr, JSSMSG_INVALID_ARGS,
                              "getSelfHostedValue");
         return false;
@@ -4851,10 +4855,11 @@ PrintHelp(JSContext *cx, HandleObject obj)
 static bool
 Help(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     fprintf(gOutFile, "%s\n", JS_GetImplementationVersion());
 
     RootedObject obj(cx);
-    if (argc == 0) {
+    if (args.length() == 0) {
         RootedObject global(cx, JS::CurrentGlobalOrNull(cx));
         AutoIdArray ida(cx, JS_Enumerate(cx, global));
         if (!ida)
@@ -4874,19 +4879,18 @@ Help(JSContext *cx, unsigned argc, jsval *vp)
                 return false;
         }
     } else {
-        jsval *argv = JS_ARGV(cx, vp);
-        for (unsigned i = 0; i < argc; i++) {
-            if (JSVAL_IS_PRIMITIVE(argv[i])) {
+        for (unsigned i = 0; i < args.length(); i++) {
+            if (args[i].isPrimitive()) {
                 JS_ReportError(cx, "primitive arg");
                 return false;
             }
-            obj = JSVAL_TO_OBJECT(argv[i]);
+            obj = args[i].toObjectOrNull();
             if (!PrintHelp(cx, obj))
                 return false;
         }
     }
 
-    JS_SET_RVAL(cx, vp, UndefinedValue());
+    args.rval().setUndefined();
     return true;
 }
 
@@ -5209,7 +5213,7 @@ dom_genericGetter(JSContext *cx, unsigned argc, JS::Value *vp)
 
     JS::Value val = js::GetReservedSlot(obj, DOM_OBJECT_SLOT);
 
-    const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));
+    const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(args.calleev());
     MOZ_ASSERT(info->type() == JSJitInfo::Getter);
     JSJitGetterOp getter = info->getter;
     return getter(cx, obj, val.toPrivate(), JSJitGetterCallArgs(args));
@@ -5223,7 +5227,7 @@ dom_genericSetter(JSContext* cx, unsigned argc, JS::Value* vp)
     if (!obj)
         return false;
 
-    JS_ASSERT(argc == 1);
+    JS_ASSERT(args.length() == 1);
 
     if (JS_GetClass(obj) != &dom_class) {
         args.rval().set(UndefinedValue());
@@ -5232,7 +5236,7 @@ dom_genericSetter(JSContext* cx, unsigned argc, JS::Value* vp)
 
     JS::Value val = js::GetReservedSlot(obj, DOM_OBJECT_SLOT);
 
-    const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));
+    const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(args.calleev());
     MOZ_ASSERT(info->type() == JSJitInfo::Setter);
     JSJitSetterOp setter = info->setter;
     if (!setter(cx, obj, val.toPrivate(), JSJitSetterCallArgs(args)))
@@ -5256,7 +5260,7 @@ dom_genericMethod(JSContext* cx, unsigned argc, JS::Value *vp)
 
     JS::Value val = js::GetReservedSlot(obj, DOM_OBJECT_SLOT);
 
-    const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));
+    const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(args.calleev());
     MOZ_ASSERT(info->type() == JSJitInfo::Method);
     JSJitMethodOp method = info->method;
     return method(cx, obj, val.toPrivate(), JSJitMethodCallArgs(args));
diff --git a/js/src/shell/jsheaptools.cpp b/js/src/shell/jsheaptools.cpp
index 45b7eddd3eb..d5b51867c91 100644
--- a/js/src/shell/jsheaptools.cpp
+++ b/js/src/shell/jsheaptools.cpp
@@ -542,13 +542,14 @@ ReferenceFinder::findReferences(HandleObject target)
 bool
 FindReferences(JSContext *cx, unsigned argc, jsval *vp)
 {
-    if (argc < 1) {
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() < 1) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "findReferences", "0", "s");
         return false;
     }
 
-    RootedValue target(cx, JS_ARGV(cx, vp)[0]);
+    RootedValue target(cx, args[0]);
     if (!target.isObject()) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                              "argument", "not an object");
@@ -567,7 +568,7 @@ FindReferences(JSContext *cx, unsigned argc, jsval *vp)
     if (!references)
         return false;
 
-    JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(references));
+    args.rval().setObject(*references);
     return true;
 }
 
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index b0c2675ee31..74dafced438 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -2116,7 +2116,7 @@ Debugger::construct(JSContext *cx, unsigned argc, Value *vp)
     CallArgs args = CallArgsFromVp(argc, vp);
 
     /* Check that the arguments, if any, are cross-compartment wrappers. */
-    for (unsigned i = 0; i < argc; i++) {
+    for (unsigned i = 0; i < args.length(); i++) {
         const Value &arg = args[i];
         if (!arg.isObject())
             return ReportObjectRequired(cx);
@@ -2159,7 +2159,7 @@ Debugger::construct(JSContext *cx, unsigned argc, Value *vp)
     /* Now the JSObject owns the js::Debugger instance, so we needn't delete it. */
 
     /* Add the initial debuggees, if any. */
-    for (unsigned i = 0; i < argc; i++) {
+    for (unsigned i = 0; i < args.length(); i++) {
         Rooted<GlobalObject*>
             debuggee(cx, &args[i].toObject().as<ProxyObject>().private_().toObject().global());
         if (!dbg->addDebuggeeGlobal(cx, debuggee))
@@ -2713,7 +2713,7 @@ Debugger::findScripts(JSContext *cx, unsigned argc, Value *vp)
     if (!query.init())
         return false;
 
-    if (argc >= 1) {
+    if (args.length() >= 1) {
         RootedObject queryObject(cx, NonNullObject(cx, args[0]));
         if (!queryObject || !query.parseQuery(queryObject))
             return false;
@@ -3617,7 +3617,7 @@ DebuggerScript_getBreakpoints(JSContext *cx, unsigned argc, Value *vp)
     Debugger *dbg = Debugger::fromChildJSObject(obj);
 
     jsbytecode *pc;
-    if (argc > 0) {
+    if (args.length() > 0) {
         size_t offset;
         if (!ScriptOffset(cx, script, args[0], &offset))
             return false;
@@ -5321,7 +5321,7 @@ ApplyOrCall(JSContext *cx, unsigned argc, Value *vp, ApplyOrCallMode mode)
     Value *callArgv = nullptr;
     AutoValueVector argv(cx);
     if (mode == ApplyMode) {
-        if (argc >= 2 && !args[1].isNullOrUndefined()) {
+        if (args.length() >= 2 && !args[1].isNullOrUndefined()) {
             if (!args[1].isObject()) {
                 JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_APPLY_ARGS,
                                      js_apply_str);
@@ -5336,7 +5336,7 @@ ApplyOrCall(JSContext *cx, unsigned argc, Value *vp, ApplyOrCallMode mode)
             callArgv = argv.begin();
         }
     } else {
-        callArgc = argc > 0 ? unsigned(Min(argc - 1, ARGS_LENGTH_MAX)) : 0;
+        callArgc = args.length() > 0 ? unsigned(Min(args.length() - 1, ARGS_LENGTH_MAX)) : 0;
         callArgv = args.array() + 1;
     }
 
@@ -5478,7 +5478,7 @@ DebuggerObject_unwrap(JSContext *cx, unsigned argc, Value *vp)
     THIS_DEBUGOBJECT_OWNER_REFERENT(cx, argc, vp, "unwrap", args, dbg, referent);
     JSObject *unwrapped = UnwrapOneChecked(referent);
     if (!unwrapped) {
-        vp->setNull();
+        args.rval().setNull();
         return true;
     }
 
diff --git a/js/src/vm/SharedArrayObject.cpp b/js/src/vm/SharedArrayObject.cpp
index a5052b0f05e..50bf8b33df0 100644
--- a/js/src/vm/SharedArrayObject.cpp
+++ b/js/src/vm/SharedArrayObject.cpp
@@ -169,7 +169,7 @@ SharedArrayBufferObject::class_constructor(JSContext *cx, unsigned argc, Value *
 {
     int32_t length = 0;
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (argc > 0 && !ToInt32(cx, args[0], &length))
+    if (args.length() > 0 && !ToInt32(cx, args[0], &length))
         return false;
 
     if (length < 0) {
diff --git a/js/src/vm/TypedArrayObject.cpp b/js/src/vm/TypedArrayObject.cpp
index 3142dd508f0..bef1beebddc 100644
--- a/js/src/vm/TypedArrayObject.cpp
+++ b/js/src/vm/TypedArrayObject.cpp
@@ -1429,7 +1429,7 @@ DataViewObject::class_constructor(JSContext *cx, unsigned argc, Value *vp)
         args2.setCallee(global->createDataViewForThis());
         args2.setThis(ObjectValue(*bufobj));
         PodCopy(args2.array(), args.array(), args.length());
-        args2[argc].setObject(*proto);
+        args2[args.length()].setObject(*proto);
         if (!Invoke(cx, args2))
             return false;
         args.rval().set(args2.rval());
diff --git a/js/xpconnect/idl/xpccomponents.idl b/js/xpconnect/idl/xpccomponents.idl
index 250c3c6d1a6..cb0d27ce15e 100644
--- a/js/xpconnect/idl/xpccomponents.idl
+++ b/js/xpconnect/idl/xpccomponents.idl
@@ -121,7 +121,7 @@ interface ScheduledGCCallback : nsISupports
 /**
 * interface of Components.utils
 */
-[scriptable, uuid(0b81b4f2-cad7-4602-a5cb-b99c9d514196)]
+[scriptable, uuid(5e253a02-f91f-4fb3-9335-db0fca23f2e0)]
 interface nsIXPCComponents_Utils : nsISupports
 {
 
@@ -364,22 +364,6 @@ interface nsIXPCComponents_Utils : nsISupports
     [implicit_jscontext]
     jsval createObjectIn(in jsval vobj, [optional] in jsval voptions);
 
-    /*
-     * To be called from JS only.
-     *
-     * Returns an array created in |vobj|'s compartment.
-     */
-    [implicit_jscontext]
-    jsval createArrayIn(in jsval vobj);
-
-    /*
-     * To be called from JS only.
-     *
-     * Returns a date given timestamp |msec| created in |vobj|'s compartment.
-     */
-    [implicit_jscontext]
-    jsval createDateIn(in jsval vobj, in long long msec);
-
     /*
      * To be called from JS only.
      *
diff --git a/js/xpconnect/public/SandboxPrivate.h b/js/xpconnect/public/SandboxPrivate.h
index 88f6623de8b..2e270ecfbed 100644
--- a/js/xpconnect/public/SandboxPrivate.h
+++ b/js/xpconnect/public/SandboxPrivate.h
@@ -9,6 +9,7 @@
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIPrincipal.h"
 #include "nsWeakReference.h"
+#include "nsWrapperCache.h"
 
 #include "js/RootingAPI.h"
 
@@ -17,17 +18,20 @@
 
 class SandboxPrivate : public nsIGlobalObject,
                        public nsIScriptObjectPrincipal,
-                       public nsSupportsWeakReference
+                       public nsSupportsWeakReference,
+                       public nsWrapperCache
 {
 public:
     SandboxPrivate(nsIPrincipal *principal, JSObject *global)
         : mPrincipal(principal)
-        , mGlobalJSObject(global)
     {
+        SetWrapper(global);
     }
     virtual ~SandboxPrivate() { }
 
-    NS_DECL_ISUPPORTS
+    NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+    NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(SandboxPrivate,
+                                                           nsIGlobalObject)
 
     nsIPrincipal *GetPrincipal()
     {
@@ -36,16 +40,15 @@ public:
 
     JSObject *GetGlobalJSObject()
     {
-        return mGlobalJSObject;
+        return GetWrapper();
     }
 
     void ForgetGlobalObject()
     {
-        mGlobalJSObject = nullptr;
+        ClearWrapper();
     }
 private:
     nsCOMPtr<nsIPrincipal> mPrincipal;
-    JS::TenuredHeap<JSObject*> mGlobalJSObject;
 };
 
 #endif // __SANDBOXPRIVATE_H__
diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp
index de6b220d237..0e57f62ec68 100644
--- a/js/xpconnect/src/Sandbox.cpp
+++ b/js/xpconnect/src/Sandbox.cpp
@@ -43,10 +43,16 @@ using namespace xpc;
 using mozilla::dom::DestroyProtoAndIfaceCache;
 using mozilla::dom::indexedDB::IndexedDatabaseManager;
 
-NS_IMPL_ISUPPORTS3(SandboxPrivate,
-                   nsIScriptObjectPrincipal,
-                   nsIGlobalObject,
-                   nsISupportsWeakReference)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(SandboxPrivate)
+NS_IMPL_CYCLE_COLLECTING_ADDREF(SandboxPrivate)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(SandboxPrivate)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SandboxPrivate)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptObjectPrincipal)
+  NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal)
+  NS_INTERFACE_MAP_ENTRY(nsIGlobalObject)
+  NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
+NS_INTERFACE_MAP_END
 
 const char kScriptSecurityManagerContractID[] = NS_SCRIPTSECURITYMANAGER_CONTRACTID;
 
diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index 324c27fc301..9022c8c7899 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -3039,62 +3039,6 @@ nsXPCComponents_Utils::CreateObjectIn(HandleValue vobj, HandleValue voptions,
     return NS_OK;
 }
 
-/* jsval createObjectIn(in jsval vobj); */
-NS_IMETHODIMP
-nsXPCComponents_Utils::CreateArrayIn(HandleValue vobj, JSContext *cx,
-                                     MutableHandleValue rval)
-{
-    if (!cx)
-        return NS_ERROR_FAILURE;
-
-    // first argument must be an object
-    if (vobj.isPrimitive())
-        return NS_ERROR_XPC_BAD_CONVERT_JS;
-
-    RootedObject scope(cx, js::UncheckedUnwrap(&vobj.toObject()));
-    RootedObject obj(cx);
-    {
-        JSAutoCompartment ac(cx, scope);
-        obj =  JS_NewArrayObject(cx, 0);
-        if (!obj)
-            return NS_ERROR_FAILURE;
-    }
-
-    if (!JS_WrapObject(cx, &obj))
-        return NS_ERROR_FAILURE;
-
-    rval.setObject(*obj);
-    return NS_OK;
-}
-
-/* jsval createDateIn(in jsval vobj, in long long msec); */
-NS_IMETHODIMP
-nsXPCComponents_Utils::CreateDateIn(HandleValue vobj, int64_t msec, JSContext *cx,
-                                    MutableHandleValue rval)
-{
-    if (!cx)
-        return NS_ERROR_FAILURE;
-
-    // first argument must be an object
-    if (!vobj.isObject())
-        return NS_ERROR_XPC_BAD_CONVERT_JS;
-
-    RootedObject obj(cx);
-    {
-        JSObject *scope = js::UncheckedUnwrap(&vobj.toObject());
-        JSAutoCompartment ac(cx, scope);
-        obj =  JS_NewDateObjectMsec(cx, msec);
-        if (!obj)
-            return NS_ERROR_FAILURE;
-    }
-
-    if (!JS_WrapObject(cx, &obj))
-        return NS_ERROR_FAILURE;
-
-    rval.setObject(*obj);
-    return NS_OK;
-}
-
 /* void makeObjectPropsNormal(jsval vobj); */
 NS_IMETHODIMP
 nsXPCComponents_Utils::MakeObjectPropsNormal(HandleValue vobj, JSContext *cx)
diff --git a/js/xpconnect/src/XPCConvert.cpp b/js/xpconnect/src/XPCConvert.cpp
index a6267098f47..e4210c5ec14 100644
--- a/js/xpconnect/src/XPCConvert.cpp
+++ b/js/xpconnect/src/XPCConvert.cpp
@@ -819,24 +819,17 @@ XPCConvert::NativeInterface2JSObject(MutableHandleValue d,
     // object will create (and fill the cache) from its WrapObject call.
     nsWrapperCache *cache = aHelper.GetWrapperCache();
 
-    RootedObject flat(cx);
-    if (cache) {
-        flat = cache->GetWrapper();
-        if (cache->IsDOMBinding()) {
-            if (!flat) {
-                RootedObject global(cx, xpcscope->GetGlobalJSObject());
-                flat = cache->WrapObject(cx, global);
-                if (!flat)
-                    return false;
-            }
-
-            if (allowNativeWrapper && !JS_WrapObject(cx, &flat))
-                return false;
-
-            return CreateHolderIfNeeded(flat, d, dest);
-        }
-    } else {
-        flat = nullptr;
+    RootedObject flat(cx, cache ? cache->GetWrapper() : nullptr);
+    if (!flat && cache && cache->IsDOMBinding()) {
+        RootedObject global(cx, xpcscope->GetGlobalJSObject());
+        flat = cache->WrapObject(cx, global);
+        if (!flat)
+            return false;
+    }
+    if (flat) {
+        if (allowNativeWrapper && !JS_WrapObject(cx, &flat))
+            return false;
+        return CreateHolderIfNeeded(flat, d, dest);
     }
 
     // Don't double wrap CPOWs. This is a temporary measure for compatibility
diff --git a/js/xpconnect/src/XPCQuickStubs.cpp b/js/xpconnect/src/XPCQuickStubs.cpp
index cf5b5952e52..e21caec6392 100644
--- a/js/xpconnect/src/XPCQuickStubs.cpp
+++ b/js/xpconnect/src/XPCQuickStubs.cpp
@@ -205,12 +205,13 @@ GetMemberInfo(JSObject *obj, jsid memberId, const char **ifaceName)
 static void
 GetMethodInfo(JSContext *cx, jsval *vp, const char **ifaceNamep, jsid *memberIdp)
 {
-    RootedObject funobj(cx, JSVAL_TO_OBJECT(JS_CALLEE(cx, vp)));
+    CallReceiver call = CallReceiverFromVp(vp);
+    RootedObject funobj(cx, &call.callee());
     MOZ_ASSERT(JS_ObjectIsFunction(cx, funobj),
                "JSNative callee should be Function object");
     RootedString str(cx, JS_GetFunctionId(JS_GetObjectFunction(funobj)));
     RootedId methodId(cx, str ? INTERNED_STRING_TO_JSID(cx, str) : JSID_VOID);
-    GetMemberInfo(JSVAL_TO_OBJECT(vp[1]), methodId, ifaceNamep);
+    GetMemberInfo(&call.thisv().toObject(), methodId, ifaceNamep);
     *memberIdp = methodId;
 }
 
diff --git a/js/xpconnect/src/XPCQuickStubs.h b/js/xpconnect/src/XPCQuickStubs.h
index 3abf6e9a842..5f5e20eae20 100644
--- a/js/xpconnect/src/XPCQuickStubs.h
+++ b/js/xpconnect/src/XPCQuickStubs.h
@@ -608,7 +608,7 @@ PropertyOpForwarder(JSContext *cx, unsigned argc, jsval *vp)
 
     v = js::GetFunctionNativeReserved(callee, 1);
 
-    JS::RootedValue argval(cx, (argc > 0) ? args.get(0) : JSVAL_VOID);
+    JS::RootedValue argval(cx, args.get(0));
     JS::RootedId id(cx);
     if (!JS_ValueToId(cx, v, &id))
         return false;
diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp
index 716b6a4477b..bf324eaf7a8 100644
--- a/js/xpconnect/src/XPCShellImpl.cpp
+++ b/js/xpconnect/src/XPCShellImpl.cpp
@@ -233,7 +233,7 @@ ReadLine(JSContext *cx, unsigned argc, jsval *vp)
     unsigned int buflen = strlen(buf);
     if (buflen == 0) {
         if (feof(gInFile)) {
-            JS_SET_RVAL(cx, vp, JSVAL_NULL);
+            args.rval().setNull();
             return true;
         }
     } else if (buf[buflen - 1] == '\n') {
@@ -245,7 +245,7 @@ ReadLine(JSContext *cx, unsigned argc, jsval *vp)
     if (!str)
         return false;
 
-    JS_SET_RVAL(cx, vp, STRING_TO_JSVAL(str));
+    args.rval().setString(str);
     return true;
 }
 
@@ -355,19 +355,20 @@ Load(JSContext *cx, unsigned argc, jsval *vp)
 static bool
 Version(JSContext *cx, unsigned argc, jsval *vp)
 {
-    JSVersion origVersion = JS_GetVersion(cx);
-    JS_SET_RVAL(cx, vp, INT_TO_JSVAL(origVersion));
-    if (argc > 0 && JSVAL_IS_INT(JS_ARGV(cx, vp)[0]))
+    CallArgs args = CallArgsFromVp(argc, vp);
+    args.rval().setInt32(JS_GetVersion(cx));
+    if (args.get(0).isInt32())
         JS_SetVersionForCompartment(js::GetContextCompartment(cx),
-                                    JSVersion(JSVAL_TO_INT(JS_ARGV(cx, vp)[0])));
+                                    JSVersion(args[0].toInt32()));
     return true;
 }
 
 static bool
 BuildDate(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     fprintf(gOutFile, "built on %s at %s\n", __DATE__, __TIME__);
-    JS_SET_RVAL(cx, vp, JSVAL_VOID);
+    args.rval().setUndefined();
     return true;
 }
 
@@ -389,7 +390,7 @@ static bool
 IgnoreReportedErrors(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (argc != 1 || !args[0].isBoolean()) {
+    if (args.length() != 1 || !args[0].isBoolean()) {
         JS_ReportError(cx, "Bad arguments");
         return false;
     }
@@ -418,12 +419,13 @@ DumpXPC(JSContext *cx, unsigned argc, jsval *vp)
 static bool
 GC(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     JSRuntime *rt = JS_GetRuntime(cx);
     JS_GC(rt);
 #ifdef JS_GCMETER
     js_DumpGCStats(rt, stdout);
 #endif
-    JS_SET_RVAL(cx, vp, JSVAL_VOID);
+    args.rval().setUndefined();
     return true;
 }
 
@@ -478,7 +480,7 @@ Options(JSContext *cx, unsigned argc, jsval *vp)
     JS::CallArgs args = CallArgsFromVp(argc, vp);
     ContextOptions oldOptions = ContextOptionsRef(cx);
 
-    for (unsigned i = 0; i < argc; ++i) {
+    for (unsigned i = 0; i < args.length(); ++i) {
         JSString *str = ToString(cx, args[i]);
         if (!str)
             return false;
@@ -535,18 +537,19 @@ Options(JSContext *cx, unsigned argc, jsval *vp)
 static bool
 Parent(JSContext *cx, unsigned argc, jsval *vp)
 {
-    if (argc != 1) {
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() != 1) {
         JS_ReportError(cx, "Wrong number of arguments");
         return false;
     }
 
-    jsval v = JS_ARGV(cx, vp)[0];
+    Value v = args[0];
     if (JSVAL_IS_PRIMITIVE(v)) {
         JS_ReportError(cx, "Only objects have parents!");
         return false;
     }
 
-    *vp = OBJECT_TO_JSVAL(JS_GetParent(JSVAL_TO_OBJECT(v)));
+    args.rval().setObjectOrNull(JS_GetParent(&v.toObject()));
     return true;
 }
 
diff --git a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
index c5b86a49d5a..4288d7a913f 100644
--- a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
@@ -68,6 +68,7 @@ ToStringGuts(XPCCallContext& ccx)
 static bool
 XPC_WN_Shared_ToString(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
     if (!obj)
         return false;
@@ -76,18 +77,19 @@ XPC_WN_Shared_ToString(JSContext *cx, unsigned argc, jsval *vp)
     if (!ccx.IsValid())
         return Throw(NS_ERROR_XPC_BAD_OP_ON_WN_PROTO, cx);
     ccx.SetName(ccx.GetRuntime()->GetStringID(XPCJSRuntime::IDX_TO_STRING));
-    ccx.SetArgsAndResultPtr(argc, JS_ARGV(cx, vp), vp);
+    ccx.SetArgsAndResultPtr(args.length(), args.array(), vp);
     return ToStringGuts(ccx);
 }
 
 static bool
 XPC_WN_Shared_ToSource(JSContext *cx, unsigned argc, jsval *vp)
 {
+    CallArgs args = CallArgsFromVp(argc, vp);
     static const char empty[] = "({})";
     JSString *str = JS_NewStringCopyN(cx, empty, sizeof(empty)-1);
     if (!str)
         return false;
-    *vp = STRING_TO_JSVAL(str);
+    args.rval().setString(str);
 
     return true;
 }
@@ -1266,8 +1268,8 @@ XPC_WN_CallMethod(JSContext *cx, unsigned argc, jsval *vp)
         return false;
 
     obj = FixUpThisIfBroken(obj, funobj);
-    XPCCallContext ccx(JS_CALLER, cx, obj, funobj, JSID_VOIDHANDLE, argc,
-                       JS_ARGV(cx, vp), vp);
+    XPCCallContext ccx(JS_CALLER, cx, obj, funobj, JSID_VOIDHANDLE, args.length(),
+                       args.array(), vp);
     XPCWrappedNative* wrapper = ccx.GetWrapper();
     THROW_AND_RETURN_IF_BAD_WRAPPER(cx, wrapper);
 
@@ -1292,8 +1294,8 @@ XPC_WN_GetterSetter(JSContext *cx, unsigned argc, jsval *vp)
         return false;
 
     obj = FixUpThisIfBroken(obj, funobj);
-    XPCCallContext ccx(JS_CALLER, cx, obj, funobj, JSID_VOIDHANDLE, argc,
-                       JS_ARGV(cx, vp), vp);
+    XPCCallContext ccx(JS_CALLER, cx, obj, funobj, JSID_VOIDHANDLE, args.length(),
+                       args.array(), vp);
     XPCWrappedNative* wrapper = ccx.GetWrapper();
     THROW_AND_RETURN_IF_BAD_WRAPPER(cx, wrapper);
 
@@ -1303,7 +1305,7 @@ XPC_WN_GetterSetter(JSContext *cx, unsigned argc, jsval *vp)
     if (!XPCNativeMember::GetCallInfo(funobj, &iface, &member))
         return Throw(NS_ERROR_XPC_CANT_GET_METHOD_INFO, cx);
 
-    if (argc && member->IsWritableAttribute()) {
+    if (args.length() != 0 && member->IsWritableAttribute()) {
         ccx.SetCallInfo(iface, member, true);
         bool retval = XPCWrappedNative::SetAttribute(ccx);
         if (retval)
diff --git a/js/xpconnect/src/XPCWrapper.cpp b/js/xpconnect/src/XPCWrapper.cpp
index 84baf8293c6..28c0159b7a2 100644
--- a/js/xpconnect/src/XPCWrapper.cpp
+++ b/js/xpconnect/src/XPCWrapper.cpp
@@ -26,13 +26,14 @@ ThrowException(nsresult ex, JSContext *cx)
 static bool
 UnwrapNW(JSContext *cx, unsigned argc, jsval *vp)
 {
-  if (argc != 1) {
+  JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+  if (args.length() != 1) {
     return ThrowException(NS_ERROR_XPC_NOT_ENOUGH_ARGS, cx);
   }
 
-  JS::RootedValue v(cx, JS_ARGV(cx, vp)[0]);
+  JS::RootedValue v(cx, args[0]);
   if (!v.isObject() || !js::IsWrapper(&v.toObject())) {
-    JS_SET_RVAL(cx, vp, v);
+    args.rval().set(v);
     return true;
   }
 
@@ -41,7 +42,7 @@ UnwrapNW(JSContext *cx, unsigned argc, jsval *vp)
     NS_ENSURE_TRUE(ok, false);
   }
 
-  JS_SET_RVAL(cx, vp, v);
+  args.rval().set(v);
   return true;
 }
 
diff --git a/js/xpconnect/src/dom_quickstubs.qsconf b/js/xpconnect/src/dom_quickstubs.qsconf
index 38b5df75920..71fdd2524b4 100644
--- a/js/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/xpconnect/src/dom_quickstubs.qsconf
@@ -65,9 +65,6 @@ members = [
     # dom/indexedDB
     'nsIIndexedDatabaseManager.*',
 
-    # dom/file
-    'nsIDOMLockedFile.*',
-
     # dom/quota
     'nsIQuotaManager.*',
     'nsIQuotaRequest.*',
diff --git a/js/xpconnect/tests/unit/test_allowedDomainsXHR.js b/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
index 387a34c1e9c..dab2dd1c431 100644
--- a/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
+++ b/js/xpconnect/tests/unit/test_allowedDomainsXHR.js
@@ -70,9 +70,13 @@ function run_test()
     httpserver.stop(finishIfDone);
   }
 
-  sb.checkResults = checkResults;
-  
+  // We want to execute checkResults from the scope of the sandbox as well to
+  // make sure that there are no permission errors related to nsEP. For that
+  // we need to clone the function into the sandbox and make a few things
+  // available for it.
+  cu.evalInSandbox('var checkResults = ' + checkResults.toSource(), sb);
   sb.do_check_eq = do_check_eq;
+  sb.httpbody = httpbody;
 
   function changeListener(event) {
     if (checkResults(async))
diff --git a/layout/mathml/mathml.css b/layout/mathml/mathml.css
index 23ad635b92f..a59aa05a51b 100644
--- a/layout/mathml/mathml.css
+++ b/layout/mathml/mathml.css
@@ -172,10 +172,10 @@ mtr:last-child > mtd {
   padding-bottom: 0ex;
 }
 mtd:first-child {
-  padding-left: 0em;
+  -moz-padding-start: 0em;
 }
 mtd:last-child {
-  padding-right: 0em;
+  -moz-padding-end: 0em;
 }
 /* re-instate the spacing if the table has a surrounding frame */
 mtable[frame="solid"] > mtr:first-child > mtd,
@@ -188,11 +188,11 @@ mtable[frame="dashed"] > mtr:last-child > mtd {
 }
 mtable[frame="solid"] > mtr > mtd:first-child,
 mtable[frame="dashed"] > mtr > mtd:first-child {
-  padding-left: 0.4em; /* framespacing.left */
+  -moz-padding-start: 0.4em; /* framespacing.left (or right in rtl)*/
 }
 mtable[frame="solid"] > mtr > mtd:last-child,
 mtable[frame="dashed"] > mtr > mtd:last-child {
-  padding-right: 0.4em; /* framespacing.right */
+  -moz-padding-end: 0.4em; /* framespacing.right (or left in rtl)*/
 }
 
 /**************************************************************************/
diff --git a/layout/reftests/mathml/dir-6-ref.html b/layout/reftests/mathml/dir-6-ref.html
index fb937a9c7e5..5a4f51ff567 100644
--- a/layout/reftests/mathml/dir-6-ref.html
+++ b/layout/reftests/mathml/dir-6-ref.html
@@ -33,5 +33,35 @@
       </math>
     </p>
 
+    <p>
+      mtable:
+      <math>
+        <mtable frame="solid">
+          <mtr>
+            <mtd>
+              <mtext>c</mtext>
+            </mtd>
+            <mtd>
+              <mtext>b</mtext>
+            </mtd>
+            <mtd>
+              <mtext>a</mtext>
+            </mtd>
+          </mtr>
+          <mtr>
+            <mtd>
+              <mtext>f</mtext>
+            </mtd>
+            <mtd>
+              <mtext>e</mtext>
+            </mtd>
+            <mtd>
+              <mtext>d</mtext>
+            </mtd>
+          </mtr>
+        </mtable>
+      </math>
+    </p>
+
   </body>
 </html>
diff --git a/layout/reftests/mathml/dir-6.html b/layout/reftests/mathml/dir-6.html
index c7f45fe5976..446e5dde248 100644
--- a/layout/reftests/mathml/dir-6.html
+++ b/layout/reftests/mathml/dir-6.html
@@ -33,5 +33,35 @@
       </math>
     </p>
 
+    <p>
+      mtable:
+      <math dir="rtl">
+        <mtable frame="solid">
+          <mtr>
+            <mtd>
+              <mtext>a</mtext>
+            </mtd>
+            <mtd>
+              <mtext>b</mtext>
+            </mtd>
+            <mtd>
+              <mtext>c</mtext>
+            </mtd>
+          </mtr>
+          <mtr>
+            <mtd>
+              <mtext>d</mtext>
+            </mtd>
+            <mtd>
+              <mtext>e</mtext>
+            </mtd>
+            <mtd>
+              <mtext>f</mtext>
+            </mtd>
+          </mtr>
+        </mtable>
+      </math>
+    </p>
+
   </body>
 </html>
diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list
index 89f6567609e..4cc1d9182b5 100644
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -3,7 +3,7 @@
 == dir-3.html dir-3-ref.html
 == dir-4.html dir-4-ref.html
 == dir-5.html dir-5-ref.html
-fails == dir-6.html dir-6-ref.html
+== dir-6.html dir-6-ref.html
 == dir-7.html dir-7-ref.html
 fails == dir-8.html dir-8-ref.html
 fails == dir-9.html dir-9-ref.html # Bug 787215
diff --git a/layout/style/Declaration.cpp b/layout/style/Declaration.cpp
index 53b920782b4..8ca07bddcad 100644
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -993,7 +993,8 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue,
         AppendValueToString(eCSSProperty_grid_auto_rows,
                             aValue, aSerialization);
         break;
-      } else if (!(autoFlowValue.GetUnit() == eCSSUnit_None &&
+      } else if (!(autoFlowValue.GetUnit() == eCSSUnit_Enumerated &&
+                   autoFlowValue.GetIntValue() == NS_STYLE_GRID_AUTO_FLOW_NONE &&
                    autoColumnsValue.GetUnit() == eCSSUnit_Auto &&
                    autoRowsValue.GetUnit() == eCSSUnit_Auto)) {
         // Not serializable, bail.
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 8d94aa94084..4aef7cb6766 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -63,6 +63,9 @@ nsCSSProps::kParserVariantTable[eCSSProperty_COUNT_no_shorthands] = {
 // Length of the "var-" prefix of custom property names.
 #define VAR_PREFIX_LENGTH 4
 
+// End-of-array marker for mask arguments to ParseBitmaskValues
+#define MASK_END_VALUE  (-1)
+
 MOZ_BEGIN_ENUM_CLASS(nsParsingStatus, int32_t)
   // Parsed something successfully:
   Ok,
@@ -6924,56 +6927,33 @@ bool
 CSSParserImpl::ParseGridAutoFlow()
 {
   nsCSSValue value;
-  if (ParseVariant(value, VARIANT_INHERIT | VARIANT_NONE, nullptr)) {
+  if (ParseVariant(value, VARIANT_INHERIT, nullptr)) {
     AppendValue(eCSSProperty_grid_auto_flow, value);
     return true;
   }
 
-  bool gotDense = false;
-  bool gotColumn = false;
-  bool gotRow = false;
-  for (;;) {
-    if (!GetToken(true)) {
-      break;
-    }
-    if (mToken.mType != eCSSToken_Ident) {
-      UngetToken();
-      break;
-    }
-    nsCSSKeyword keyword = nsCSSKeywords::LookupKeyword(mToken.mIdent);
-    if (keyword == eCSSKeyword_dense && !gotDense) {
-      gotDense = true;
-    } else if (keyword == eCSSKeyword_column && !gotColumn && !gotRow) {
-      gotColumn = true;
-    } else if (keyword == eCSSKeyword_row && !gotColumn && !gotRow) {
-      gotRow = true;
-    } else {
-      UngetToken();
-      break;
-    }
+  static const int32_t mask[] = {
+    NS_STYLE_GRID_AUTO_FLOW_COLUMN | NS_STYLE_GRID_AUTO_FLOW_ROW,
+    MASK_END_VALUE
+  };
+  if (!ParseBitmaskValues(value, nsCSSProps::kGridAutoFlowKTable, mask)) {
+    return false;
   }
+  int32_t bitField = value.GetIntValue();
 
-  if (!(gotColumn || gotRow)) {
+  // Requires one of these
+  if (!(bitField & NS_STYLE_GRID_AUTO_FLOW_NONE ||
+        bitField & NS_STYLE_GRID_AUTO_FLOW_COLUMN ||
+        bitField & NS_STYLE_GRID_AUTO_FLOW_ROW)) {
     return false;
   }
 
-  int32_t bitField;
-  if (gotColumn) {
-    MOZ_ASSERT(!gotRow,
-               "code above should've rejected values with both row and column");
-    bitField = NS_STYLE_GRID_AUTO_FLOW_COLUMN;
-  } else if (gotRow) {
-    bitField = NS_STYLE_GRID_AUTO_FLOW_ROW;
-  } else {
-    // got neither row nor column; invalid.
+  // 'none' is only valid if it occurs alone:
+  if (bitField & NS_STYLE_GRID_AUTO_FLOW_NONE &&
+      bitField != NS_STYLE_GRID_AUTO_FLOW_NONE) {
     return false;
   }
 
-  if (gotDense) {
-    bitField |= NS_STYLE_GRID_AUTO_FLOW_DENSE;
-  }
-
-  value.SetIntValue(bitField, eCSSUnit_Enumerated);
   AppendValue(eCSSProperty_grid_auto_flow, value);
   return true;
 }
@@ -7439,6 +7419,7 @@ CSSParserImpl::ParseGrid()
       AppendValue(eCSSProperty_grid_template_columns, value);
 
       // Set grid-auto-* subproperties to their initial values.
+      value.SetIntValue(NS_STYLE_GRID_AUTO_FLOW_NONE, eCSSUnit_Enumerated);
       AppendValue(eCSSProperty_grid_auto_flow, value);
       value.SetAutoValue();
       AppendValue(eCSSProperty_grid_auto_columns, value);
@@ -7446,6 +7427,7 @@ CSSParserImpl::ParseGrid()
 
       return ParseGridTemplateAfterSlash(/* aColumnsIsTrackList = */ false);
     }
+    value.SetIntValue(NS_STYLE_GRID_AUTO_FLOW_NONE, eCSSUnit_Enumerated);
     AppendValue(eCSSProperty_grid_auto_flow, value);
     return ParseGridShorthandAutoProps();
   }
@@ -7470,7 +7452,7 @@ CSSParserImpl::ParseGrid()
 
   // Set other subproperties to their initial values
   // and parse <'grid-template'>.
-  value.SetNoneValue();
+  value.SetIntValue(NS_STYLE_GRID_AUTO_FLOW_NONE, eCSSUnit_Enumerated);
   AppendValue(eCSSProperty_grid_auto_flow, value);
   value.SetAutoValue();
   AppendValue(eCSSProperty_grid_auto_columns, value);
@@ -11149,8 +11131,6 @@ CSSParserImpl::ParseFontVariantAlternates(nsCSSValue& aValue)
   return true;
 }
 
-#define MASK_END_VALUE  -1
-
 // aMasks - array of masks for mutually-exclusive property values,
 //          e.g. proportial-nums, tabular-nums
 
@@ -11159,19 +11139,11 @@ CSSParserImpl::ParseBitmaskValues(nsCSSValue& aValue,
                                   const KTableValue aKeywordTable[],
                                   const int32_t aMasks[])
 {
-  if (!ParseVariant(aValue, VARIANT_HMK, aKeywordTable)) {
+  // Parse at least one keyword
+  if (!ParseEnum(aValue, aKeywordTable)) {
     return false;
   }
 
-  // first value 'normal', 'inherit', 'unset', 'initial', 'unset' ==> done
-  if (eCSSUnit_Normal == aValue.GetUnit() ||
-      eCSSUnit_Initial == aValue.GetUnit() ||
-      eCSSUnit_Inherit == aValue.GetUnit() ||
-      eCSSUnit_Unset == aValue.GetUnit())
-  {
-    return true;
-  }
-
   // look for more values
   nsCSSValue nextValue;
   int32_t mergedValue = aValue.GetIntValue();
@@ -11217,6 +11189,10 @@ static const int32_t maskEastAsian[] = {
 bool
 CSSParserImpl::ParseFontVariantEastAsian(nsCSSValue& aValue)
 {
+  if (ParseVariant(aValue, VARIANT_INHERIT | VARIANT_NORMAL, nullptr)) {
+    return true;
+  }
+
   NS_ASSERTION(maskEastAsian[ArrayLength(maskEastAsian) - 1] ==
                  MASK_END_VALUE,
                "incorrectly terminated array");
@@ -11236,6 +11212,10 @@ static const int32_t maskLigatures[] = {
 bool
 CSSParserImpl::ParseFontVariantLigatures(nsCSSValue& aValue)
 {
+  if (ParseVariant(aValue, VARIANT_INHERIT | VARIANT_NORMAL, nullptr)) {
+    return true;
+  }
+
   NS_ASSERTION(maskLigatures[ArrayLength(maskLigatures) - 1] ==
                  MASK_END_VALUE,
                "incorrectly terminated array");
@@ -11266,6 +11246,10 @@ static const int32_t maskNumeric[] = {
 bool
 CSSParserImpl::ParseFontVariantNumeric(nsCSSValue& aValue)
 {
+  if (ParseVariant(aValue, VARIANT_INHERIT | VARIANT_NORMAL, nullptr)) {
+    return true;
+  }
+
   NS_ASSERTION(maskNumeric[ArrayLength(maskNumeric) - 1] ==
                  MASK_END_VALUE,
                "incorrectly terminated array");
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 81081c122c2..629c13d6b5c 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -7484,7 +7484,6 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
       break;
     case eCSSUnit_Initial:
     case eCSSUnit_Unset:
-    case eCSSUnit_None:
       pos->mGridAutoFlow = NS_STYLE_GRID_AUTO_FLOW_NONE;
       break;
     default:
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc b/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
index 68d83451594..b060fa67a7c 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 //v4l includes
-#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/videoio.h>
 #elif defined(__sun)
 #include <sys/videodev2.h>
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc b/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
index 407cf8b5862..e31e8ef6a58 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 //v4l includes
-#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/videoio.h>
 #elif defined(__sun)
 #include <sys/videodev2.h>
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index 03d39de9b7d..6b824879e14 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -141,7 +141,6 @@
 @BINPATH@/components/dom_css.xpt
 @BINPATH@/components/dom_devicestorage.xpt
 @BINPATH@/components/dom_events.xpt
-@BINPATH@/components/dom_file.xpt
 @BINPATH@/components/dom_geolocation.xpt
 @BINPATH@/components/dom_media.xpt
 @BINPATH@/components/dom_network.xpt
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/toolkit/components/aboutmemory/content/aboutMemory.js
index 2e7a8abba28..56a3e1d1860 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.js
+++ b/toolkit/components/aboutmemory/content/aboutMemory.js
@@ -720,10 +720,11 @@ DReport.prototype = {
   }
 };
 
-// Constants that indicate if a DReport was present in both data sets, or
-// added/removed in the second data set.
+// Constants that indicate if a DReport was present only in one of the data
+// sets, or had to be added for balance.
 DReport.PRESENT_IN_FIRST_ONLY  = 1;
 DReport.PRESENT_IN_SECOND_ONLY = 2;
+DReport.ADDED_FOR_BALANCE = 3;
 
 /**
  * Make a report map, which has combined path+process strings for keys, and
@@ -1112,13 +1113,31 @@ function fillInTree(aRoot)
 
     } else {
       // Non-leaf node with multiple children.  Derive its _amount and
-      // _description entirely from its children.
+      // _description entirely from its children...
       let kidsBytes = 0;
       for (let i = 0; i < aT._kids.length; i++) {
         kidsBytes += fillInNonLeafNodes(aT._kids[i]);
       }
-      assert(aT._amount === undefined, "_amount already set for non-leaf node");
-      aT._amount = kidsBytes;
+
+      // ... except in one special case. When diffing two memory report sets,
+      // if one set has a node with children and the other has the same node
+      // but without children -- e.g. the first has "a/b/c" and "a/b/d", but
+      // the second only has "a/b" -- we need to add a fake node "a/b/(fake)"
+      // to the second to make the trees comparable. It's ugly, but it works.
+      if (aT._amount !== undefined &&
+          (aT._presence === DReport.PRESENT_IN_FIRST_ONLY ||
+           aT._presence === DReport.PRESENT_IN_SECOND_ONLY)) {
+        aT._amount += kidsBytes;
+        let fake = new TreeNode('(fake child)', aT._units);
+        fake._presence = DReport.ADDED_FOR_BALANCE;
+        fake._amount = aT._amount - kidsBytes;
+        aT._kids.push(fake);
+        delete aT._presence;
+      } else {
+        assert(aT._amount === undefined,
+               "_amount already set for non-leaf node")
+        aT._amount = kidsBytes;
+      }
       aT._description = "The sum of all entries below this one.";
     }
     return aT._amount;
@@ -1580,23 +1599,28 @@ function appendMrNameSpan(aP, aDescription, aUnsafeName, aIsInvalid, aNMerged,
   }
 
   if (aPresence) {
-    let c, nth;
+    let c, title;
     switch (aPresence) {
      case DReport.PRESENT_IN_FIRST_ONLY:
       c = '-';
-      nth = "first";
+      title = "This value was only present in the first set of memory reports.";
       break;
      case DReport.PRESENT_IN_SECOND_ONLY:
       c = '+';
-      nth = "second";
+      title = "This value was only present in the second set of memory reports.";
+      break;
+     case DReport.ADDED_FOR_BALANCE:
+      c = '!';
+      title = "One of the sets of memory reports lacked children for this " +
+              "node's parent. This is a fake child node added to make the " +
+              "two memory sets comparable.";
       break;
      default: assert(false, "bad presence");
       break;
     }
     let noteSpan = appendElementWithText(aP, "span", "mrNote",
                                          " [" + c + "]\n");
-    noteSpan.title =
-      "This value was only present in the " + nth + " set of memory reports.";
+    noteSpan.title = title;
   }
 }
 
diff --git a/toolkit/components/aboutmemory/tests/memory-reports-diff1.json b/toolkit/components/aboutmemory/tests/memory-reports-diff1.json
index f651366b4fb..fd9399c985b 100644
--- a/toolkit/components/aboutmemory/tests/memory-reports-diff1.json
+++ b/toolkit/components/aboutmemory/tests/memory-reports-diff1.json
@@ -17,7 +17,15 @@
 
     {"process": "P3", "path": "p3", "kind": 2, "units": 0, "amount": 55, "description": "Desc."},
 
-    {"process": "P5", "path": "p5", "kind": 2, "units": 0, "amount": 0, "description": "Desc."}
+    {"process": "P5", "path": "p5", "kind": 2, "units": 0, "amount": 0, "description": "Desc."},
+
+    {"process": "P7", "path": "p7", "kind": 2, "units": 0, "amount": 5, "description": "Desc."},
+
+    {"process": "P8", "path": "p8/a/b/c/d", "kind": 2, "units": 0, "amount": 3, "description": "Desc."},
+    {"process": "P8", "path": "p8/a/b/c/e", "kind": 2, "units": 0, "amount": 4, "description": "Desc."},
+    {"process": "P8", "path": "p8/a/b/f", "kind": 2, "units": 0, "amount": 5, "description": "Desc."},
+    {"process": "P8", "path": "p8/a/g/h", "kind": 2, "units": 0, "amount": 6, "description": "Desc."},
+    {"process": "P8", "path": "p8/a/g/i", "kind": 2, "units": 0, "amount": 7, "description": "Desc."}
   ]
 }
 
diff --git a/toolkit/components/aboutmemory/tests/memory-reports-diff2.json b/toolkit/components/aboutmemory/tests/memory-reports-diff2.json
index 07e88e88d43..816a5e8b0a9 100644
--- a/toolkit/components/aboutmemory/tests/memory-reports-diff2.json
+++ b/toolkit/components/aboutmemory/tests/memory-reports-diff2.json
@@ -18,7 +18,13 @@
 
     {"process": "P4", "path": "p4", "kind": 2, "units": 0, "amount": 66, "description": "Desc."},
 
-    {"process": "P6", "path": "p6", "kind": 2, "units": 0, "amount": 0, "description": "Desc."}
+    {"process": "P6", "path": "p6", "kind": 2, "units": 0, "amount": 0, "description": "Desc."},
+
+    {"process": "P7", "path": "p7/b", "kind": 2, "units": 0, "amount": 3, "description": "Desc."},
+    {"process": "P7", "path": "p7/c", "kind": 2, "units": 0, "amount": 4, "description": "Desc."},
+
+    {"process": "P8", "path": "p8/a/b", "kind": 2, "units": 0, "amount": 1, "description": "Desc."},
+    {"process": "P8", "path": "p8/a/g", "kind": 2, "units": 0, "amount": 2, "description": "Desc."}
   ]
 }
 
diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul
index b057c611612..bb6148ea8be 100644
--- a/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul
+++ b/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul
@@ -302,6 +302,33 @@ Other Measurements\n\
 66 B ── p4 [+]\n\
 \n\
 End of P4\n\
+P7\n\
+Other Measurements\n\
+\n\
+7 B (100.0%) -- p7\n\
+├──4 B (57.14%) ── c [+]\n\
+└──3 B (42.86%) ── b [+]\n\
+\n\
+-5 B ── p7 [-]\n\
+\n\
+End of P7\n\
+P8\n\
+Other Measurements\n\
+\n\
+-22 B (100.0%) -- p8\n\
+└──-22 B (100.0%) -- a\n\
+   ├──-11 B (50.00%) -- b\n\
+   │  ├───-7 B (31.82%) -- c\n\
+   │  │   ├──-4 B (18.18%) ── e [-]\n\
+   │  │   └──-3 B (13.64%) ── d [-]\n\
+   │  ├───-5 B (22.73%) ── f [-]\n\
+   │  └────1 B (-4.55%) ── (fake child) [!]\n\
+   └──-11 B (50.00%) -- g\n\
+      ├───-7 B (31.82%) ── i [-]\n\
+      ├───-6 B (27.27%) ── h [-]\n\
+      └────2 B (-9.09%) ── (fake child) [!]\n\
+\n\
+End of P8\n\
 ";
 
   let frames = [
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
index e8db9c7e090..1f2f4dbb470 100644
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -53,16 +53,21 @@ nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval)
     return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);
 
   *_retval = false;
-  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
-  if (!mimeInfo) {
-    nsAutoCString ext;
-    nsresult rv = GetPrimaryExtension(ext);
-    if (NS_SUCCEEDED(rv)) {
-      mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
+
+  if (mClass ==  eProtocolInfo) {
+    *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get());
+  } else {
+    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
+    if (!mimeInfo) {
+      nsAutoCString ext;
+      nsresult rv = GetPrimaryExtension(ext);
+      if (NS_SUCCEEDED(rv)) {
+        mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
+      }
     }
+    if (mimeInfo)
+      *_retval = true;
   }
-  if (mimeInfo)
-    *_retval = true;
 
   if (*_retval)
     return NS_OK;